twl4030: linkage fix for generic power scripts

Section fixes for generic twl4030 power scripts.

NOTE:  doesn't fix the bug whereby Beagle won't reset when
these scripts are loaded.  Or fix SDP section warnings.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
index 9b7f4af34236326d8121bd91d7fae0c86521dac5..d98457c557105959effefb3c6988c53ad976bdd8 100644 (file)
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -206,7 +206,7 @@ static struct twl4030_platform_data beagle_twldata = {
        /* platform_data for children goes here */
        .usb            = &beagle_usb_data,
        .gpio           = &beagle_gpio_data,
-       .power          = &generic3430_t2scripts_data,
+       .power          = GENERIC3430_T2SCRIPTS_DATA,
        .vmmc1          = &beagle_vmmc1,
        .vsim           = &beagle_vsim,
        .vdac           = &beagle_vdac,

diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index b1dbe3eae4487ac0bb186deb1adb36dff8395b9a..8a1b86ef45575299075f3a1592f088ea59f1670d 100644 (file)
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -139,7 +139,7 @@ static struct twl4030_platform_data omap3evm_twldata = {
        .keypad         = &omap3evm_kp_data,
        .madc           = &omap3evm_madc_data,
        .usb            = &omap3evm_usb_data,
-       .power          = &generic3430_t2scripts_data,
+       .power          = GENERIC3430_T2SCRIPTS_DATA,
        .gpio           = &omap3evm_gpio_data,
 };
 

diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c
index 05dad04b6327490b67d7fd0f43549620ea713ae2..24db6dccb9918ecc1d348f810ca2c2809d8e9d30 100644 (file)
--- a/arch/arm/mach-omap2/board-overo.c
+++ b/arch/arm/mach-omap2/board-overo.c
@@ -162,7 +162,7 @@ static struct twl4030_platform_data overo_twldata = {
        .irq_end        = TWL4030_IRQ_END,
        .gpio           = &overo_gpio_data,
        .usb            = &overo_usb_data,
-       .power          = &generic3430_t2scripts_data,
+       .power          = GENERIC3430_T2SCRIPTS_DATA,
 };
 
 static struct i2c_board_info __initdata overo_i2c_boardinfo[] = {

diff --git a/arch/arm/mach-omap2/twl4030-generic-scripts.c b/arch/arm/mach-omap2/twl4030-generic-scripts.c
index f41c9effaee9c98860a538dff9075e2ea60c2d35..4293752732d88c31addcb03b88b2bc5834537df1 100644 (file)
--- a/arch/arm/mach-omap2/twl4030-generic-scripts.c
+++ b/arch/arm/mach-omap2/twl4030-generic-scripts.c
@@ -23,6 +23,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef CONFIG_TWL4030_POWER
+
 #include <linux/kernel.h>
 #include <linux/device.h>
 #include <linux/init.h>
@@ -76,3 +78,4 @@ struct twl4030_power_data generic3430_t2scripts_data __initdata = {
 };
 
 
+#endif /* CONFIG_TWL4030_POWER */

diff --git a/arch/arm/mach-omap2/twl4030-generic-scripts.h b/arch/arm/mach-omap2/twl4030-generic-scripts.h
index 64d8d3f6a33a1199174b4c1d8f70941c9582d16d..fb69c2e45bf87876c94ddf445b8cdf58fd48da71 100644 (file)
--- a/arch/arm/mach-omap2/twl4030-generic-scripts.h
+++ b/arch/arm/mach-omap2/twl4030-generic-scripts.h
@@ -3,6 +3,11 @@
 
 #include <linux/i2c/twl4030.h>
 
+#ifdef CONFIG_TWL4030_POWER
 extern struct twl4030_power_data generic3430_t2scripts_data;
+#define GENERIC3430_T2SCRIPTS_DATA &generic3430_t2scripts_data
+#else
+#define GENERIC3430_T2SCRIPTS_DATA NULL
+#endif /* CONFIG_TWL4030_POWER */
 
 #endif