diff options
| author | Olof Johansson <olof@lixom.net> | 2013-02-05 23:06:09 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-02-05 23:06:25 +0100 |
| commit | 61cfd8736040dd2d620278fb11c6c4acfeb041c9 (patch) | |
| tree | a3191d768acd36a5aff52eabe0892860dfd96730 /arch/arm/mach-omap2/cclock2430_data.c | |
| parent | Merge tag 'tegra-for-3.9-defconfig' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | ARM: OMAP2+: omap2plus_defconfig: enable omap1 rtc (diff) | |
| download | linux-61cfd8736040dd2d620278fb11c6c4acfeb041c9.tar.xz linux-61cfd8736040dd2d620278fb11c6c4acfeb041c9.zip | |
Merge tag 'omap-for-v3.9/board-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/boards
From Tony Lindgren:
Minimal updates to OMAP board-*.c files while converting
things to device tree based booting.
* tag 'omap-for-v3.9/board-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP2+: omap2plus_defconfig: enable omap1 rtc
RX-51: Register twl4030-madc device
RX-51: Add leds lp5523 names from Maemo 5 2.6.28 kernel
ARM: OMAP2+: AM33XX: omap2plus_defconfig: Add support for few drivers
ARM: OMAP1: nokia770: enable CBUS/Retu
ARM: OMAP2+: omap2plus_defconfig: enable CMA allocator
ARM: OMAP2+: omap2plus_defconfig: enable TFP410 chip support
ARM: OMAP3: igep0020: simplify GPIO LEDs dependencies
ARM: OMAP2+: craneboard: support the TPS65910 PMU
ARM: OMAP2+: craneboard: support NAND device
ARM: OMAP3: cm-t3517: add MMC support
ARM: OMAP2+: Remove apollon board support
+ Linux 3.8-rc6
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-omap2/cclock2430_data.c')
| -rw-r--r-- | arch/arm/mach-omap2/cclock2430_data.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/cclock2430_data.c b/arch/arm/mach-omap2/cclock2430_data.c index eda079b96c6a..eb3dab68d536 100644 --- a/arch/arm/mach-omap2/cclock2430_data.c +++ b/arch/arm/mach-omap2/cclock2430_data.c @@ -2050,6 +2050,8 @@ int __init omap2430_clk_init(void) omap2_init_clk_hw_omap_clocks(c->lk.clk); } + omap2xxx_clkt_vps_late_init(); + omap2_clk_disable_autoidle_all(); omap2_clk_enable_init_clocks(enable_init_clks, |