diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-11-15 09:28:45 -0500 |
---|---|---|
committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-11-19 15:54:36 -0500 |
commit | 742269e2d971957c84f364c4e9f5c6439964ef01 (patch) | |
tree | bebc9ea6b88df9424494000316e5b0c1098becdb /arch/arm/mach-mx3/devices.c | |
parent | 2d58de2805f93bdb8fa0608d98e1871bb28ec091 (diff) |
ARM: mx3: dynamically allocate imx2-wdt devices
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx3/devices.c')
-rw-r--r-- | arch/arm/mach-mx3/devices.c | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/arch/arm/mach-mx3/devices.c b/arch/arm/mach-mx3/devices.c index c122c0faaaa5..448fe5614e4f 100644 --- a/arch/arm/mach-mx3/devices.c +++ b/arch/arm/mach-mx3/devices.c | |||
@@ -95,19 +95,6 @@ struct platform_device mx3_camera = { | |||
95 | }, | 95 | }, |
96 | }; | 96 | }; |
97 | 97 | ||
98 | static struct resource imx_wdt_resources[] = { | ||
99 | { | ||
100 | .flags = IORESOURCE_MEM, | ||
101 | }, | ||
102 | }; | ||
103 | |||
104 | struct platform_device imx_wdt_device0 = { | ||
105 | .name = "imx2-wdt", | ||
106 | .id = 0, | ||
107 | .num_resources = ARRAY_SIZE(imx_wdt_resources), | ||
108 | .resource = imx_wdt_resources, | ||
109 | }; | ||
110 | |||
111 | static struct resource imx_rtc_resources[] = { | 98 | static struct resource imx_rtc_resources[] = { |
112 | { | 99 | { |
113 | .start = MX31_RTC_BASE_ADDR, | 100 | .start = MX31_RTC_BASE_ADDR, |
@@ -145,23 +132,3 @@ struct platform_device imx_kpp_device = { | |||
145 | .num_resources = ARRAY_SIZE(imx_kpp_resources), | 132 | .num_resources = ARRAY_SIZE(imx_kpp_resources), |
146 | .resource = imx_kpp_resources, | 133 | .resource = imx_kpp_resources, |
147 | }; | 134 | }; |
148 | |||
149 | static int __init mx3_devices_init(void) | ||
150 | { | ||
151 | #if defined(CONFIG_ARCH_MX31) | ||
152 | if (cpu_is_mx31()) { | ||
153 | imx_wdt_resources[0].start = MX31_WDOG_BASE_ADDR; | ||
154 | imx_wdt_resources[0].end = MX31_WDOG_BASE_ADDR + 0x3fff; | ||
155 | } | ||
156 | #endif | ||
157 | #if defined(CONFIG_ARCH_MX35) | ||
158 | if (cpu_is_mx35()) { | ||
159 | imx_wdt_resources[0].start = MX35_WDOG_BASE_ADDR; | ||
160 | imx_wdt_resources[0].end = MX35_WDOG_BASE_ADDR + 0x3fff; | ||
161 | } | ||
162 | #endif | ||
163 | |||
164 | return 0; | ||
165 | } | ||
166 | |||
167 | subsys_initcall(mx3_devices_init); | ||