diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-02-28 12:26:06 +0000 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-28 12:26:10 +0000 |
commit | e0e5ce59dc7b2685516219fdf44f01a8d53e0228 (patch) | |
tree | 3c79c9c95589bba1b54f7c87172fcaa51d67a01b /arch/arm/mach-omap2 | |
parent | fdc24d4ba20499febb90ff17d3b75674026712f8 (diff) | |
parent | 6f6ea93705f8519fb53dbc1516abe94d1787f4c4 (diff) | |
download | op-kernel-dev-e0e5ce59dc7b2685516219fdf44f01a8d53e0228.zip op-kernel-dev-e0e5ce59dc7b2685516219fdf44f01a8d53e0228.tar.gz |
Merge branch 'imx/dt' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
* 'imx/dt' of git://git.linaro.org/people/shawnguo/linux-2.6: (7 commits)
ARM: dts: imx6q-sabrelite: add vmmc-supply for usdhc
ARM: dts: imx6q-arm2: add vmmc-supply for usdhc
ARM: dts: imx51-babbage: update mc13892 device
ARM: dts: imx6q-sabrelite: add sgtl5000 audio codec
ARM: dts: imx6q-sabrelite: add 2p5v and 3p3v regulators
ARM i.MX5/6: Add dt support for generic boards
ARM: imx5: generate dtbs for imx5 boards
(update to Linux 3.3-rc5)
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r-- | arch/arm/mach-omap2/voltagedomains3xxx_data.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/voltagedomains44xx_data.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/voltagedomains3xxx_data.c b/arch/arm/mach-omap2/voltagedomains3xxx_data.c index c005e2f..57db203 100644 --- a/arch/arm/mach-omap2/voltagedomains3xxx_data.c +++ b/arch/arm/mach-omap2/voltagedomains3xxx_data.c @@ -108,6 +108,7 @@ void __init omap3xxx_voltagedomains_init(void) * XXX Will depend on the process, validation, and binning * for the currently-running IC */ +#ifdef CONFIG_PM_OPP if (cpu_is_omap3630()) { omap3_voltdm_mpu.volt_data = omap36xx_vddmpu_volt_data; omap3_voltdm_core.volt_data = omap36xx_vddcore_volt_data; @@ -115,6 +116,7 @@ void __init omap3xxx_voltagedomains_init(void) omap3_voltdm_mpu.volt_data = omap34xx_vddmpu_volt_data; omap3_voltdm_core.volt_data = omap34xx_vddcore_volt_data; } +#endif if (cpu_is_omap3517() || cpu_is_omap3505()) voltdms = voltagedomains_am35xx; diff --git a/arch/arm/mach-omap2/voltagedomains44xx_data.c b/arch/arm/mach-omap2/voltagedomains44xx_data.c index 4e11d02..c3115f6 100644 --- a/arch/arm/mach-omap2/voltagedomains44xx_data.c +++ b/arch/arm/mach-omap2/voltagedomains44xx_data.c @@ -100,9 +100,11 @@ void __init omap44xx_voltagedomains_init(void) * XXX Will depend on the process, validation, and binning * for the currently-running IC */ +#ifdef CONFIG_PM_OPP omap4_voltdm_mpu.volt_data = omap44xx_vdd_mpu_volt_data; omap4_voltdm_iva.volt_data = omap44xx_vdd_iva_volt_data; omap4_voltdm_core.volt_data = omap44xx_vdd_core_volt_data; +#endif for (i = 0; voltdm = voltagedomains_omap4[i], voltdm; i++) voltdm->sys_clk.name = sys_clk_name; |