ARM: omap2+: stub out omap*_volt_data

When CONFIG_PM_OPP is not set, the definitions for these variables are not available, so we should conditionally define them to NULL.

arch/arm/mach-omap2/built-in.o: In function `omap3xxx_voltagedomains_init':
voltagedomains3xxx_data.c:100: undefined reference to omap36xx_vddmpu_volt_data' voltagedomains3xxx_data.c:100: undefined reference to omap34xx_vddmpu_volt_data' voltagedomains3xxx_data.c:100: undefined reference to omap36xx_vddcore_volt_data' voltagedomains3xxx_data.c:100: undefined reference to omap34xx_vddcore_volt_data' arch/arm/mach-omap2/built-in.o: In function `omap44xx_voltagedomains_init':
voltagedomains44xx_data.c:111: undefined reference to omap44xx_vdd_mpu_volt_data' voltagedomains44xx_data.c:111: undefined reference to omap44xx_vdd_iva_volt_data' voltagedomains44xx_data.c:111: undefined reference to `omap44xx_vdd_core_volt_data'

---
I got this build error only now after pulling in the latest omap series, but I cannot tell what caused it. It's also not clear to me if this is the correct solution. Please ack or provide a better fix.

 arch/arm/mach-omap2/omap_opp_data.h |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

index c784c12..fdbf96b 100644
@@ -83,7 +83,7 @@ struct omap_opp_def {
 extern int __init omap_init_opp_table(struct omap_opp_def *opp_def,
 		u32 opp_def_size);
 
-
+#ifdef CONFIG_PM_OPP
 extern struct omap_volt_data omap34xx_vddmpu_volt_data[];
 extern struct omap_volt_data omap34xx_vddcore_volt_data[];
 extern struct omap_volt_data omap36xx_vddmpu_volt_data[];

@@ -93,4 +93,15 @@ extern struct omap_volt_data omap44xx_vdd_mpu_volt_data[];
 extern struct omap_volt_data omap44xx_vdd_iva_volt_data[];
 extern struct omap_volt_data omap44xx_vdd_core_volt_data[];
 
+#else
+#define omap34xx_vddmpu_volt_data	NULL
+#define omap34xx_vddcore_volt_data	NULL
+#define omap36xx_vddmpu_volt_data	NULL
+#define omap36xx_vddcore_volt_data	NULL
+
+#define omap44xx_vdd_mpu_volt_data	NULL
+#define omap44xx_vdd_iva_volt_data	NULL
+#define omap44xx_vdd_core_volt_data	NULL
+#endif
+
 #endif		/* __ARCH_ARM_MACH_OMAP2_OMAP_OPP_DATA_H */

1.7.5.4

This code was merged for v2.6.39, so not sure why this error is only showing up for you now. I just tried a !CONFIG_PM_OPP build on v2.6.39 and get the same errors, so it's been lingering.

Maybe you haven't had a randconfig that disabled CONFIG_PM_OPP before?

Anyways, the fix is fine with me.

Kevin

I don't know. The best explanation is that this is a very unlikely case. I've done many thousand randconfig builds now and have not seen it before.

Of course, since the output of randconfig is random, it could indeed just be a coincidence.

Thanks,

Arnd