* [Resend PATCH 1/2] twl4030: Do not dereference null pointer in error path @ 2009-10-20 13:22 Ilkka Koskinen 2009-10-20 13:22 ` [Resend PATCH 2/2] twl4030: Enable low-power mode to 32kHz oscillator Ilkka Koskinen 2009-10-21 22:22 ` [Resend PATCH 1/2] twl4030: Do not dereference null pointer in error path Samuel Ortiz 0 siblings, 2 replies; 5+ messages in thread From: Ilkka Koskinen @ 2009-10-20 13:22 UTC (permalink / raw) To: sameo; +Cc: linux-kernel, linux-omap Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com> --- drivers/mfd/twl4030-core.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/mfd/twl4030-core.c b/drivers/mfd/twl4030-core.c index e424cf6..8cf0a02 100644 --- a/drivers/mfd/twl4030-core.c +++ b/drivers/mfd/twl4030-core.c @@ -792,7 +792,7 @@ twl4030_probe(struct i2c_client *client, const struct i2c_device_id *id) twl->client = i2c_new_dummy(client->adapter, twl->address); if (!twl->client) { - dev_err(&twl->client->dev, + dev_err(&client->dev, "can't attach client %d\n", i); status = -ENOMEM; goto fail; -- 1.6.0.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Resend PATCH 2/2] twl4030: Enable low-power mode to 32kHz oscillator 2009-10-20 13:22 [Resend PATCH 1/2] twl4030: Do not dereference null pointer in error path Ilkka Koskinen @ 2009-10-20 13:22 ` Ilkka Koskinen 2009-10-21 22:17 ` Samuel Ortiz 2009-10-21 22:22 ` [Resend PATCH 1/2] twl4030: Do not dereference null pointer in error path Samuel Ortiz 1 sibling, 1 reply; 5+ messages in thread From: Ilkka Koskinen @ 2009-10-20 13:22 UTC (permalink / raw) To: sameo; +Cc: linux-kernel, linux-omap Allows TWL's 32kHz oscillator to go in low-power mode when main battery voltage is running low. Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com> --- drivers/mfd/twl4030-core.c | 9 +++++++-- include/linux/i2c/twl4030.h | 5 +++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/mfd/twl4030-core.c b/drivers/mfd/twl4030-core.c index 8cf0a02..5596bb4 100644 --- a/drivers/mfd/twl4030-core.c +++ b/drivers/mfd/twl4030-core.c @@ -177,6 +177,7 @@ #define HFCLK_FREQ_26_MHZ (2 << 0) #define HFCLK_FREQ_38p4_MHZ (3 << 0) #define HIGH_PERF_SQ (1 << 3) +#define CK32K_LOWPWR_EN (1 << 7) /* chip-specific feature flags, for i2c_device_id.driver_data */ @@ -678,7 +679,8 @@ static inline int __init unprotect_pm_master(void) return e; } -static void clocks_init(struct device *dev) +static void clocks_init(struct device *dev, + struct twl4030_clock_init_data *clock) { int e = 0; struct clk *osc; @@ -725,6 +727,9 @@ static void clocks_init(struct device *dev) } ctrl |= HIGH_PERF_SQ; + if (clock && clock->ck32k_lowpwr_enable) + ctrl |= CK32K_LOWPWR_EN; + e |= unprotect_pm_master(); /* effect->MADC+USB ck en */ e |= twl4030_i2c_write_u8(TWL4030_MODULE_PM_MASTER, ctrl, R_CFG_BOOT); @@ -805,7 +810,7 @@ twl4030_probe(struct i2c_client *client, const struct i2c_device_id *id) inuse = true; /* setup clock framework */ - clocks_init(&client->dev); + clocks_init(&client->dev, pdata->clock); /* load power event scripts */ if (twl_has_power() && pdata->power) diff --git a/include/linux/i2c/twl4030.h b/include/linux/i2c/twl4030.h index 508824e..c8d5078 100644 --- a/include/linux/i2c/twl4030.h +++ b/include/linux/i2c/twl4030.h @@ -312,6 +312,10 @@ int twl4030_i2c_read(u8 mod_no, u8 *value, u8 reg, unsigned num_bytes); /*----------------------------------------------------------------------*/ +struct twl4030_clock_init_data { + int ck32k_lowpwr_enable; +}; + struct twl4030_bci_platform_data { int *battery_tmp_tbl; unsigned int tblsize; @@ -403,6 +407,7 @@ extern void twl4030_power_init(struct twl4030_power_data *triton2_scripts); struct twl4030_platform_data { unsigned irq_base, irq_end; + struct twl4030_clock_init_data *clock; struct twl4030_bci_platform_data *bci; struct twl4030_gpio_platform_data *gpio; struct twl4030_madc_platform_data *madc; -- 1.6.0.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Resend PATCH 2/2] twl4030: Enable low-power mode to 32kHz oscillator 2009-10-20 13:22 ` [Resend PATCH 2/2] twl4030: Enable low-power mode to 32kHz oscillator Ilkka Koskinen @ 2009-10-21 22:17 ` Samuel Ortiz 2009-10-22 11:05 ` Ilkka Koskinen 0 siblings, 1 reply; 5+ messages in thread From: Samuel Ortiz @ 2009-10-21 22:17 UTC (permalink / raw) To: Ilkka Koskinen; +Cc: linux-kernel, linux-omap Hi Ilkka, On Tue, Oct 20, 2009 at 04:22:53PM +0300, Ilkka Koskinen wrote: > +struct twl4030_clock_init_data { > + int ck32k_lowpwr_enable; I guess you could use a bool here ? Cheers, Samuel. > +}; > + > struct twl4030_bci_platform_data { > int *battery_tmp_tbl; > unsigned int tblsize; > @@ -403,6 +407,7 @@ extern void twl4030_power_init(struct twl4030_power_data *triton2_scripts); > > struct twl4030_platform_data { > unsigned irq_base, irq_end; > + struct twl4030_clock_init_data *clock; > struct twl4030_bci_platform_data *bci; > struct twl4030_gpio_platform_data *gpio; > struct twl4030_madc_platform_data *madc; > -- > 1.6.0.4 > -- Intel Open Source Technology Centre http://oss.intel.com/ ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Resend PATCH 2/2] twl4030: Enable low-power mode to 32kHz oscillator 2009-10-21 22:17 ` Samuel Ortiz @ 2009-10-22 11:05 ` Ilkka Koskinen 0 siblings, 0 replies; 5+ messages in thread From: Ilkka Koskinen @ 2009-10-22 11:05 UTC (permalink / raw) To: Samuel Ortiz; +Cc: linux-kernel, linux-omap Hi Samuel, On Thu, 22 Oct 2009, ext Samuel Ortiz wrote: > On Tue, Oct 20, 2009 at 04:22:53PM +0300, Ilkka Koskinen wrote: >> +struct twl4030_clock_init_data { >> + int ck32k_lowpwr_enable; > I guess you could use a bool here ? Good point. I'll change it. Cheers, Ilkka >> +}; >> + >> struct twl4030_bci_platform_data { >> int *battery_tmp_tbl; >> unsigned int tblsize; >> @@ -403,6 +407,7 @@ extern void twl4030_power_init(struct twl4030_power_data *triton2_scripts); >> >> struct twl4030_platform_data { >> unsigned irq_base, irq_end; >> + struct twl4030_clock_init_data *clock; >> struct twl4030_bci_platform_data *bci; >> struct twl4030_gpio_platform_data *gpio; >> struct twl4030_madc_platform_data *madc; >> -- >> 1.6.0.4 >> > > -- > 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@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Resend PATCH 1/2] twl4030: Do not dereference null pointer in error path 2009-10-20 13:22 [Resend PATCH 1/2] twl4030: Do not dereference null pointer in error path Ilkka Koskinen 2009-10-20 13:22 ` [Resend PATCH 2/2] twl4030: Enable low-power mode to 32kHz oscillator Ilkka Koskinen @ 2009-10-21 22:22 ` Samuel Ortiz 1 sibling, 0 replies; 5+ messages in thread From: Samuel Ortiz @ 2009-10-21 22:22 UTC (permalink / raw) To: Ilkka Koskinen; +Cc: linux-kernel, linux-omap Hi Ilkka, On Tue, Oct 20, 2009 at 04:22:52PM +0300, Ilkka Koskinen wrote: > Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com> Patch applied to my for-linus and for-next branches. I'll try to get that one merged for 2.6.32. Cheers, Samuel. > --- > drivers/mfd/twl4030-core.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/mfd/twl4030-core.c b/drivers/mfd/twl4030-core.c > index e424cf6..8cf0a02 100644 > --- a/drivers/mfd/twl4030-core.c > +++ b/drivers/mfd/twl4030-core.c > @@ -792,7 +792,7 @@ twl4030_probe(struct i2c_client *client, const struct i2c_device_id *id) > twl->client = i2c_new_dummy(client->adapter, > twl->address); > if (!twl->client) { > - dev_err(&twl->client->dev, > + dev_err(&client->dev, > "can't attach client %d\n", i); > status = -ENOMEM; > goto fail; > -- > 1.6.0.4 > -- Intel Open Source Technology Centre http://oss.intel.com/ ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2009-10-22 11:06 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2009-10-20 13:22 [Resend PATCH 1/2] twl4030: Do not dereference null pointer in error path Ilkka Koskinen 2009-10-20 13:22 ` [Resend PATCH 2/2] twl4030: Enable low-power mode to 32kHz oscillator Ilkka Koskinen 2009-10-21 22:17 ` Samuel Ortiz 2009-10-22 11:05 ` Ilkka Koskinen 2009-10-21 22:22 ` [Resend PATCH 1/2] twl4030: Do not dereference null pointer in error path Samuel Ortiz
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox