diff options
Diffstat (limited to 'arch/arm/cpu')
-rw-r--r-- | arch/arm/cpu/armv7/omap4/board.c | 6 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/omap4/omap4_mux_data.h | 7 |
2 files changed, 11 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) diff --git a/arch/arm/cpu/armv7/omap4/omap4_mux_data.h b/arch/arm/cpu/armv7/omap4/omap4_mux_data.h index 00c52f8..b940391 100644 --- a/arch/arm/cpu/armv7/omap4/omap4_mux_data.h +++ b/arch/arm/cpu/armv7/omap4/omap4_mux_data.h @@ -73,4 +73,11 @@ const struct pad_conf_entry wkup_padconf_array_essential[] = { }; +const struct pad_conf_entry wkup_padconf_array_essential_4460[] = { + +{PAD1_FREF_CLK4_REQ, (M3)}, /* gpio_wk7, TPS */ + +}; + + #endif /* _OMAP4_MUX_DATA_H_ */ |