summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/mux34xx.c
diff options
context:
space:
mode:
authorOleg Matcovschi <oleg.matcovschi@ti.com>2012-11-26 17:02:03 -0800
committerTony Lindgren <tony@atomide.com>2012-12-14 11:11:34 -0800
commit421e84509980206fb3b3bc039bc05bae1dd41c7b (patch)
treea15c269e3db4db310ba0b1a0610b2a095d18c76e /arch/arm/mach-omap2/mux34xx.c
parentca2e16faa7378878c1522a7c1b6c38211de3331d (diff)
OMAP2+: mux: Fixed gpio mux mode analysis
OMAP_MODE_GPIO() macro verified only OMAP_MUX_MODE4. It is not correct for following platforms: 2430 - gpio mux mode 3 44xx - gpio mux mode 3 54xx - gpio mux mode 6 Patch reserves first 3 bits in partition flags for storing gpio mux mode in same format as stored in control pad register. Modified OMAP_MODE_GPIO() macro to handle all possible cases of gpio mux mode. Modified omap_mux_init() flags of omap34xx to include OMAP_MUX_GPIO_IN_MODE4. Signed-off-by: Oleg Matcovschi <oleg.matcovschi@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/mux34xx.c')
-rw-r--r--arch/arm/mach-omap2/mux34xx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/mux34xx.c b/arch/arm/mach-omap2/mux34xx.c
index c47140bbbec..c53609f4629 100644
--- a/arch/arm/mach-omap2/mux34xx.c
+++ b/arch/arm/mach-omap2/mux34xx.c
@@ -2053,7 +2053,7 @@ int __init omap3_mux_init(struct omap_board_mux *board_subset, int flags)
return -EINVAL;
}
- return omap_mux_init("core", 0,
+ return omap_mux_init("core", OMAP_MUX_GPIO_IN_MODE4,
OMAP3_CONTROL_PADCONF_MUX_PBASE,
OMAP3_CONTROL_PADCONF_MUX_SIZE,
omap3_muxmodes, package_subset, board_subset,