ARM: tegra: parameterize common XUSB code

There are some differences between the Tegra124 and Tegra210 XUSB padctl
code. So far, the common XUSB padctl code only supports Tegra124. Add
some parameters etc. so that it can work for both chips.

This also allows moving Tegra124's process_nodes() into the common file;
something that would have requires edits during the move if done in the
previous commit.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Warren <twarren@nvidia.com>

diff --git a/arch/arm/mach-tegra/tegra124/xusb-padctl.c b/arch/arm/mach-tegra/tegra124/xusb-padctl.c
index b3715d8f47bc256a7b9e00f4fc919591d793ee8f..76af924b948d5a201d1f4e9f841afe24916b16f3 100644 (file)
--- a/arch/arm/mach-tegra/tegra124/xusb-padctl.c
+++ b/arch/arm/mach-tegra/tegra124/xusb-padctl.c
@@ -8,16 +8,9 @@
 
 #include <common.h>
 #include <errno.h>
-#include <fdtdec.h>
-#include <malloc.h>
 
 #include "../xusb-padctl-common.h"
 
-#include <asm/io.h>
-
-#include <asm/arch/clock.h>
-#include <asm/arch-tegra/xusb-padctl.h>
-
 #include <dt-bindings/pinctrl/pinctrl-tegra-xusb.h>
 
 #define XUSB_PADCTL_ELPG_PROGRAM 0x01c
@@ -302,66 +295,27 @@ static const struct tegra_xusb_phy_ops sata_phy_ops = {
        .unprepare = phy_unprepare,
 };
 
-struct tegra_xusb_padctl *padctl = &(struct tegra_xusb_padctl) {
-       .phys = {
-               [0] = {
-                       .ops = &pcie_phy_ops,
-               },
-               [1] = {
-                       .ops = &sata_phy_ops,
-               },
+static struct tegra_xusb_phy tegra124_phys[] = {
+       {
+               .type = TEGRA_XUSB_PADCTL_PCIE,
+               .ops = &pcie_phy_ops,
+               .padctl = &padctl,
+       },
+       {
+               .type = TEGRA_XUSB_PADCTL_SATA,
+               .ops = &sata_phy_ops,
+               .padctl = &padctl,
        },
 };
 
-int process_nodes(const void *fdt, int nodes[], unsigned int count)
-{
-       unsigned int i;
-
-       for (i = 0; i < count; i++) {
-               enum fdt_compat_id id;
-               int err;
-
-               if (!fdtdec_get_is_enabled(fdt, nodes[i]))
-                       continue;
-
-               id = fdtdec_lookup(fdt, nodes[i]);
-               switch (id) {
-               case COMPAT_NVIDIA_TEGRA124_XUSB_PADCTL:
-                       break;
-
-               default:
-                       error("unsupported compatible: %s",
-                             fdtdec_get_compatible(id));
-                       continue;
-               }
-
-               padctl->num_lanes = ARRAY_SIZE(tegra124_lanes);
-               padctl->lanes = tegra124_lanes;
-
-               padctl->num_functions = ARRAY_SIZE(tegra124_functions);
-               padctl->functions = tegra124_functions;
-
-               err = tegra_xusb_padctl_parse_dt(padctl, fdt, nodes[i]);
-               if (err < 0) {
-                       error("failed to parse DT: %d", err);
-                       continue;
-               }
-
-               /* deassert XUSB padctl reset */
-               reset_set_enable(PERIPH_ID_XUSB_PADCTL, 0);
-
-               err = tegra_xusb_padctl_config_apply(padctl, &padctl->config);
-               if (err < 0) {
-                       error("failed to apply pinmux: %d", err);
-                       continue;
-               }
-
-               /* only a single instance is supported */
-               break;
-       }
-
-       return 0;
-}
+static const struct tegra_xusb_padctl_soc tegra124_socdata = {
+       .lanes = tegra124_lanes,
+       .num_lanes = ARRAY_SIZE(tegra124_lanes),
+       .functions = tegra124_functions,
+       .num_functions = ARRAY_SIZE(tegra124_functions),
+       .phys = tegra124_phys,
+       .num_phys = ARRAY_SIZE(tegra124_phys),
+};
 
 void tegra_xusb_padctl_init(const void *fdt)
 {
@@ -370,6 +324,6 @@ void tegra_xusb_padctl_init(const void *fdt)
        count = fdtdec_find_aliases_for_id(fdt, "padctl",
                                           COMPAT_NVIDIA_TEGRA124_XUSB_PADCTL,
                                           nodes, ARRAY_SIZE(nodes));
-       if (process_nodes(fdt, nodes, count))
+       if (tegra_xusb_process_nodes(fdt, nodes, count, &tegra124_socdata))
                return;
 }

diff --git a/arch/arm/mach-tegra/xusb-padctl-common.h b/arch/arm/mach-tegra/xusb-padctl-common.h
index a65b754f6b7d2e09cbe8504273a89dea0926f1fa..11ecb99b749d11892d78aa093d92761ad64fb2f7 100644 (file)
--- a/arch/arm/mach-tegra/xusb-padctl-common.h
+++ b/arch/arm/mach-tegra/xusb-padctl-common.h
@@ -33,8 +33,8 @@ struct tegra_xusb_phy_ops {
 };
 
 struct tegra_xusb_phy {
+       unsigned int type;
        const struct tegra_xusb_phy_ops *ops;
-
        struct tegra_xusb_padctl *padctl;
 };
 
@@ -58,6 +58,15 @@ struct tegra_xusb_padctl_group {
        int iddq;
 };
 
+struct tegra_xusb_padctl_soc {
+       const struct tegra_xusb_padctl_lane *lanes;
+       unsigned int num_lanes;
+       const char *const *functions;
+       unsigned int num_functions;
+       struct tegra_xusb_phy *phys;
+       unsigned int num_phys;
+};
+
 struct tegra_xusb_padctl_config {
        const char *name;
 
@@ -66,20 +75,13 @@ struct tegra_xusb_padctl_config {
 };
 
 struct tegra_xusb_padctl {
+       const struct tegra_xusb_padctl_soc *socdata;
+       struct tegra_xusb_padctl_config config;
        struct fdt_resource regs;
-
        unsigned int enable;
 
-       struct tegra_xusb_phy phys[2];
-
-       const struct tegra_xusb_padctl_lane *lanes;
-       unsigned int num_lanes;
-
-       const char *const *functions;
-       unsigned int num_functions;
-
-       struct tegra_xusb_padctl_config config;
 };
+extern struct tegra_xusb_padctl padctl;
 
 static inline u32 padctl_readl(struct tegra_xusb_padctl *padctl,
                               unsigned long offset)
@@ -93,11 +95,7 @@ static inline void padctl_writel(struct tegra_xusb_padctl *padctl,
        writel(value, padctl->regs.start + offset);
 }
 
-extern struct tegra_xusb_padctl *padctl;
-
-int tegra_xusb_padctl_parse_dt(struct tegra_xusb_padctl *padctl,
-                              const void *fdt, int node);
-int tegra_xusb_padctl_config_apply(struct tegra_xusb_padctl *padctl,
-                                  struct tegra_xusb_padctl_config *config);
+int tegra_xusb_process_nodes(const void *fdt, int nodes[], unsigned int count,
+       const struct tegra_xusb_padctl_soc *socdata);
 
 #endif