Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

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

diff --git a/arch/arm/mach-spear3xx/spear300_evb.c b/arch/arm/mach-spear3xx/spear300_evb.c
index 42d2253..69006f6 100644 (file)
--- a/arch/arm/mach-spear3xx/spear300_evb.c
+++ b/arch/arm/mach-spear3xx/spear300_evb.c
@@ -19,26 +19,26 @@
 /* padmux devices to enable */
 static struct pmx_dev *pmx_devs[] = {
        /* spear3xx specific devices */
-       &pmx_i2c,
-       &pmx_ssp_cs,
-       &pmx_ssp,
-       &pmx_mii,
-       &pmx_uart0,
+       &spear3xx_pmx_i2c,
+       &spear3xx_pmx_ssp_cs,
+       &spear3xx_pmx_ssp,
+       &spear3xx_pmx_mii,
+       &spear3xx_pmx_uart0,
 
        /* spear300 specific devices */
-       &pmx_fsmc_2_chips,
-       &pmx_clcd,
-       &pmx_telecom_sdhci_4bit,
-       &pmx_gpio1,
+       &spear300_pmx_fsmc_2_chips,
+       &spear300_pmx_clcd,
+       &spear300_pmx_telecom_sdhci_4bit,
+       &spear300_pmx_gpio1,
 };
 
 static struct amba_device *amba_devs[] __initdata = {
        /* spear3xx specific devices */
-       &gpio_device,
-       &uart_device,
+       &spear3xx_gpio_device,
+       &spear3xx_uart_device,
 
        /* spear300 specific devices */
-       &gpio1_device,
+       &spear300_gpio1_device,
 };
 
 static struct platform_device *plat_devs[] __initdata = {
@@ -51,13 +51,9 @@ static void __init spear300_evb_init(void)
 {
        unsigned int i;
 
-       /* padmux initialization, must be done before spear300_init */
-       pmx_driver.mode = &photo_frame_mode;
-       pmx_driver.devs = pmx_devs;
-       pmx_driver.devs_count = ARRAY_SIZE(pmx_devs);
-
        /* call spear300 machine init function */
-       spear300_init();
+       spear300_init(&spear300_photo_frame_mode, pmx_devs,
+                       ARRAY_SIZE(pmx_devs));
 
        /* Add Platform Devices */
        platform_add_devices(plat_devs, ARRAY_SIZE(plat_devs));