ARM: 6930/1: SPEAr3xx: Rework pmx_dev code to remove conflicts

Prefix the pmx_devs to remove naming conflicts between the three
SPEAr3xx platforms. Also make pmx_driver static to each platform and
rework the init code to pass the devices rather than export the
pmx_driver structure.

Reviewed-by: Stanley Miao <stanley.miao@windriver.com>
Signed-off-by: Ryan Mallon <ryan@bluewatersys.com>
Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 18 insertions, 23 deletions

diff --git a/arch/arm/mach-spear3xx/spear310_evb.c b/arch/arm/mach-spear3xx/spear310_evb.c
index 2d7f333bd67b..9d4aadbe24e9 100644
--- a/arch/arm/mach-spear3xx/spear310_evb.c
+++ b/arch/arm/mach-spear3xx/spear310_evb.c
@@ -19,25 +19,25 @@
 /* padmux devices to enable */
 static struct pmx_dev *pmx_devs[] = {
         /* spear3xx specific devices */
-        &pmx_i2c,
-        &pmx_ssp,
-        &pmx_gpio_pin0,
-        &pmx_gpio_pin1,
-        &pmx_gpio_pin2,
-        &pmx_gpio_pin3,
-        &pmx_gpio_pin4,
-        &pmx_gpio_pin5,
-        &pmx_uart0,
+        &spear3xx_pmx_i2c,
+        &spear3xx_pmx_ssp,
+        &spear3xx_pmx_gpio_pin0,
+        &spear3xx_pmx_gpio_pin1,
+        &spear3xx_pmx_gpio_pin2,
+        &spear3xx_pmx_gpio_pin3,
+        &spear3xx_pmx_gpio_pin4,
+        &spear3xx_pmx_gpio_pin5,
+        &spear3xx_pmx_uart0,
 
         /* spear310 specific devices */
-        &pmx_emi_cs_0_1_4_5,
-        &pmx_emi_cs_2_3,
-        &pmx_uart1,
-        &pmx_uart2,
-        &pmx_uart3_4_5,
-        &pmx_fsmc,
-        &pmx_rs485_0_1,
-        &pmx_tdm0,
+        &spear310_pmx_emi_cs_0_1_4_5,
+        &spear310_pmx_emi_cs_2_3,
+        &spear310_pmx_uart1,
+        &spear310_pmx_uart2,
+        &spear310_pmx_uart3_4_5,
+        &spear310_pmx_fsmc,
+        &spear310_pmx_rs485_0_1,
+        &spear310_pmx_tdm0,
 };
 
 static struct amba_device *amba_devs[] __initdata = {
@@ -58,13 +58,8 @@ static void __init spear310_evb_init(void)
 {
         unsigned int i;
 
-        /* padmux initialization, must be done before spear310_init */
-        pmx_driver.mode = NULL;
-        pmx_driver.devs = pmx_devs;
-        pmx_driver.devs_count = ARRAY_SIZE(pmx_devs);
-
         /* call spear310 machine init function */
-        spear310_init();
+        spear310_init(NULL, pmx_devs, ARRAY_SIZE(pmx_devs));
 
         /* Add Platform Devices */
         platform_add_devices(plat_devs, ARRAY_SIZE(plat_devs));