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@xxxxxxxx> Signed-off-by: Nishanth Menon <nm@xxxxxx> Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx> Cc: Benoit Cousson <b-cousson@xxxxxx> Cc: Santosh Shilimkar <santosh.shilimkar@xxxxxx> Cc: Paul Walmsley <paul@xxxxxxxxx> Cc: Tony Lindgren <tony@xxxxxxxxxxx> Cc: linux-omap@xxxxxxxxxxxxxxx --- Discussed in thread: http://marc.info/?t=137184664400002&r=1&w=2 Tested against linux-next-20130625 + git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux.git for_3.11/out_of_tree/omap5_clk_data with omap2plus_defconfig on OMAP5432 uEVM. NOTE: we still have the issue reported in https://patchwork.kernel.org/patch/2568091/ and "ARM: OMAP2+: AM43x: resolve SMP related build error" does not help solve the problem either for OMAP5. arch/arm/mach-omap2/voltagedomains54xx_data.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/arch/arm/mach-omap2/voltagedomains54xx_data.c b/arch/arm/mach-omap2/voltagedomains54xx_data.c index 72b8971..33d22b8 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; -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
