diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-07-05 16:31:40 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-07-05 16:31:40 +0300 |
| commit | f99bf16d70d8a33e5274e429f2b1d71457d06a06 (patch) | |
| tree | f806e4953291e97f75f2b813d695b1b74a231776 /arch/arm/mach-omap2/board-h4.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-h4.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-h4.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c index cdcd4fbad153..2d9ff0fa2828 100644 --- a/arch/arm/mach-omap2/board-h4.c +++ b/arch/arm/mach-omap2/board-h4.c @@ -33,7 +33,6 @@ #include <plat/control.h> #include <mach/gpio.h> -#include <plat/mux.h> #include <plat/usb.h> #include <plat/board.h> #include <plat/common.h> @@ -248,7 +247,7 @@ static inline void __init h4_init_debug(void) udelay(100); - omap_cfg_reg(M15_24XX_GPIO92); + omap_mux_init_gpio(92, 0); if (debug_card_init(cs_mem_base, H4_ETHR_GPIO_IRQ) < 0) gpmc_cs_free(eth_cs); @@ -358,8 +357,8 @@ static void __init omap_h4_init(void) * if not needed. */ #if defined(CONFIG_OMAP_IR) || defined(CONFIG_OMAP_IR_MODULE) - omap_cfg_reg(K15_24XX_UART3_TX); - omap_cfg_reg(K14_24XX_UART3_RX); + omap_mux_init_signal("uart3_tx_irtx.uart3_tx_irtx", 0); + omap_mux_init_signal("uart3_rx_irrx.uart3_rx_irrx", 0); #endif #if defined(CONFIG_KEYBOARD_OMAP) || defined(CONFIG_KEYBOARD_OMAP_MODULE) |