diff options
author | Tony Lindgren <tony@atomide.com> | 2010-07-05 09:31:40 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-07-05 09:31:40 -0400 |
commit | f99bf16d70d8a33e5274e429f2b1d71457d06a06 (patch) | |
tree | f806e4953291e97f75f2b813d695b1b74a231776 /arch/arm/mach-omap2/board-apollon.c | |
parent | 58310acd3ae815687d883c0c0e5950e3576a3dbc (diff) |
omap: mux: Convert 2420 platform init code to use new mux code
Convert 2420 platform init code to use new mux code
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/board-apollon.c')
-rw-r--r-- | arch/arm/mach-omap2/board-apollon.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/board-apollon.c b/arch/arm/mach-omap2/board-apollon.c index bc67026088f6..8cea6235b4be 100644 --- a/arch/arm/mach-omap2/board-apollon.c +++ b/arch/arm/mach-omap2/board-apollon.c | |||
@@ -35,7 +35,6 @@ | |||
35 | 35 | ||
36 | #include <mach/gpio.h> | 36 | #include <mach/gpio.h> |
37 | #include <plat/led.h> | 37 | #include <plat/led.h> |
38 | #include <plat/mux.h> | ||
39 | #include <plat/usb.h> | 38 | #include <plat/usb.h> |
40 | #include <plat/board.h> | 39 | #include <plat/board.h> |
41 | #include <plat/common.h> | 40 | #include <plat/common.h> |
@@ -246,7 +245,7 @@ static inline void __init apollon_init_smc91x(void) | |||
246 | apollon_smc91x_resources[0].end = base + 0x30f; | 245 | apollon_smc91x_resources[0].end = base + 0x30f; |
247 | udelay(100); | 246 | udelay(100); |
248 | 247 | ||
249 | omap_cfg_reg(W4__24XX_GPIO74); | 248 | omap_mux_init_gpio(74, 0); |
250 | if (gpio_request(APOLLON_ETHR_GPIO_IRQ, "SMC91x irq") < 0) { | 249 | if (gpio_request(APOLLON_ETHR_GPIO_IRQ, "SMC91x irq") < 0) { |
251 | printk(KERN_ERR "Failed to request GPIO%d for smc91x IRQ\n", | 250 | printk(KERN_ERR "Failed to request GPIO%d for smc91x IRQ\n", |
252 | APOLLON_ETHR_GPIO_IRQ); | 251 | APOLLON_ETHR_GPIO_IRQ); |
@@ -288,15 +287,15 @@ static void __init omap_apollon_init_irq(void) | |||
288 | static void __init apollon_led_init(void) | 287 | static void __init apollon_led_init(void) |
289 | { | 288 | { |
290 | /* LED0 - AA10 */ | 289 | /* LED0 - AA10 */ |
291 | omap_cfg_reg(AA10_242X_GPIO13); | 290 | omap_mux_init_signal("vlynq_clk.gpio_13", 0); |
292 | gpio_request(LED0_GPIO13, "LED0"); | 291 | gpio_request(LED0_GPIO13, "LED0"); |
293 | gpio_direction_output(LED0_GPIO13, 0); | 292 | gpio_direction_output(LED0_GPIO13, 0); |
294 | /* LED1 - AA6 */ | 293 | /* LED1 - AA6 */ |
295 | omap_cfg_reg(AA6_242X_GPIO14); | 294 | omap_mux_init_signal("vlynq_rx1.gpio_14", 0); |
296 | gpio_request(LED1_GPIO14, "LED1"); | 295 | gpio_request(LED1_GPIO14, "LED1"); |
297 | gpio_direction_output(LED1_GPIO14, 0); | 296 | gpio_direction_output(LED1_GPIO14, 0); |
298 | /* LED2 - AA4 */ | 297 | /* LED2 - AA4 */ |
299 | omap_cfg_reg(AA4_242X_GPIO15); | 298 | omap_mux_init_signal("vlynq_rx0.gpio_15", 0); |
300 | gpio_request(LED2_GPIO15, "LED2"); | 299 | gpio_request(LED2_GPIO15, "LED2"); |
301 | gpio_direction_output(LED2_GPIO15, 0); | 300 | gpio_direction_output(LED2_GPIO15, 0); |
302 | } | 301 | } |
@@ -305,7 +304,7 @@ static void __init apollon_usb_init(void) | |||
305 | { | 304 | { |
306 | /* USB device */ | 305 | /* USB device */ |
307 | /* DEVICE_SUSPEND */ | 306 | /* DEVICE_SUSPEND */ |
308 | omap_cfg_reg(P21_242X_GPIO12); | 307 | omap_mux_init_signal("mcbsp2_clkx.gpio_12", 0); |
309 | gpio_request(12, "USB suspend"); | 308 | gpio_request(12, "USB suspend"); |
310 | gpio_direction_output(12, 0); | 309 | gpio_direction_output(12, 0); |
311 | omap2_usbfs_init(&apollon_usb_config); | 310 | omap2_usbfs_init(&apollon_usb_config); |
@@ -330,7 +329,7 @@ static void __init omap_apollon_init(void) | |||
330 | apollon_usb_init(); | 329 | apollon_usb_init(); |
331 | 330 | ||
332 | /* REVISIT: where's the correct place */ | 331 | /* REVISIT: where's the correct place */ |
333 | omap_cfg_reg(W19_24XX_SYS_NIRQ); | 332 | omap_mux_init_signal("sys_nirq", OMAP_PULL_ENA | OMAP_PULL_UP); |
334 | 333 | ||
335 | /* LCD PWR_EN */ | 334 | /* LCD PWR_EN */ |
336 | omap_mux_init_signal("mcbsp2_dr.gpio_11", OMAP_PULL_ENA | OMAP_PULL_UP); | 335 | omap_mux_init_signal("mcbsp2_dr.gpio_11", OMAP_PULL_ENA | OMAP_PULL_UP); |