diff options
author | Tony Lindgren <tony@atomide.com> | 2010-07-05 09:31:38 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-07-05 09:31:38 -0400 |
commit | 369ed78fc9b4638d52a036c0184c2faf72c4e9c4 (patch) | |
tree | 0a995d2d24a3ace070acd22d884ba993d6b5d734 /arch | |
parent | bd8f0fc9791040e36501a9c1e373550ac2cff147 (diff) |
omap: mux: Select POP package for 2430SDP
Select POP package for 2430SDP
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-omap2/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-omap2/board-2430sdp.c | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 4158368d0b0f..f67f0378fc9b 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig | |||
@@ -61,6 +61,7 @@ config MACH_OMAP_APOLLON | |||
61 | config MACH_OMAP_2430SDP | 61 | config MACH_OMAP_2430SDP |
62 | bool "OMAP 2430 SDP board" | 62 | bool "OMAP 2430 SDP board" |
63 | depends on ARCH_OMAP2 | 63 | depends on ARCH_OMAP2 |
64 | select OMAP_PACKAGE_ZAC | ||
64 | 65 | ||
65 | config MACH_OMAP3_BEAGLE | 66 | config MACH_OMAP3_BEAGLE |
66 | bool "OMAP3 BEAGLE board" | 67 | bool "OMAP3 BEAGLE board" |
diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c index ec920c90a526..281aa134ee67 100644 --- a/arch/arm/mach-omap2/board-2430sdp.c +++ b/arch/arm/mach-omap2/board-2430sdp.c | |||
@@ -38,6 +38,7 @@ | |||
38 | #include <plat/usb.h> | 38 | #include <plat/usb.h> |
39 | #include <plat/gpmc-smc91x.h> | 39 | #include <plat/gpmc-smc91x.h> |
40 | 40 | ||
41 | #include "mux.h" | ||
41 | #include "hsmmc.h" | 42 | #include "hsmmc.h" |
42 | 43 | ||
43 | #define SDP2430_CS0_BASE 0x04000000 | 44 | #define SDP2430_CS0_BASE 0x04000000 |
@@ -217,10 +218,20 @@ static struct omap_usb_config sdp2430_usb_config __initdata = { | |||
217 | .pins[0] = 3, | 218 | .pins[0] = 3, |
218 | }; | 219 | }; |
219 | 220 | ||
221 | #ifdef CONFIG_OMAP_MUX | ||
222 | static struct omap_board_mux board_mux[] __initdata = { | ||
223 | { .reg_offset = OMAP_MUX_TERMINATOR }, | ||
224 | }; | ||
225 | #else | ||
226 | #define board_mux NULL | ||
227 | #endif | ||
228 | |||
220 | static void __init omap_2430sdp_init(void) | 229 | static void __init omap_2430sdp_init(void) |
221 | { | 230 | { |
222 | int ret; | 231 | int ret; |
223 | 232 | ||
233 | omap2430_mux_init(board_mux, OMAP_PACKAGE_ZAC); | ||
234 | |||
224 | omap2430_i2c_init(); | 235 | omap2430_i2c_init(); |
225 | 236 | ||
226 | platform_add_devices(sdp2430_devices, ARRAY_SIZE(sdp2430_devices)); | 237 | platform_add_devices(sdp2430_devices, ARRAY_SIZE(sdp2430_devices)); |