diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-09-05 12:59:29 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-09-05 12:59:29 +0200 |
| commit | b40aeb00d32f07c5b1b617ea4e88032cb895d8b3 (patch) | |
| tree | f4161ad66628cd2c2733161d90c18bfa69eb5d8a /arch/arm/boards/pcm049/mux.c | |
| parent | 6cb993c0cd0644d7b559cda6b84e4c196fc029dc (diff) | |
| parent | 466b62f4f3ed361c0e60c8e345ffe2cb0733594e (diff) | |
| download | barebox-b40aeb00d32f07c5b1b617ea4e88032cb895d8b3.tar.gz barebox-b40aeb00d32f07c5b1b617ea4e88032cb895d8b3.tar.xz | |
Merge branch 'for-next/omap'
Diffstat (limited to 'arch/arm/boards/pcm049/mux.c')
| -rw-r--r-- | arch/arm/boards/pcm049/mux.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/boards/pcm049/mux.c b/arch/arm/boards/pcm049/mux.c index a7a77b5adc..04e1d67214 100644 --- a/arch/arm/boards/pcm049/mux.c +++ b/arch/arm/boards/pcm049/mux.c @@ -3,6 +3,7 @@ #include <io.h> #include <mach/omap4-silicon.h> #include <mach/omap4-mux.h> +#include <mach/omap4-clock.h> static const struct pad_conf_entry core_padconf_array[] = { {GPMC_AD0, (IEN | PTD | DIS | M0)}, /* gpmc_ad0 */ @@ -242,4 +243,11 @@ void set_muxconf_regs(void) omap4_do_set_mux(OMAP44XX_CONTROL_PADCONF_WKUP, wkup_padconf_array, ARRAY_SIZE(wkup_padconf_array)); + + /* gpio_182 is used for controlling TPS on 4460 */ + if (omap4_revision() >= OMAP4460_ES1_0) { + writew(M3, OMAP44XX_CONTROL_PADCONF_CORE + FREF_CLK2_OUT); + /* Enable GPIO-1 clocks before TPS initialization */ + omap4_enable_gpio_clocks(); + } } |