On Sat, Oct 11, 2008 at 09:50:36PM +0300, Felipe Balbi wrote: > On Fri, Oct 10, 2008 at 07:56:13PM +0300, Peter 'p2' De Schrijver wrote: > > This patch makes twl4030 core call the power code in case the scripts are present in the platform data. > > > > Signed-off-by: Peter 'p2' De Schrijver <peter.de-schrijver@xxxxxxxxx> > > --- > > drivers/mfd/twl4030-core.c | 11 +++++++++++ > > 1 files changed, 11 insertions(+), 0 deletions(-) > > > > diff --git a/drivers/mfd/twl4030-core.c b/drivers/mfd/twl4030-core.c > > index fd9a016..7a5c9d0 100644 > > --- a/drivers/mfd/twl4030-core.c > > +++ b/drivers/mfd/twl4030-core.c > > @@ -81,6 +81,12 @@ > > #define twl_has_madc() false > > #endif > > > > +#ifdef CONFIG_TWL4030_POWER > > +#define twl_has_power() true > > +#else > > +#define twl_has_power() false > > +#endif > > + > > #if defined(CONFIG_RTC_DRV_TWL4030) || defined(CONFIG_RTC_DRV_TWL4030_MODULE) > > #define twl_has_rtc() true > > #else > > @@ -106,6 +112,8 @@ static inline void activate_irq(int irq) > > #endif > > } > > > > +extern void twl4030_power_init(struct twl4030_power_data *triton2_scripts); > > normally we avoid extern prototypes in C files. Tony and Sam, any > comments ?? checkpatch will bitch about it at least. No big deal, but it's probably cleaner to have that in some header file. Cheers, Samuel. > > + > > /* Primary Interrupt Handler on TWL4030 Registers */ > > > > /* Register Definitions */ > > @@ -794,6 +802,9 @@ static int add_children(struct twl4030_platform_data *pdata) > > } > > } > > > > + if (twl_has_power() && pdata->power) > > + twl4030_power_init(pdata->power); > > + > > if (twl_has_rtc()) { > > twl = &twl4030_modules[3]; > > > > -- > > 1.5.6.3 > > > > -- > > 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 > > -- > balbi -- Intel Open Source Technology Centre http://oss.intel.com/ -- 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