diff options
author | Colin Cross <ccross@android.com> | 2011-05-04 14:57:57 -0700 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-06-01 02:25:04 -0700 |
commit | 21a42c92750446008dc0847a78aba5459e3b6b5a (patch) | |
tree | 640f9e7118a0af661a851ec45f8e3c3926a403d8 /arch/arm/mach-omap2/board-4430sdp.c | |
parent | d4ff6121b44081601206980cafcd6ed3ecb367b6 (diff) | |
download | linux-21a42c92750446008dc0847a78aba5459e3b6b5a.tar.bz2 |
ARM: omap4: Pass core and wakeup mux tables to omap4_mux_init
OMAP4 contains two separate instances of the padconf registers,
one in the core system config and one in the wakeup system config.
Pass in two tables to apply the correct values to each instance.
Signed-off-by: Colin Cross <ccross@android.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/board-4430sdp.c')
-rw-r--r-- | arch/arm/mach-omap2/board-4430sdp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c index 56983e80b4df..9ea26947eb05 100644 --- a/arch/arm/mach-omap2/board-4430sdp.c +++ b/arch/arm/mach-omap2/board-4430sdp.c @@ -729,7 +729,7 @@ static void __init omap_4430sdp_init(void) if (omap_rev() == OMAP4430_REV_ES1_0) package = OMAP_PACKAGE_CBL; - omap4_mux_init(board_mux, package); + omap4_mux_init(board_mux, NULL, package); omap_board_config = sdp4430_config; omap_board_config_size = ARRAY_SIZE(sdp4430_config); |