Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ddd4d0c authored by Russell King's avatar Russell King
Browse files

ARM: OMAP: fix voltage domain build errors with PM_OPP disabled 



The voltage domain code wants the voltage tables, which are in the
opp*.c files.  These files aren't built when PM_OPP is disabled,
causing the following build errors at link time:

twl-common.c:(.init.text+0x2e48): undefined reference to `omap34xx_vddmpu_volt_data'
twl-common.c:(.init.text+0x2e4c): undefined reference to `omap34xx_vddcore_volt_data'
twl-common.c:(.init.text+0x2e5c): undefined reference to `omap36xx_vddmpu_volt_data'
twl-common.c:(.init.text+0x2e60): undefined reference to `omap36xx_vddcore_volt_data'
twl-common.c:(.init.text+0x2830): undefined reference to `omap44xx_vdd_mpu_volt_data'
twl-common.c:(.init.text+0x283c): undefined reference to `omap44xx_vdd_iva_volt_data'
twl-common.c:(.init.text+0x2844): undefined reference to `omap44xx_vdd_core_volt_data'

Acked-by: default avatarKevin Hilman <khilman@ti.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent e23e8c06

arch/arm/mach-omap2/voltagedomains3xxx_data.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -108,6 +108,7 @@ void __init omap3xxx_voltagedomains_init(void) 
	 * XXX Will depend on the process, validation, and binning

	 * XXX Will depend on the process, validation, and binning

	 * for the currently-running IC

	 * for the currently-running IC

	 */

	 */

#ifdef CONFIG_PM_OPP

	if (cpu_is_omap3630()) {

	if (cpu_is_omap3630()) {

		omap3_voltdm_mpu.volt_data = omap36xx_vddmpu_volt_data;

		omap3_voltdm_mpu.volt_data = omap36xx_vddmpu_volt_data;

		omap3_voltdm_core.volt_data = omap36xx_vddcore_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_mpu.volt_data = omap34xx_vddmpu_volt_data;

		omap3_voltdm_core.volt_data = omap34xx_vddcore_volt_data;

		omap3_voltdm_core.volt_data = omap34xx_vddcore_volt_data;

	}

	}

#endif





	if (cpu_is_omap3517() || cpu_is_omap3505())

	if (cpu_is_omap3517() || cpu_is_omap3505())

		voltdms = voltagedomains_am35xx;

		voltdms = voltagedomains_am35xx;

arch/arm/mach-omap2/voltagedomains44xx_data.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -100,9 +100,11 @@ void __init omap44xx_voltagedomains_init(void) 
	 * XXX Will depend on the process, validation, and binning

	 * XXX Will depend on the process, validation, and binning

	 * for the currently-running IC

	 * for the currently-running IC

	 */

	 */

#ifdef CONFIG_PM_OPP

	omap4_voltdm_mpu.volt_data = omap44xx_vdd_mpu_volt_data;

	omap4_voltdm_mpu.volt_data = omap44xx_vdd_mpu_volt_data;

	omap4_voltdm_iva.volt_data = omap44xx_vdd_iva_volt_data;

	omap4_voltdm_iva.volt_data = omap44xx_vdd_iva_volt_data;

	omap4_voltdm_core.volt_data = omap44xx_vdd_core_volt_data;

	omap4_voltdm_core.volt_data = omap44xx_vdd_core_volt_data;

#endif





	for (i = 0; voltdm = voltagedomains_omap4[i], voltdm; i++)

	for (i = 0; voltdm = voltagedomains_omap4[i], voltdm; i++)

		voltdm->sys_clk.name = sys_clk_name;

		voltdm->sys_clk.name = sys_clk_name;