Merge Paulus' tree

[karo-tx-linux.git] / arch / arm / mach-imx / mx1ads.c

diff --git a/arch/arm/mach-imx/mx1ads.c b/arch/arm/mach-imx/mx1ads.c
index 625dd01c2578113f4ffdd8191ebba48d270e0d68..708e1b3faa1466cddb97867403510c8d301824a3 100644 (file)
--- a/arch/arm/mach-imx/mx1ads.c
+++ b/arch/arm/mach-imx/mx1ads.c
@@ -14,6 +14,7 @@
 
 #include <linux/device.h>
 #include <linux/init.h>
+#include <linux/platform_device.h>
 #include <asm/system.h>
 #include <asm/hardware.h>
 #include <asm/irq.h>
@@ -55,19 +56,43 @@ static void __init
 mx1ads_init(void)
 {
 #ifdef CONFIG_LEDS
-       imx_gpio_mode(GPIO_PORTA | GPIO_OUT | GPIO_GPIO | 2);
+       imx_gpio_mode(GPIO_PORTA | GPIO_OUT | 2);
 #endif
        platform_add_devices(devices, ARRAY_SIZE(devices));
 }
 
 static struct map_desc mx1ads_io_desc[] __initdata = {
-       /* virtual     physical    length      type */
-       {IMX_CS0_VIRT, IMX_CS0_PHYS, IMX_CS0_SIZE, MT_DEVICE},
-       {IMX_CS1_VIRT, IMX_CS1_PHYS, IMX_CS1_SIZE, MT_DEVICE},
-       {IMX_CS2_VIRT, IMX_CS2_PHYS, IMX_CS2_SIZE, MT_DEVICE},
-       {IMX_CS3_VIRT, IMX_CS3_PHYS, IMX_CS3_SIZE, MT_DEVICE},
-       {IMX_CS4_VIRT, IMX_CS4_PHYS, IMX_CS4_SIZE, MT_DEVICE},
-       {IMX_CS5_VIRT, IMX_CS5_PHYS, IMX_CS5_SIZE, MT_DEVICE},
+       {
+               .virtual        = IMX_CS0_VIRT,
+               .pfn            = __phys_to_pfn(IMX_CS0_PHYS),
+               .length         = IMX_CS0_SIZE,
+               .type           = MT_DEVICE
+       }, {
+               .virtual        = IMX_CS1_VIRT,
+               .pfn            = __phys_to_pfn(IMX_CS1_PHYS),
+               .length         = IMX_CS1_SIZE,
+               .type           = MT_DEVICE
+       }, {
+               .virtual        = IMX_CS2_VIRT,
+               .pfn            = __phys_to_pfn(IMX_CS2_PHYS),
+               .length         = IMX_CS2_SIZE,
+               .type           = MT_DEVICE
+       }, {
+               .virtual        = IMX_CS3_VIRT,
+               .pfn            = __phys_to_pfn(IMX_CS3_PHYS),
+               .length         = IMX_CS3_SIZE,
+               .type           = MT_DEVICE
+       }, {
+               .virtual        = IMX_CS4_VIRT,
+               .pfn            = __phys_to_pfn(IMX_CS4_PHYS),
+               .length         = IMX_CS4_SIZE,
+               .type           = MT_DEVICE
+       }, {
+               .virtual        = IMX_CS5_VIRT,
+               .pfn            = __phys_to_pfn(IMX_CS5_PHYS),
+               .length         = IMX_CS5_SIZE,
+               .type           = MT_DEVICE
+       }
 };
 
 static void __init
@@ -78,11 +103,13 @@ mx1ads_map_io(void)
 }
 
 MACHINE_START(MX1ADS, "Motorola MX1ADS")
-       MAINTAINER("Sascha Hauer, Pengutronix")
-       BOOT_MEM(0x08000000, 0x00200000, 0xe0200000)
-       BOOT_PARAMS(0x08000100)
-       MAPIO(mx1ads_map_io)
-       INITIRQ(imx_init_irq)
+       /* Maintainer: Sascha Hauer, Pengutronix */
+       .phys_ram       = 0x08000000,
+       .phys_io        = 0x00200000,
+       .io_pg_offst    = ((0xe0200000) >> 18) & 0xfffc,
+       .boot_params    = 0x08000100,
+       .map_io         = mx1ads_map_io,
+       .init_irq       = imx_init_irq,
        .timer          = &imx_timer,
-       INIT_MACHINE(mx1ads_init)
+       .init_machine   = mx1ads_init,
 MACHINE_END