diff options
author | David Brownell <dbrownell@users.sourceforge.net> | 2006-12-06 20:14:03 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2007-09-20 12:59:20 -0400 |
commit | f604931238dff7b44ef52ac2ad1f557e45b25b38 (patch) | |
tree | efcacb3d5a3449cb0557d1194b202de7823f2184 /arch/arm/mach-omap2 | |
parent | 1c22cc13256046162bb8e7b44763f6c39790af74 (diff) |
ARM: OMAP: abstract debug card setup (smc, leds)
Additional cleanup for debug boards on H2/P2/H3/H4: move the init
code that's not board-specific into a new file where it can be easily
shared between all the different boards (avoiding code duplication,
and making it easier to support more devices). Make H4 use that.
This should be easy to drop in to the OMAP1 boards using these debug
cards; the only difference seems to be that the p2 does an extra reset
of the smc using the fpga (probably all boards could do that, if it's
necessary) and doesn't use the gpio mux or request APIs.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r-- | arch/arm/mach-omap2/Kconfig | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/board-h4.c | 46 |
2 files changed, 4 insertions, 44 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 7393109f5c30..cf4268e46b03 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig | |||
@@ -21,7 +21,7 @@ config MACH_OMAP_GENERIC | |||
21 | config MACH_OMAP_H4 | 21 | config MACH_OMAP_H4 |
22 | bool "OMAP 2420 H4 board" | 22 | bool "OMAP 2420 H4 board" |
23 | depends on ARCH_OMAP2 && ARCH_OMAP24XX | 23 | depends on ARCH_OMAP2 && ARCH_OMAP24XX |
24 | select OMAP_DEBUG_LEDS if LEDS || LEDS_OMAP_DEBUG | 24 | select OMAP_DEBUG_DEVICES |
25 | 25 | ||
26 | config MACH_OMAP_APOLLON | 26 | config MACH_OMAP_APOLLON |
27 | bool "OMAP 2420 Apollon board" | 27 | bool "OMAP 2420 Apollon board" |
diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c index 452193f01531..f125f432cc3e 100644 --- a/arch/arm/mach-omap2/board-h4.c +++ b/arch/arm/mach-omap2/board-h4.c | |||
@@ -131,26 +131,6 @@ static struct platform_device h4_flash_device = { | |||
131 | .resource = &h4_flash_resource, | 131 | .resource = &h4_flash_resource, |
132 | }; | 132 | }; |
133 | 133 | ||
134 | static struct resource h4_smc91x_resources[] = { | ||
135 | [0] = { | ||
136 | .start = OMAP24XX_ETHR_START, /* Physical */ | ||
137 | .end = OMAP24XX_ETHR_START + 0xf, | ||
138 | .flags = IORESOURCE_MEM, | ||
139 | }, | ||
140 | [1] = { | ||
141 | .start = OMAP_GPIO_IRQ(OMAP24XX_ETHR_GPIO_IRQ), | ||
142 | .end = OMAP_GPIO_IRQ(OMAP24XX_ETHR_GPIO_IRQ), | ||
143 | .flags = IORESOURCE_IRQ, | ||
144 | }, | ||
145 | }; | ||
146 | |||
147 | static struct platform_device h4_smc91x_device = { | ||
148 | .name = "smc91x", | ||
149 | .id = -1, | ||
150 | .num_resources = ARRAY_SIZE(h4_smc91x_resources), | ||
151 | .resource = h4_smc91x_resources, | ||
152 | }; | ||
153 | |||
154 | /* Select between the IrDA and aGPS module | 134 | /* Select between the IrDA and aGPS module |
155 | */ | 135 | */ |
156 | static int h4_select_irda(struct device *dev, int state) | 136 | static int h4_select_irda(struct device *dev, int state) |
@@ -266,29 +246,14 @@ static struct platform_device h4_lcd_device = { | |||
266 | .id = -1, | 246 | .id = -1, |
267 | }; | 247 | }; |
268 | 248 | ||
269 | static struct resource h4_led_resources[] = { | ||
270 | [0] = { | ||
271 | .flags = IORESOURCE_MEM, | ||
272 | }, | ||
273 | }; | ||
274 | |||
275 | static struct platform_device h4_led_device = { | ||
276 | .name = "omap_dbg_led", | ||
277 | .id = -1, | ||
278 | .num_resources = ARRAY_SIZE(h4_led_resources), | ||
279 | .resource = h4_led_resources, | ||
280 | }; | ||
281 | |||
282 | static struct platform_device *h4_devices[] __initdata = { | 249 | static struct platform_device *h4_devices[] __initdata = { |
283 | &h4_smc91x_device, | ||
284 | &h4_flash_device, | 250 | &h4_flash_device, |
285 | &h4_irda_device, | 251 | &h4_irda_device, |
286 | &h4_kp_device, | 252 | &h4_kp_device, |
287 | &h4_lcd_device, | 253 | &h4_lcd_device, |
288 | &h4_led_device, | ||
289 | }; | 254 | }; |
290 | 255 | ||
291 | static inline void __init h4_init_smc91x(void) | 256 | static inline void __init h4_init_debug(void) |
292 | { | 257 | { |
293 | /* Make sure CS1 timings are correct */ | 258 | /* Make sure CS1 timings are correct */ |
294 | GPMC_CONFIG1_1 = 0x00011200; | 259 | GPMC_CONFIG1_1 = 0x00011200; |
@@ -301,12 +266,8 @@ static inline void __init h4_init_smc91x(void) | |||
301 | udelay(100); | 266 | udelay(100); |
302 | 267 | ||
303 | omap_cfg_reg(M15_24XX_GPIO92); | 268 | omap_cfg_reg(M15_24XX_GPIO92); |
304 | if (omap_request_gpio(OMAP24XX_ETHR_GPIO_IRQ) < 0) { | 269 | if (debug_card_init(cs_mem_base, OMAP24XX_ETHR_GPIO_IRQ) < 0) |
305 | printk(KERN_ERR "Failed to request GPIO%d for smc91x IRQ\n", | 270 | gpmc_cs_free(eth_cs); |
306 | OMAP24XX_ETHR_GPIO_IRQ); | ||
307 | return; | ||
308 | } | ||
309 | omap_set_gpio_direction(OMAP24XX_ETHR_GPIO_IRQ, 1); | ||
310 | } | 271 | } |
311 | 272 | ||
312 | static void __init omap_h4_init_irq(void) | 273 | static void __init omap_h4_init_irq(void) |
@@ -314,7 +275,6 @@ static void __init omap_h4_init_irq(void) | |||
314 | omap2_init_common_hw(); | 275 | omap2_init_common_hw(); |
315 | omap_init_irq(); | 276 | omap_init_irq(); |
316 | omap_gpio_init(); | 277 | omap_gpio_init(); |
317 | h4_init_smc91x(); | ||
318 | } | 278 | } |
319 | 279 | ||
320 | static struct omap_uart_config h4_uart_config __initdata = { | 280 | static struct omap_uart_config h4_uart_config __initdata = { |