diff options
| author | Oleg Matcovschi <oleg.matcovschi@ti.com> | 2012-11-26 20:02:03 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-12-14 14:11:34 -0500 |
| commit | 421e84509980206fb3b3bc039bc05bae1dd41c7b (patch) | |
| tree | a15c269e3db4db310ba0b1a0610b2a095d18c76e /arch/arm/mach-omap2/mux34xx.c | |
| parent | ca2e16faa7378878c1522a7c1b6c38211de3331d (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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/mux34xx.c b/arch/arm/mach-omap2/mux34xx.c index c47140bbbec4..c53609f46294 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) | |||
| 2053 | return -EINVAL; | 2053 | return -EINVAL; |
| 2054 | } | 2054 | } |
| 2055 | 2055 | ||
| 2056 | return omap_mux_init("core", 0, | 2056 | return omap_mux_init("core", OMAP_MUX_GPIO_IN_MODE4, |
| 2057 | OMAP3_CONTROL_PADCONF_MUX_PBASE, | 2057 | OMAP3_CONTROL_PADCONF_MUX_PBASE, |
| 2058 | OMAP3_CONTROL_PADCONF_MUX_SIZE, | 2058 | OMAP3_CONTROL_PADCONF_MUX_SIZE, |
| 2059 | omap3_muxmodes, package_subset, board_subset, | 2059 | omap3_muxmodes, package_subset, board_subset, |