| Message ID | 1347532819-505-6-git-send-email-rachna@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 09/13/2012 12:40 PM, Patil, Rachna wrote: > This patch adds support for suspend/resume of > TSC/ADC MFDevice. > > Signed-off-by: Patil, Rachna <rachna@ti.com> > --- > Changes in v2: > Added this patch newly in this patch series. > > Changes in v3: > No changes. > > drivers/iio/adc/ti_adc.c | 32 ++++++++++++++++++++++++++++++++ > drivers/input/touchscreen/ti_tsc.c | 33 +++++++++++++++++++++++++++++++++ > drivers/mfd/ti_tscadc.c | 33 ++++++++++++++++++++++++++++++++- > include/linux/mfd/ti_tscadc.h | 3 +++ > 4 files changed, 100 insertions(+), 1 deletions(-) > > diff --git a/drivers/iio/adc/ti_adc.c b/drivers/iio/adc/ti_adc.c > index 56f8af2..69f19f0 100644 > --- a/drivers/iio/adc/ti_adc.c > +++ b/drivers/iio/adc/ti_adc.c > @@ -207,6 +207,36 @@ static int __devexit tiadc_remove(struct platform_device *pdev) > return 0; > } > [...] > static struct platform_driver tiadc_driver = { > .driver = { > .name = "tiadc", > @@ -214,6 +244,8 @@ static struct platform_driver tiadc_driver = { > }, > .probe = tiadc_probe, > .remove = __devexit_p(tiadc_remove), > + .suspend = adc_suspend, > + .resume = adc_resume, > }; > Using the suspend/resume callbacks is deprecated, please use dev_pm_ops. Same comment applies to the other two drivers. -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Sep 13, 2012 at 18:31:35, Lars-Peter Clausen wrote: > On 09/13/2012 12:40 PM, Patil, Rachna wrote: > > This patch adds support for suspend/resume of TSC/ADC MFDevice. > > > > Signed-off-by: Patil, Rachna <rachna@ti.com> > > --- > > Changes in v2: > > Added this patch newly in this patch series. > > > > Changes in v3: > > No changes. > > > > drivers/iio/adc/ti_adc.c | 32 ++++++++++++++++++++++++++++++++ > > drivers/input/touchscreen/ti_tsc.c | 33 +++++++++++++++++++++++++++++++++ > > drivers/mfd/ti_tscadc.c | 33 ++++++++++++++++++++++++++++++++- > > include/linux/mfd/ti_tscadc.h | 3 +++ > > 4 files changed, 100 insertions(+), 1 deletions(-) > > > > diff --git a/drivers/iio/adc/ti_adc.c b/drivers/iio/adc/ti_adc.c index > > 56f8af2..69f19f0 100644 > > --- a/drivers/iio/adc/ti_adc.c > > +++ b/drivers/iio/adc/ti_adc.c > > @@ -207,6 +207,36 @@ static int __devexit tiadc_remove(struct platform_device *pdev) > > return 0; > > } > > > [...] > > static struct platform_driver tiadc_driver = { > > .driver = { > > .name = "tiadc", > > @@ -214,6 +244,8 @@ static struct platform_driver tiadc_driver = { > > }, > > .probe = tiadc_probe, > > .remove = __devexit_p(tiadc_remove), > > + .suspend = adc_suspend, > > + .resume = adc_resume, > > }; > > > > > Using the suspend/resume callbacks is deprecated, please use dev_pm_ops. > Same comment applies to the other two drivers. Ok. I will make changes in all the 3 driver to use dev_pm_ops instead of suspend/resume callbacks. Regards, Rachna > > > -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
> -----Original Message----- > From: linux-kernel-owner@vger.kernel.org [mailto:linux-kernel- > owner@vger.kernel.org] On Behalf Of Patil, Rachna > Sent: Friday, September 14, 2012 10:29 AM > To: Lars-Peter Clausen > Cc: linux-kernel@vger.kernel.org; linux-input@vger.kernel.org; linux- > iio@vger.kernel.org; Samuel Ortiz; Dmitry Torokhov; Dmitry Torokhov; > Jonathan Cameron > Subject: RE: [PATCH v3 5/5] MFD: ti_tscadc: add suspend/resume > functionality > > On Thu, Sep 13, 2012 at 18:31:35, Lars-Peter Clausen wrote: > > On 09/13/2012 12:40 PM, Patil, Rachna wrote: > > > This patch adds support for suspend/resume of TSC/ADC MFDevice. > > > > > > Signed-off-by: Patil, Rachna <rachna@ti.com> > > > --- > > > Changes in v2: > > > Added this patch newly in this patch series. > > > > > > Changes in v3: > > > No changes. > > > > > > drivers/iio/adc/ti_adc.c | 32 > ++++++++++++++++++++++++++++++++ > > > drivers/input/touchscreen/ti_tsc.c | 33 > +++++++++++++++++++++++++++++++++ > > > drivers/mfd/ti_tscadc.c | 33 > ++++++++++++++++++++++++++++++++- > > > include/linux/mfd/ti_tscadc.h | 3 +++ > > > 4 files changed, 100 insertions(+), 1 deletions(-) > > > > > > diff --git a/drivers/iio/adc/ti_adc.c b/drivers/iio/adc/ti_adc.c index > > > 56f8af2..69f19f0 100644 > > > --- a/drivers/iio/adc/ti_adc.c > > > +++ b/drivers/iio/adc/ti_adc.c > > > @@ -207,6 +207,36 @@ static int __devexit tiadc_remove(struct > platform_device *pdev) > > > return 0; > > > } > > > > > [...] > > > static struct platform_driver tiadc_driver = { > > > .driver = { > > > .name = "tiadc", > > > @@ -214,6 +244,8 @@ static struct platform_driver tiadc_driver = { > > > }, > > > .probe = tiadc_probe, > > > .remove = __devexit_p(tiadc_remove), > > > + .suspend = adc_suspend, > > > + .resume = adc_resume, > > > }; > > > > > > > > > Using the suspend/resume callbacks is deprecated, please use > dev_pm_ops. > > Same comment applies to the other two drivers. > > Ok. I will make changes in all the 3 driver to use dev_pm_ops instead of > suspend/resume callbacks. Probably you might need to protect suspend/resumes with CONFIG_PM. > > Regards, > Rachna > > > > > > > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Sep 14, 2012 at 10:39:20, Venu Byravarasu wrote: > > -----Original Message----- > > From: linux-kernel-owner@vger.kernel.org [mailto:linux-kernel- > > owner@vger.kernel.org] On Behalf Of Patil, Rachna > > Sent: Friday, September 14, 2012 10:29 AM > > To: Lars-Peter Clausen > > Cc: linux-kernel@vger.kernel.org; linux-input@vger.kernel.org; linux- > > iio@vger.kernel.org; Samuel Ortiz; Dmitry Torokhov; Dmitry Torokhov; > > Jonathan Cameron > > Subject: RE: [PATCH v3 5/5] MFD: ti_tscadc: add suspend/resume > > functionality > > > > On Thu, Sep 13, 2012 at 18:31:35, Lars-Peter Clausen wrote: > > > On 09/13/2012 12:40 PM, Patil, Rachna wrote: > > > > This patch adds support for suspend/resume of TSC/ADC MFDevice. > > > > > > > > Signed-off-by: Patil, Rachna <rachna@ti.com> > > > > --- > > > > Changes in v2: > > > > Added this patch newly in this patch series. > > > > > > > > Changes in v3: > > > > No changes. > > > > > > > > drivers/iio/adc/ti_adc.c | 32 > > ++++++++++++++++++++++++++++++++ > > > > drivers/input/touchscreen/ti_tsc.c | 33 > > +++++++++++++++++++++++++++++++++ > > > > drivers/mfd/ti_tscadc.c | 33 > > ++++++++++++++++++++++++++++++++- > > > > include/linux/mfd/ti_tscadc.h | 3 +++ > > > > 4 files changed, 100 insertions(+), 1 deletions(-) > > > > > > > > diff --git a/drivers/iio/adc/ti_adc.c b/drivers/iio/adc/ti_adc.c > > > > index 56f8af2..69f19f0 100644 > > > > --- a/drivers/iio/adc/ti_adc.c > > > > +++ b/drivers/iio/adc/ti_adc.c > > > > @@ -207,6 +207,36 @@ static int __devexit tiadc_remove(struct > > platform_device *pdev) > > > > return 0; > > > > } > > > > > > > [...] > > > > static struct platform_driver tiadc_driver = { > > > > .driver = { > > > > .name = "tiadc", > > > > @@ -214,6 +244,8 @@ static struct platform_driver tiadc_driver = { > > > > }, > > > > .probe = tiadc_probe, > > > > .remove = __devexit_p(tiadc_remove), > > > > + .suspend = adc_suspend, > > > > + .resume = adc_resume, > > > > }; > > > > > > > > > > > > > Using the suspend/resume callbacks is deprecated, please use > > dev_pm_ops. > > > Same comment applies to the other two drivers. > > > > Ok. I will make changes in all the 3 driver to use dev_pm_ops instead > > of suspend/resume callbacks. > > Probably you might need to protect suspend/resumes with CONFIG_PM. Yes, I will add that as well. Regards, Rachna -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/iio/adc/ti_adc.c b/drivers/iio/adc/ti_adc.c index 56f8af2..69f19f0 100644 --- a/drivers/iio/adc/ti_adc.c +++ b/drivers/iio/adc/ti_adc.c @@ -207,6 +207,36 @@ static int __devexit tiadc_remove(struct platform_device *pdev) return 0; } +static int adc_suspend(struct platform_device *pdev, pm_message_t state) +{ + struct ti_tscadc_dev *tscadc_dev = pdev->dev.platform_data; + struct adc_device *adc_dev = tscadc_dev->adc; + unsigned int idle; + + if (!device_may_wakeup(tscadc_dev->dev)) { + idle = adc_readl(adc_dev, REG_CTRL); + idle &= ~(CNTRLREG_TSCSSENB); + adc_writel(adc_dev, REG_CTRL, (idle | + CNTRLREG_POWERDOWN)); + } + return 0; +} + +static int adc_resume(struct platform_device *pdev) +{ + struct ti_tscadc_dev *tscadc_dev = pdev->dev.platform_data; + struct adc_device *adc_dev = tscadc_dev->adc; + unsigned int restore; + + /* Make sure ADC is powered up */ + restore = adc_readl(adc_dev, REG_CTRL); + restore &= ~(CNTRLREG_POWERDOWN); + adc_writel(adc_dev, REG_CTRL, restore); + + adc_step_config(adc_dev); + return 0; +} + static struct platform_driver tiadc_driver = { .driver = { .name = "tiadc", @@ -214,6 +244,8 @@ static struct platform_driver tiadc_driver = { }, .probe = tiadc_probe, .remove = __devexit_p(tiadc_remove), + .suspend = adc_suspend, + .resume = adc_resume, }; module_platform_driver(tiadc_driver); diff --git a/drivers/input/touchscreen/ti_tsc.c b/drivers/input/touchscreen/ti_tsc.c index ca8ce73..f103e5f 100644 --- a/drivers/input/touchscreen/ti_tsc.c +++ b/drivers/input/touchscreen/ti_tsc.c @@ -338,6 +338,37 @@ static int __devexit tscadc_remove(struct platform_device *pdev) return 0; } +static int tsc_suspend(struct platform_device *pdev, pm_message_t state) +{ + struct ti_tscadc_dev *tscadc_dev = pdev->dev.platform_data; + struct tscadc *ts_dev = tscadc_dev->tsc; + unsigned int idle; + + if (device_may_wakeup(tscadc_dev->dev)) { + idle = tscadc_readl(ts_dev, REG_IRQENABLE); + tscadc_writel(ts_dev, REG_IRQENABLE, + (idle | IRQENB_HW_PEN)); + tscadc_writel(ts_dev, REG_IRQWAKEUP, IRQWKUP_ENB); + } + return 0; +} + +static int tsc_resume(struct platform_device *pdev) +{ + struct ti_tscadc_dev *tscadc_dev = pdev->dev.platform_data; + struct tscadc *ts_dev = tscadc_dev->tsc; + + if (device_may_wakeup(tscadc_dev->dev)) { + tscadc_writel(ts_dev, REG_IRQWAKEUP, + 0x00); + tscadc_writel(ts_dev, REG_IRQCLR, IRQENB_HW_PEN); + } + tscadc_step_config(ts_dev); + tscadc_writel(ts_dev, REG_FIFO0THR, + ts_dev->steps_to_configure); + return 0; +} + static struct platform_driver ti_tsc_driver = { .probe = tscadc_probe, .remove = __devexit_p(tscadc_remove), @@ -345,6 +376,8 @@ static struct platform_driver ti_tsc_driver = { .name = "tsc", .owner = THIS_MODULE, }, + .suspend = tsc_suspend, + .resume = tsc_resume, }; module_platform_driver(ti_tsc_driver); diff --git a/drivers/mfd/ti_tscadc.c b/drivers/mfd/ti_tscadc.c index 9dbd6d0..2c84aed 100644 --- a/drivers/mfd/ti_tscadc.c +++ b/drivers/mfd/ti_tscadc.c @@ -170,6 +170,7 @@ static int __devinit ti_tscadc_probe(struct platform_device *pdev) if (err < 0) goto err_disable_clk; + device_init_wakeup(&pdev->dev, true); platform_set_drvdata(pdev, tscadc); return 0; @@ -203,6 +204,35 @@ static int __devexit ti_tscadc_remove(struct platform_device *pdev) return 0; } +static int tscadc_suspend(struct platform_device *pdev, pm_message_t state) +{ + struct ti_tscadc_dev *tscadc_dev = platform_get_drvdata(pdev); + + tscadc_writel(tscadc_dev, REG_SE, 0x00); + pm_runtime_put_sync(&pdev->dev); + return 0; +} + +static int tscadc_resume(struct platform_device *pdev) +{ + struct ti_tscadc_dev *tscadc_dev = platform_get_drvdata(pdev); + unsigned int restore, ctrl; + + pm_runtime_get_sync(&pdev->dev); + + /* context restore */ + ctrl = CNTRLREG_STEPCONFIGWRT | CNTRLREG_TSCENB | + CNTRLREG_STEPID | CNTRLREG_4WIRE; + tscadc_writel(tscadc_dev, REG_CTRL, ctrl); + tscadc_idle_config(tscadc_dev); + tscadc_writel(tscadc_dev, REG_SE, STPENB_STEPENB); + restore = tscadc_readl(tscadc_dev, REG_CTRL); + tscadc_writel(tscadc_dev, REG_CTRL, + (restore | CNTRLREG_TSCSSENB)); + + return 0; +} + static struct platform_driver ti_tscadc_driver = { .driver = { .name = "ti_tscadc", @@ -210,7 +240,8 @@ static struct platform_driver ti_tscadc_driver = { }, .probe = ti_tscadc_probe, .remove = __devexit_p(ti_tscadc_remove), - + .suspend = tscadc_suspend, + .resume = tscadc_resume, }; module_platform_driver(ti_tscadc_driver); diff --git a/include/linux/mfd/ti_tscadc.h b/include/linux/mfd/ti_tscadc.h index 67b7d5e..f4763a0 100644 --- a/include/linux/mfd/ti_tscadc.h +++ b/include/linux/mfd/ti_tscadc.h @@ -40,6 +40,9 @@ #define REG_FIFO1 0x200 /* Register Bitfields */ +/* IRQ wakeup enable */ +#define IRQWKUP_ENB BIT(0) + /* Step Enable */ #define STEPENB_MASK (0x1FFFF << 0) #define STEPENB(val) ((val) << 0)
This patch adds support for suspend/resume of TSC/ADC MFDevice. Signed-off-by: Patil, Rachna <rachna@ti.com> --- Changes in v2: Added this patch newly in this patch series. Changes in v3: No changes. drivers/iio/adc/ti_adc.c | 32 ++++++++++++++++++++++++++++++++ drivers/input/touchscreen/ti_tsc.c | 33 +++++++++++++++++++++++++++++++++ drivers/mfd/ti_tscadc.c | 33 ++++++++++++++++++++++++++++++++- include/linux/mfd/ti_tscadc.h | 3 +++ 4 files changed, 100 insertions(+), 1 deletions(-)