ARM: dt: tegra20: add pinmux to device tree

This adds a complete pinmux configuration to all Tegra20 device tree
files. This allows removal of board-dt-tegra20.c's use of the pinmux
board files, and the special device tree handling in board-pinmux.c.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Olof Johansson <olof@lixom.net>

2 files changed, 1 insertions, 33 deletions

diff --git a/arch/arm/mach-tegra/board-dt-tegra20.c b/arch/arm/mach-tegra/board-dt-tegra20.c
index 65a5249b3718..5b9d5f4c0686 100644
--- a/arch/arm/mach-tegra/board-dt-tegra20.c
+++ b/arch/arm/mach-tegra/board-dt-tegra20.c
@@ -47,14 +47,7 @@
 #include "clock.h"
 #include "devices.h"
 
-void harmony_pinmux_init(void);
-void paz00_pinmux_init(void);
-void seaboard_pinmux_init(void);
-void trimslice_pinmux_init(void);
-void ventana_pinmux_init(void);
-
 struct of_dev_auxdata tegra20_auxdata_lookup[] __initdata = {
-        OF_DEV_AUXDATA("nvidia,tegra20-pinmux", TEGRA_APB_MISC_BASE + 0x14, "tegra-pinmux", NULL),
         OF_DEV_AUXDATA("nvidia,tegra20-sdhci", TEGRA_SDMMC1_BASE, "sdhci-tegra.0", NULL),
         OF_DEV_AUXDATA("nvidia,tegra20-sdhci", TEGRA_SDMMC2_BASE, "sdhci-tegra.1", NULL),
         OF_DEV_AUXDATA("nvidia,tegra20-sdhci", TEGRA_SDMMC3_BASE, "sdhci-tegra.2", NULL),
@@ -94,33 +87,10 @@ static struct of_device_id tegra_dt_match_table[] __initdata = {
         {}
 };
 
-static struct {
-        char *machine;
-        void (*init)(void);
-} pinmux_configs[] = {
-        { "compulab,trimslice", trimslice_pinmux_init },
-        { "nvidia,harmony", harmony_pinmux_init },
-        { "compal,paz00", paz00_pinmux_init },
-        { "nvidia,seaboard", seaboard_pinmux_init },
-        { "nvidia,ventana", ventana_pinmux_init },
-};
-
 static void __init tegra_dt_init(void)
 {
-        int i;
-
         tegra_clk_init_from_table(tegra_dt_clk_init_table);
 
-        for (i = 0; i < ARRAY_SIZE(pinmux_configs); i++) {
-                if (of_machine_is_compatible(pinmux_configs[i].machine)) {
-                        pinmux_configs[i].init();
-                        break;
-                }
-        }
-
-        WARN(i == ARRAY_SIZE(pinmux_configs),
-                "Unknown platform! Pinmuxing not initialized\n");
-
         /*
          * Finished with the static registrations now; fill in the missing
          * devices
diff --git a/arch/arm/mach-tegra/board-pinmux.c b/arch/arm/mach-tegra/board-pinmux.c
index 3b7ad07fcbcb..a5574c71b931 100644
--- a/arch/arm/mach-tegra/board-pinmux.c
+++ b/arch/arm/mach-tegra/board-pinmux.c
@@ -15,7 +15,6 @@
 #include <linux/device.h>
 #include <linux/kernel.h>
 #include <linux/notifier.h>
-#include <linux/of.h>
 #include <linux/string.h>
 
 #include "board-pinmux.h"
@@ -84,6 +83,5 @@ void tegra_board_pinmux_init(struct tegra_board_pinmux_conf *conf_a,
         if (conf_b)
                 pinctrl_register_mappings(conf_b->maps, conf_b->map_count);
 
-        if (!of_machine_is_compatible("nvidia,tegra20"))
-                platform_add_devices(devices, ARRAY_SIZE(devices));
+        platform_add_devices(devices, ARRAY_SIZE(devices));
 }