diff options
| author | Ricardo Salveti de Araujo <ricardo.salveti@linaro.org> | 2011-09-21 17:17:31 -0300 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-09-23 07:10:44 -0600 |
| commit | 69773ad5a2b80761e51f9ccc8966f6ac5d0434df (patch) | |
| tree | 1e408c6ae6616b5ccfcd6ac1a2081df4b805efbb /arch/arm/cpu/armv7/omap4/board.c | |
| parent | a4c9ed1a0055a057d2836c5f8b4506d1c0b971a4 (diff) | |
omap4: splitting padconfs into common, 4430 and 4460
Not all padconfs are the same between 4430 and 4460, so instead of
working around this with an if, we should have an specific padconf
structure for both chips (like handling the differences between the LEDs
GPIOs and TPS).
Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@linaro.org>
4 files changed, 40 insertions(+), 4 deletions(-)
Diffstat (limited to 'arch/arm/cpu/armv7/omap4/board.c')
| -rw-r--r-- | arch/arm/cpu/armv7/omap4/board.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv7/omap4/board.c b/arch/arm/cpu/armv7/omap4/board.c index d9639ab88..b84278279 100644 --- a/arch/arm/cpu/armv7/omap4/board.c +++ b/arch/arm/cpu/armv7/omap4/board.c @@ -152,9 +152,11 @@ static void set_muxconf_regs_essential(void) sizeof(wkup_padconf_array_essential) / sizeof(struct pad_conf_entry)); - /* gpio_wk7 is used for controlling TPS on 4460 */ if (omap_revision() >= OMAP4460_ES1_0) - writew(M3, CONTROL_WKUP_PAD1_FREF_CLK4_REQ); + do_set_mux(CONTROL_PADCONF_WKUP, + wkup_padconf_array_essential_4460, + sizeof(wkup_padconf_array_essential_4460) / + sizeof(struct pad_conf_entry)); } static void set_mux_conf_regs(void) |