arm: ardbeg: register pinmux for t124 ardbeg
Mitch Luban [Tue, 2 Jul 2013 10:04:42 +0000 (03:04 -0700)]
Change-Id: I387cc2c3ba3f2c88ba2e337115c0b1a44e3a0ea1
Signed-off-by: Mitch Luban <mluban@nvidia.com>
Reviewed-on: http://git-master/r/244287

arch/arm/mach-tegra/board-ardbeg-pinmux.c
arch/arm/mach-tegra/board-ardbeg.c

index f722e5e..3ee02f6 100644 (file)
@@ -233,7 +233,6 @@ static __initdata struct tegra_drive_pingroup_config ardbeg_drive_pinmux[] = {
 
 /* Initially setting all used GPIO's to non-TRISTATE */
 static __initdata struct tegra_pingroup_config ardbeg_pinmux_set_nontristate[] = {
-#ifdef CONFIG_ARCH_TEGRA_11x_SOC
        DEFAULT_PINMUX(GPIO_X4_AUD,     RSVD,   PULL_DOWN,    NORMAL,    OUTPUT),
        DEFAULT_PINMUX(GPIO_X5_AUD,     RSVD,   PULL_UP,      NORMAL,    INPUT),
        DEFAULT_PINMUX(GPIO_X6_AUD,     RSVD3,  PULL_UP,      NORMAL,    INPUT),
@@ -298,9 +297,6 @@ static __initdata struct tegra_pingroup_config ardbeg_pinmux_set_nontristate[] =
        DEFAULT_PINMUX(HDMI_INT,        RSVD,   PULL_DOWN,    NORMAL,    INPUT),
 
        DEFAULT_PINMUX(GMI_AD9,         PWM1,   NORMAL,    NORMAL,     OUTPUT),
-#else
-       /* TODO: update for t124 ardbeg */
-#endif
 };
 
 #ifdef CONFIG_ARCH_TEGRA_11x_SOC
index 4398443..81371d7 100644 (file)
@@ -998,7 +998,6 @@ static void __init tegra_ardbeg_dt_init(void)
        of_platform_populate(NULL,
                of_default_bus_match_table, ardbeg_auxdata_lookup,
                &platform_bus);
-#else
        platform_device_register(&tegra_gpio_device);
 #endif