diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-09-20 21:45:56 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-09-20 21:45:56 +0200 |
| commit | 1fdb4888e45f1413972a8e9da55f3ffc08b9abcb (patch) | |
| tree | 635ef73cdff38d21a529bbdcab4cd2cb39a29484 /arch/arm/mach-omap2/clock44xx_data.c | |
| parent | 1884af9365a96314164f4110d4528d425e5dd843 (diff) | |
| parent | ceb1c532ba6220900e61ec7073a9234661efa450 (diff) | |
| download | olio-linux-3.10-1fdb4888e45f1413972a8e9da55f3ffc08b9abcb.tar.xz olio-linux-3.10-1fdb4888e45f1413972a8e9da55f3ffc08b9abcb.zip | |
Merge branch 'omap/cleanup' into next/cleanup
Diffstat (limited to 'arch/arm/mach-omap2/clock44xx_data.c')
| -rw-r--r-- | arch/arm/mach-omap2/clock44xx_data.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/clock44xx_data.c b/arch/arm/mach-omap2/clock44xx_data.c index 2af0e3f00ce..c0b6fbda340 100644 --- a/arch/arm/mach-omap2/clock44xx_data.c +++ b/arch/arm/mach-omap2/clock44xx_data.c @@ -3376,10 +3376,18 @@ int __init omap4xxx_clk_init(void) } else if (cpu_is_omap446x()) { cpu_mask = RATE_IN_4460; cpu_clkflg = CK_446X; + } else { + return 0; } clk_init(&omap2_clk_functions); - omap2_clk_disable_clkdm_control(); + + /* + * Must stay commented until all OMAP SoC drivers are + * converted to runtime PM, or drivers may start crashing + * + * omap2_clk_disable_clkdm_control(); + */ for (c = omap44xx_clks; c < omap44xx_clks + ARRAY_SIZE(omap44xx_clks); c++) |