lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

omap: mux: Convert 2420 platform init code to use new mux code

Browse Source 
Convert 2420 platform init code to use new mux code

Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Tony Lindgren
2010-07-05 16:31:40 +03:00
parent 58310acd3a
commit f99bf16d70
6 changed files with 42 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/mach-omap2/board-h4.c
View File

@@ -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)