summaryrefslogtreecommitdiff
path: root/arch/arm/cpu/armv7/omap4/board.c
diff options
context:
space:
mode:
authorRicardo Salveti de Araujo <ricardo.salveti@linaro.org>2011-09-21 10:17:31 (GMT)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2011-10-27 19:56:34 (GMT)
commit53430a4f251eacc32ada54b56258cc18856d0d8e (patch)
tree64d533453906290ff26d8152a8004d32fc847c3b /arch/arm/cpu/armv7/omap4/board.c
parent8f6a027f627d6002bedc3ab12610535dbf9ef497 (diff)
downloadu-boot-53430a4f251eacc32ada54b56258cc18856d0d8e.tar.xz
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> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
Diffstat (limited to 'arch/arm/cpu/armv7/omap4/board.c')
-rw-r--r--arch/arm/cpu/armv7/omap4/board.c6
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 6d8811f..2497e3e 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)