aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2
diff options
context:
space:
mode:
authorNishanth Menon <nm@ti.com>2013-06-25 18:56:00 -0500
committerKevin Hilman <khilman@linaro.org>2013-06-25 17:11:06 -0700
commit2ac524f151dbecb862c95b8f433267772caa800e (patch)
treedc4a8804a0718d31aa8ddfaf1a66bbf88841ea69 /arch/arm/mach-omap2
parent6503a8e109a639760408f874c1251060d563942e (diff)
ARM: OMAP5: voltagedomain data: remove temporary OMAP4 voltage data
commit 20d49e9ccfece526db755940721aa13e331936d4 (ARM: OMAP5: voltagedomain data: Add OMAP5 voltage domain data) Introduced dummy volt data for OMAP5 with OMAP4460 voltage information. However with the fixes introduced in later patches commit cd8abed1da91a3250aa4b3857479613a2b446f84 (ARM: OMAP2+: Powerdomain: Remove the need to always have a voltdm associated to a pwrdm) We are no longer restricted in that respect. Further, OPP voltage information is supposed to be provided by dts information. This needs to be added in future patches as various voltage modules are converted to dts. This also fixes the build breakage for voltagedomains54xx_data.c when just OMAP5 SoC is enabled: https://patchwork.kernel.org/patch/2764191/ Reported-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Nishanth Menon <nm@ti.com> Cc: Benoit Cousson <b-cousson@ti.com> Cc: Santosh Shilimkar <santosh.shilimkar@ti.com> Cc: Paul Walmsley <paul@pwsan.com> Cc: Tony Lindgren <tony@atomide.com> Cc: linux-omap@vger.kernel.org Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r--arch/arm/mach-omap2/voltagedomains54xx_data.c10
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 72b8971b54c..33d22b87252 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;