diff options
author | Tony Lindgren <tony@atomide.com> | 2009-12-11 19:16:32 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2009-12-11 19:16:32 -0500 |
commit | 4896e3940a063fb03195d05806d28970dc3f102b (patch) | |
tree | f3ce32ae903d1ddb831d212d73a93b91c25da03d /arch/arm/mach-omap2/board-3630sdp.c | |
parent | b63128e81214cc2db2995d690438055c26d213a5 (diff) |
omap: mux: Replace omap_cfg_reg() with new style signal or gpio functions
Replace omap_cfg_reg() with new style signal or gpio functions
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/board-3630sdp.c')
-rwxr-xr-x | arch/arm/mach-omap2/board-3630sdp.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-3630sdp.c b/arch/arm/mach-omap2/board-3630sdp.c index 348b70b98336..e6cbc27dd107 100755 --- a/arch/arm/mach-omap2/board-3630sdp.c +++ b/arch/arm/mach-omap2/board-3630sdp.c | |||
@@ -23,6 +23,7 @@ | |||
23 | 23 | ||
24 | #include <mach/board-zoom.h> | 24 | #include <mach/board-zoom.h> |
25 | 25 | ||
26 | #include "mux.h" | ||
26 | #include "sdram-hynix-h8mbx00u0mer-0em.h" | 27 | #include "sdram-hynix-h8mbx00u0mer-0em.h" |
27 | 28 | ||
28 | #if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE) | 29 | #if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE) |
@@ -48,7 +49,9 @@ static inline void board_smc91x_init(void) | |||
48 | 49 | ||
49 | static void enable_board_wakeup_source(void) | 50 | static void enable_board_wakeup_source(void) |
50 | { | 51 | { |
51 | omap_cfg_reg(AF26_34XX_SYS_NIRQ); /* T2 interrupt line (keypad) */ | 52 | /* T2 interrupt line (keypad) */ |
53 | omap_mux_init_signal("sys_nirq", | ||
54 | OMAP_WAKEUP_EN | OMAP_PIN_INPUT_PULLUP); | ||
52 | } | 55 | } |
53 | 56 | ||
54 | static struct ehci_hcd_omap_platform_data ehci_pdata __initconst = { | 57 | static struct ehci_hcd_omap_platform_data ehci_pdata __initconst = { |