diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-06-26 18:52:01 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-06-26 18:52:01 +0400 |
| commit | ece585df6ee6cbf7103b5e51485ad58d85fd84f2 (patch) | |
| tree | b186aad19c55f26315dc7c3deb41a8272703a2ed /arch/arm | |
| parent | 8ecb6ca61ac673f3712f82259de5b0a25d21d532 (diff) | |
| parent | 2ac524f151dbecb862c95b8f433267772caa800e (diff) | |
| download | linux-ece585df6ee6cbf7103b5e51485ad58d85fd84f2.tar.xz | |
Merge tag 'omap-pm-v3.11/fixes/omap5-voltdm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into next/soc
From Kevin Hilman:
OMAP5: PM: fix boot by removing unneeded dummy voltage domain data
* tag 'omap-pm-v3.11/fixes/omap5-voltdm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm:
ARM: OMAP5: voltagedomain data: remove temporary OMAP4 voltage data
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-omap2/voltagedomains54xx_data.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/mach-omap2/voltagedomains54xx_data.c b/arch/arm/mach-omap2/voltagedomains54xx_data.c index 72b8971b54c7..33d22b87252d 100644 --- a/arch/arm/mach-omap2/voltagedomains54xx_data.c +++ b/arch/arm/mach-omap2/voltagedomains54xx_data.c @@ -85,16 +85,6 @@ void __init omap54xx_voltagedomains_init(void) struct voltagedomain *voltdm; int i; - /* - * XXX Will depend on the process, validation, and binning - * for the currently-running IC. Use OMAP4 data for time being. - */ -#ifdef CONFIG_PM_OPP - omap5_voltdm_mpu.volt_data = omap446x_vdd_mpu_volt_data; - omap5_voltdm_mm.volt_data = omap446x_vdd_iva_volt_data; - omap5_voltdm_core.volt_data = omap446x_vdd_core_volt_data; -#endif - for (i = 0; voltdm = voltagedomains_omap5[i], voltdm; i++) voltdm->sys_clk.name = sys_clk_name; |