Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...

[pandora-kernel.git] / arch / arm / mach-spear3xx / spear320_evb.c

diff --git a/arch/arm/mach-spear3xx/spear320_evb.c b/arch/arm/mach-spear3xx/spear320_evb.c
index 8213e4b..a12b353 100644 (file)
--- a/arch/arm/mach-spear3xx/spear320_evb.c
+++ b/arch/arm/mach-spear3xx/spear320_evb.c
@@ -19,28 +19,28 @@
 /* padmux devices to enable */
 static struct pmx_dev *pmx_devs[] = {
        /* spear3xx specific devices */
-       &pmx_i2c,
-       &pmx_ssp,
-       &pmx_mii,
-       &pmx_uart0,
+       &spear3xx_pmx_i2c,
+       &spear3xx_pmx_ssp,
+       &spear3xx_pmx_mii,
+       &spear3xx_pmx_uart0,
 
        /* spear320 specific devices */
-       &pmx_fsmc,
-       &pmx_sdhci,
-       &pmx_i2s,
-       &pmx_uart1,
-       &pmx_uart2,
-       &pmx_can,
-       &pmx_pwm0,
-       &pmx_pwm1,
-       &pmx_pwm2,
-       &pmx_mii1,
+       &spear320_pmx_fsmc,
+       &spear320_pmx_sdhci,
+       &spear320_pmx_i2s,
+       &spear320_pmx_uart1,
+       &spear320_pmx_uart2,
+       &spear320_pmx_can,
+       &spear320_pmx_pwm0,
+       &spear320_pmx_pwm1,
+       &spear320_pmx_pwm2,
+       &spear320_pmx_mii1,
 };
 
 static struct amba_device *amba_devs[] __initdata = {
        /* spear3xx specific devices */
-       &gpio_device,
-       &uart_device,
+       &spear3xx_gpio_device,
+       &spear3xx_uart_device,
 
        /* spear320 specific devices */
 };
@@ -55,13 +55,9 @@ static void __init spear320_evb_init(void)
 {
        unsigned int i;
 
-       /* padmux initialization, must be done before spear320_init */
-       pmx_driver.mode = &auto_net_mii_mode;
-       pmx_driver.devs = pmx_devs;
-       pmx_driver.devs_count = ARRAY_SIZE(pmx_devs);
-
        /* call spear320 machine init function */
-       spear320_init();
+       spear320_init(&spear320_auto_net_mii_mode, pmx_devs,
+                       ARRAY_SIZE(pmx_devs));
 
        /* Add Platform Devices */
        platform_add_devices(plat_devs, ARRAY_SIZE(plat_devs));