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/mux.h | |
| parent | d4ff6121b44081601206980cafcd6ed3ecb367b6 (diff) | |
| download | blackbird-op-linux-21a42c92750446008dc0847a78aba5459e3b6b5a.tar.gz blackbird-op-linux-21a42c92750446008dc0847a78aba5459e3b6b5a.zip | |
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/mux.h')
| -rw-r--r-- | arch/arm/mach-omap2/mux.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/mux.h b/arch/arm/mach-omap2/mux.h index 137f321c029f..2132308ad1e4 100644 --- a/arch/arm/mach-omap2/mux.h +++ b/arch/arm/mach-omap2/mux.h @@ -323,10 +323,12 @@ int omap3_mux_init(struct omap_board_mux *board_mux, int flags); /** * omap4_mux_init() - initialize mux system with board specific set - * @board_mux: Board specific mux table + * @board_subset: Board specific mux table + * @board_wkup_subset: Board specific mux table for wakeup instance * @flags: OMAP package type used for the board */ -int omap4_mux_init(struct omap_board_mux *board_mux, int flags); +int omap4_mux_init(struct omap_board_mux *board_subset, + struct omap_board_mux *board_wkup_subset, int flags); /** * omap_mux_init - private mux init function, do not call |
