diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-11-30 14:46:36 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-11-30 14:46:36 -0800 |
| commit | 52aa8c539dad56728527de664f368915ff44badf (patch) | |
| tree | 4aa8615023e0bc49153e1dc160fd727f09eb4f71 /arch/arm/mach-omap2/mux2430.c | |
| parent | 55a4e78952286d498d89a399d845e7cfaa8ddd56 (diff) | |
| parent | 032a6424aeea7333a8dafc8cc05dd10b09c62680 (diff) | |
Merge branch 'ctrl-wip/mux-omap4-v4' of git://gitorious.org/omap-pm/linux into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/mux2430.c')
| -rw-r--r-- | arch/arm/mach-omap2/mux2430.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/mux2430.c b/arch/arm/mach-omap2/mux2430.c index 84d2c5a7ecd..4185f92553d 100644 --- a/arch/arm/mach-omap2/mux2430.c +++ b/arch/arm/mach-omap2/mux2430.c @@ -781,11 +781,13 @@ int __init omap2430_mux_init(struct omap_board_mux *board_subset, int flags) package_balls = omap2430_pop_ball; break; default: - pr_warning("mux: No ball data available for omap2420 package\n"); + pr_warning("%s: No ball data available for omap2420 package\n", + __func__); } - return omap_mux_init(OMAP2430_CONTROL_PADCONF_MUX_PBASE, + return omap_mux_init("core", OMAP_MUX_REG_8BIT | OMAP_MUX_GPIO_IN_MODE3, + OMAP2430_CONTROL_PADCONF_MUX_PBASE, OMAP2430_CONTROL_PADCONF_MUX_SIZE, - omap2430_muxmodes, NULL, board_subset, - package_balls); + omap2430_muxmodes, NULL, board_subset, + package_balls); } |