diff options
author | Sascha Hauer <sascha@saschahauer.de> | 2006-01-05 15:44:58 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-05 15:44:58 -0500 |
commit | 6a2273d6fc627d28a4de9beadf77ae6636b1e5d0 (patch) | |
tree | 686cb1ee9f791c3eba9be8d9d2cbaa4e87395257 | |
parent | 945b957972844881002ab4f68534581f4427a30b (diff) |
[ARM] 3231/1: mx1ads board support cleanup
Patch from Sascha Hauer
- remove unnecessary mappings
- rename mx1ads_device to cs89x0_device, because
that's what it is
- fix io/irq resource for cs89x0 device
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r-- | arch/arm/mach-imx/mx1ads.c | 55 |
1 files changed, 10 insertions, 45 deletions
diff --git a/arch/arm/mach-imx/mx1ads.c b/arch/arm/mach-imx/mx1ads.c index 708e1b3faa14..c9e0cd8ed016 100644 --- a/arch/arm/mach-imx/mx1ads.c +++ b/arch/arm/mach-imx/mx1ads.c | |||
@@ -29,27 +29,27 @@ | |||
29 | #include "generic.h" | 29 | #include "generic.h" |
30 | #include <asm/serial.h> | 30 | #include <asm/serial.h> |
31 | 31 | ||
32 | static struct resource mx1ads_resources[] = { | 32 | static struct resource cs89x0_resources[] = { |
33 | [0] = { | 33 | [0] = { |
34 | .start = IMX_CS4_VIRT, | 34 | .start = IMX_CS4_PHYS + 0x300, |
35 | .end = IMX_CS4_VIRT + 16, | 35 | .end = IMX_CS4_PHYS + 0x300 + 16, |
36 | .flags = IORESOURCE_MEM, | 36 | .flags = IORESOURCE_MEM, |
37 | }, | 37 | }, |
38 | [1] = { | 38 | [1] = { |
39 | .start = 13, | 39 | .start = IRQ_GPIOC(17), |
40 | .end = 13, | 40 | .end = IRQ_GPIOC(17), |
41 | .flags = IORESOURCE_IRQ, | 41 | .flags = IORESOURCE_IRQ, |
42 | }, | 42 | }, |
43 | }; | 43 | }; |
44 | 44 | ||
45 | static struct platform_device mx1ads_device = { | 45 | static struct platform_device cs89x0_device = { |
46 | .name = "mx1ads", | 46 | .name = "cirrus-cs89x0", |
47 | .num_resources = ARRAY_SIZE(mx1ads_resources), | 47 | .num_resources = ARRAY_SIZE(cs89x0_resources), |
48 | .resource = mx1ads_resources, | 48 | .resource = cs89x0_resources, |
49 | }; | 49 | }; |
50 | 50 | ||
51 | static struct platform_device *devices[] __initdata = { | 51 | static struct platform_device *devices[] __initdata = { |
52 | &mx1ads_device, | 52 | &cs89x0_device, |
53 | }; | 53 | }; |
54 | 54 | ||
55 | static void __init | 55 | static void __init |
@@ -61,45 +61,10 @@ mx1ads_init(void) | |||
61 | platform_add_devices(devices, ARRAY_SIZE(devices)); | 61 | platform_add_devices(devices, ARRAY_SIZE(devices)); |
62 | } | 62 | } |
63 | 63 | ||
64 | static struct map_desc mx1ads_io_desc[] __initdata = { | ||
65 | { | ||
66 | .virtual = IMX_CS0_VIRT, | ||
67 | .pfn = __phys_to_pfn(IMX_CS0_PHYS), | ||
68 | .length = IMX_CS0_SIZE, | ||
69 | .type = MT_DEVICE | ||
70 | }, { | ||
71 | .virtual = IMX_CS1_VIRT, | ||
72 | .pfn = __phys_to_pfn(IMX_CS1_PHYS), | ||
73 | .length = IMX_CS1_SIZE, | ||
74 | .type = MT_DEVICE | ||
75 | }, { | ||
76 | .virtual = IMX_CS2_VIRT, | ||
77 | .pfn = __phys_to_pfn(IMX_CS2_PHYS), | ||
78 | .length = IMX_CS2_SIZE, | ||
79 | .type = MT_DEVICE | ||
80 | }, { | ||
81 | .virtual = IMX_CS3_VIRT, | ||
82 | .pfn = __phys_to_pfn(IMX_CS3_PHYS), | ||
83 | .length = IMX_CS3_SIZE, | ||
84 | .type = MT_DEVICE | ||
85 | }, { | ||
86 | .virtual = IMX_CS4_VIRT, | ||
87 | .pfn = __phys_to_pfn(IMX_CS4_PHYS), | ||
88 | .length = IMX_CS4_SIZE, | ||
89 | .type = MT_DEVICE | ||
90 | }, { | ||
91 | .virtual = IMX_CS5_VIRT, | ||
92 | .pfn = __phys_to_pfn(IMX_CS5_PHYS), | ||
93 | .length = IMX_CS5_SIZE, | ||
94 | .type = MT_DEVICE | ||
95 | } | ||
96 | }; | ||
97 | |||
98 | static void __init | 64 | static void __init |
99 | mx1ads_map_io(void) | 65 | mx1ads_map_io(void) |
100 | { | 66 | { |
101 | imx_map_io(); | 67 | imx_map_io(); |
102 | iotable_init(mx1ads_io_desc, ARRAY_SIZE(mx1ads_io_desc)); | ||
103 | } | 68 | } |
104 | 69 | ||
105 | MACHINE_START(MX1ADS, "Motorola MX1ADS") | 70 | MACHINE_START(MX1ADS, "Motorola MX1ADS") |