From: Romain Izard <romain.izard.pro@gmail.com> To: Nicolas Ferre <nicolas.ferre@microchip.com>, Boris Brezillon <boris.brezillon@free-electrons.com>, Michael Turquette <mturquette@baylibre.com>, Stephen Boyd <sboyd@codeaurora.org>, Ludovic Desroches <ludovic.desroches@microchip.com>, Jonathan Cameron <jic23@kernel.org>, Wenyou Yang <wenyou.yang@atmel.com>, Josh Wu <rainyfeeling@outlook.com>, David Woodhouse <dwmw2@infradead.org>, Brian Norris <computersforpeace@gmail.com>, Marek Vasut <marek.vasut@gmail.com>, Cyrille Pitchen <cyrille.pitchen@wedev4u.fr>, Thierry Reding <thierry.reding@gmail.com>, Richard Genoud <richard.genoud@gmail.com>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Alan Stern <stern@rowland.harvard.edu> Cc: linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org, linux-mtd@lists.infradead.org, linux-pwm@vger.kernel.org, linux-serial@vger.kernel.org, linux-usb@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Romain Izard <romain.izard.pro@gmail.com> Subject: [PATCH v1 07/10] iio:adc:at91-sama5d2: Support backup mode Date: Fri, 8 Sep 2017 17:36:01 +0200 [thread overview] Message-ID: <20170908153604.28383-8-romain.izard.pro@gmail.com> (raw) In-Reply-To: <20170908153604.28383-1-romain.izard.pro@gmail.com> Support the backup mode for platform suspend, by restoring the hardware registers on resume. Signed-off-by: Romain Izard <romain.izard.pro@gmail.com> --- drivers/iio/adc/at91-sama5d2_adc.c | 71 ++++++++++++++++++++++++++++++++------ 1 file changed, 61 insertions(+), 10 deletions(-) diff --git a/drivers/iio/adc/at91-sama5d2_adc.c b/drivers/iio/adc/at91-sama5d2_adc.c index e10dca3ed74b..f9718c863363 100644 --- a/drivers/iio/adc/at91-sama5d2_adc.c +++ b/drivers/iio/adc/at91-sama5d2_adc.c @@ -200,6 +200,7 @@ struct at91_adc_state { u32 conversion_value; struct at91_adc_soc_info soc_info; wait_queue_head_t wq_data_available; + unsigned int current_rate; /* * lock to prevent concurrent 'single conversion' requests through * sysfs. @@ -269,6 +270,8 @@ static void at91_adc_setup_samp_freq(struct at91_adc_state *st, unsigned freq) mr |= AT91_SAMA5D2_MR_PRESCAL(prescal); at91_adc_writel(st, AT91_SAMA5D2_MR, mr); + st->current_rate = freq; + dev_dbg(&indio_dev->dev, "freq: %u, startup: %u, prescal: %u\n", freq, startup, prescal); } @@ -375,7 +378,9 @@ static int at91_adc_write_raw(struct iio_dev *indio_dev, val > st->soc_info.max_sample_rate) return -EINVAL; + mutex_lock(&st->lock); at91_adc_setup_samp_freq(st, val); + mutex_unlock(&st->lock); return 0; } @@ -386,6 +391,21 @@ static const struct iio_info at91_adc_info = { .driver_module = THIS_MODULE, }; +static void at91_adc_init_hw(struct at91_adc_state *st, unsigned int freq) +{ + at91_adc_writel(st, AT91_SAMA5D2_CR, AT91_SAMA5D2_CR_SWRST); + at91_adc_writel(st, AT91_SAMA5D2_IDR, 0xffffffff); + /* + * Transfer field must be set to 2 according to the datasheet and + * allows different analog settings for each channel. + */ + at91_adc_writel(st, AT91_SAMA5D2_MR, + AT91_SAMA5D2_MR_TRANSFER(2) | AT91_SAMA5D2_MR_ANACH); + + at91_adc_setup_samp_freq(st, freq); + +} + static int at91_adc_probe(struct platform_device *pdev) { struct iio_dev *indio_dev; @@ -482,16 +502,7 @@ static int at91_adc_probe(struct platform_device *pdev) goto vref_disable; } - at91_adc_writel(st, AT91_SAMA5D2_CR, AT91_SAMA5D2_CR_SWRST); - at91_adc_writel(st, AT91_SAMA5D2_IDR, 0xffffffff); - /* - * Transfer field must be set to 2 according to the datasheet and - * allows different analog settings for each channel. - */ - at91_adc_writel(st, AT91_SAMA5D2_MR, - AT91_SAMA5D2_MR_TRANSFER(2) | AT91_SAMA5D2_MR_ANACH); - - at91_adc_setup_samp_freq(st, st->soc_info.min_sample_rate); + at91_adc_init_hw(st, st->soc_info.min_sample_rate); ret = clk_prepare_enable(st->per_clk); if (ret) @@ -541,12 +552,52 @@ static const struct of_device_id at91_adc_dt_match[] = { }; MODULE_DEVICE_TABLE(of, at91_adc_dt_match); +#ifdef CONFIG_PM_SLEEP +static int at91_adc_suspend(struct device *dev) +{ + struct platform_device *pdev = to_platform_device(dev); + struct iio_dev *indio_dev = platform_get_drvdata(pdev); + struct at91_adc_state *st = iio_priv(indio_dev); + + clk_disable_unprepare(st->per_clk); + + regulator_disable(st->vref); + regulator_disable(st->reg); + + return 0; +} + +static int at91_adc_resume(struct device *dev) +{ + struct platform_device *pdev = to_platform_device(dev); + struct iio_dev *indio_dev = platform_get_drvdata(pdev); + struct at91_adc_state *st = iio_priv(indio_dev); + int err; + + err = regulator_enable(st->reg); + if (err) + return err; + + err = regulator_enable(st->vref); + if (err) + return err; + + at91_adc_init_hw(st, st->current_rate); + + err = clk_prepare_enable(st->per_clk); + return err; +} +#endif + +static SIMPLE_DEV_PM_OPS(at91_adc_pm_ops, at91_adc_suspend, at91_adc_resume); + static struct platform_driver at91_adc_driver = { .probe = at91_adc_probe, .remove = at91_adc_remove, .driver = { .name = "at91-sama5d2_adc", .of_match_table = at91_adc_dt_match, + .pm = &at91_adc_pm_ops, }, }; module_platform_driver(at91_adc_driver) -- 2.11.0
WARNING: multiple messages have this Message-ID (diff)
From: romain.izard.pro@gmail.com (Romain Izard) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v1 07/10] iio:adc:at91-sama5d2: Support backup mode Date: Fri, 8 Sep 2017 17:36:01 +0200 [thread overview] Message-ID: <20170908153604.28383-8-romain.izard.pro@gmail.com> (raw) In-Reply-To: <20170908153604.28383-1-romain.izard.pro@gmail.com> Support the backup mode for platform suspend, by restoring the hardware registers on resume. Signed-off-by: Romain Izard <romain.izard.pro@gmail.com> --- drivers/iio/adc/at91-sama5d2_adc.c | 71 ++++++++++++++++++++++++++++++++------ 1 file changed, 61 insertions(+), 10 deletions(-) diff --git a/drivers/iio/adc/at91-sama5d2_adc.c b/drivers/iio/adc/at91-sama5d2_adc.c index e10dca3ed74b..f9718c863363 100644 --- a/drivers/iio/adc/at91-sama5d2_adc.c +++ b/drivers/iio/adc/at91-sama5d2_adc.c @@ -200,6 +200,7 @@ struct at91_adc_state { u32 conversion_value; struct at91_adc_soc_info soc_info; wait_queue_head_t wq_data_available; + unsigned int current_rate; /* * lock to prevent concurrent 'single conversion' requests through * sysfs. @@ -269,6 +270,8 @@ static void at91_adc_setup_samp_freq(struct at91_adc_state *st, unsigned freq) mr |= AT91_SAMA5D2_MR_PRESCAL(prescal); at91_adc_writel(st, AT91_SAMA5D2_MR, mr); + st->current_rate = freq; + dev_dbg(&indio_dev->dev, "freq: %u, startup: %u, prescal: %u\n", freq, startup, prescal); } @@ -375,7 +378,9 @@ static int at91_adc_write_raw(struct iio_dev *indio_dev, val > st->soc_info.max_sample_rate) return -EINVAL; + mutex_lock(&st->lock); at91_adc_setup_samp_freq(st, val); + mutex_unlock(&st->lock); return 0; } @@ -386,6 +391,21 @@ static const struct iio_info at91_adc_info = { .driver_module = THIS_MODULE, }; +static void at91_adc_init_hw(struct at91_adc_state *st, unsigned int freq) +{ + at91_adc_writel(st, AT91_SAMA5D2_CR, AT91_SAMA5D2_CR_SWRST); + at91_adc_writel(st, AT91_SAMA5D2_IDR, 0xffffffff); + /* + * Transfer field must be set to 2 according to the datasheet and + * allows different analog settings for each channel. + */ + at91_adc_writel(st, AT91_SAMA5D2_MR, + AT91_SAMA5D2_MR_TRANSFER(2) | AT91_SAMA5D2_MR_ANACH); + + at91_adc_setup_samp_freq(st, freq); + +} + static int at91_adc_probe(struct platform_device *pdev) { struct iio_dev *indio_dev; @@ -482,16 +502,7 @@ static int at91_adc_probe(struct platform_device *pdev) goto vref_disable; } - at91_adc_writel(st, AT91_SAMA5D2_CR, AT91_SAMA5D2_CR_SWRST); - at91_adc_writel(st, AT91_SAMA5D2_IDR, 0xffffffff); - /* - * Transfer field must be set to 2 according to the datasheet and - * allows different analog settings for each channel. - */ - at91_adc_writel(st, AT91_SAMA5D2_MR, - AT91_SAMA5D2_MR_TRANSFER(2) | AT91_SAMA5D2_MR_ANACH); - - at91_adc_setup_samp_freq(st, st->soc_info.min_sample_rate); + at91_adc_init_hw(st, st->soc_info.min_sample_rate); ret = clk_prepare_enable(st->per_clk); if (ret) @@ -541,12 +552,52 @@ static const struct of_device_id at91_adc_dt_match[] = { }; MODULE_DEVICE_TABLE(of, at91_adc_dt_match); +#ifdef CONFIG_PM_SLEEP +static int at91_adc_suspend(struct device *dev) +{ + struct platform_device *pdev = to_platform_device(dev); + struct iio_dev *indio_dev = platform_get_drvdata(pdev); + struct at91_adc_state *st = iio_priv(indio_dev); + + clk_disable_unprepare(st->per_clk); + + regulator_disable(st->vref); + regulator_disable(st->reg); + + return 0; +} + +static int at91_adc_resume(struct device *dev) +{ + struct platform_device *pdev = to_platform_device(dev); + struct iio_dev *indio_dev = platform_get_drvdata(pdev); + struct at91_adc_state *st = iio_priv(indio_dev); + int err; + + err = regulator_enable(st->reg); + if (err) + return err; + + err = regulator_enable(st->vref); + if (err) + return err; + + at91_adc_init_hw(st, st->current_rate); + + err = clk_prepare_enable(st->per_clk); + return err; +} +#endif + +static SIMPLE_DEV_PM_OPS(at91_adc_pm_ops, at91_adc_suspend, at91_adc_resume); + static struct platform_driver at91_adc_driver = { .probe = at91_adc_probe, .remove = at91_adc_remove, .driver = { .name = "at91-sama5d2_adc", .of_match_table = at91_adc_dt_match, + .pm = &at91_adc_pm_ops, }, }; module_platform_driver(at91_adc_driver) -- 2.11.0
next prev parent reply other threads:[~2017-09-08 15:36 UTC|newest] Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-09-08 15:35 [PATCH v1 00/10] Various patches for SAMA5D2 backup mode Romain Izard 2017-09-08 15:35 ` Romain Izard 2017-09-08 15:35 ` [PATCH v1 01/10] clk: at91: pmc: Wait for clocks when resuming Romain Izard 2017-09-08 15:35 ` Romain Izard 2017-09-13 12:15 ` Nicolas Ferre 2017-09-13 12:15 ` Nicolas Ferre 2017-09-13 12:15 ` Nicolas Ferre 2017-09-14 16:15 ` Romain Izard 2017-09-14 16:15 ` Romain Izard 2017-09-14 16:15 ` Romain Izard 2017-09-22 12:12 ` Nicolas Ferre 2017-09-22 12:12 ` Nicolas Ferre 2017-09-22 12:12 ` Nicolas Ferre 2017-09-08 15:35 ` [PATCH v1 02/10] clk: at91: pmc: Save SCSR during suspend Romain Izard 2017-09-08 15:35 ` Romain Izard 2017-09-08 15:35 ` Romain Izard 2017-09-13 12:10 ` Nicolas Ferre 2017-09-13 12:10 ` Nicolas Ferre 2017-09-13 12:10 ` Nicolas Ferre 2017-09-08 15:35 ` [PATCH v1 03/10] clk: at91: pmc: Support backup for programmable clocks Romain Izard 2017-09-08 15:35 ` Romain Izard 2017-09-13 12:29 ` Nicolas Ferre 2017-09-13 12:29 ` Nicolas Ferre 2017-09-13 12:29 ` Nicolas Ferre 2017-09-13 17:03 ` Alexandre Belloni 2017-09-13 17:03 ` Alexandre Belloni 2017-09-13 17:03 ` Alexandre Belloni 2017-09-14 7:41 ` romain izard 2017-09-14 7:41 ` romain izard 2017-09-14 7:41 ` romain izard 2017-09-14 9:38 ` Nicolas Ferre 2017-09-14 9:38 ` Nicolas Ferre 2017-09-14 9:38 ` Nicolas Ferre 2017-09-08 15:35 ` [PATCH v1 04/10] mtd: nand: atmel: Avoid ECC errors when leaving backup mode Romain Izard 2017-09-08 15:35 ` Romain Izard 2017-09-08 15:35 ` [PATCH v1 05/10] mtd: nand: atmel: Report PMECC failures as errors Romain Izard 2017-09-08 15:35 ` Romain Izard 2017-09-08 15:36 ` [PATCH v1 06/10] ehci-atmel: Power down during suspend is normal Romain Izard 2017-09-08 15:36 ` Romain Izard 2017-09-08 15:36 ` Romain Izard [this message] 2017-09-08 15:36 ` [PATCH v1 07/10] iio:adc:at91-sama5d2: Support backup mode Romain Izard 2017-09-08 16:03 ` Nicolas Ferre 2017-09-08 16:03 ` Nicolas Ferre 2017-09-08 16:03 ` Nicolas Ferre 2017-09-08 16:21 ` Romain Izard 2017-09-08 16:21 ` Romain Izard 2017-09-08 16:21 ` Romain Izard 2017-09-08 15:36 ` [PATCH v1 08/10] pwm: atmel-tcb: " Romain Izard 2017-09-08 15:36 ` Romain Izard 2017-09-08 15:36 ` Romain Izard 2017-09-08 15:36 ` [PATCH v1 09/10] atmel_flexcom: " Romain Izard 2017-09-08 15:36 ` Romain Izard 2017-09-08 15:36 ` [PATCH v1 10/10] tty/serial: atmel: Prevent a warning on suspend Romain Izard 2017-09-08 15:36 ` Romain Izard 2017-09-08 15:36 ` Romain Izard 2017-09-11 9:52 ` Romain Izard 2017-09-11 9:52 ` Romain Izard 2017-09-11 9:52 ` Romain Izard
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20170908153604.28383-8-romain.izard.pro@gmail.com \ --to=romain.izard.pro@gmail.com \ --cc=boris.brezillon@free-electrons.com \ --cc=computersforpeace@gmail.com \ --cc=cyrille.pitchen@wedev4u.fr \ --cc=dwmw2@infradead.org \ --cc=gregkh@linuxfoundation.org \ --cc=jic23@kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-clk@vger.kernel.org \ --cc=linux-iio@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mtd@lists.infradead.org \ --cc=linux-pwm@vger.kernel.org \ --cc=linux-serial@vger.kernel.org \ --cc=linux-usb@vger.kernel.org \ --cc=ludovic.desroches@microchip.com \ --cc=marek.vasut@gmail.com \ --cc=mturquette@baylibre.com \ --cc=nicolas.ferre@microchip.com \ --cc=rainyfeeling@outlook.com \ --cc=richard.genoud@gmail.com \ --cc=sboyd@codeaurora.org \ --cc=stern@rowland.harvard.edu \ --cc=thierry.reding@gmail.com \ --cc=wenyou.yang@atmel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.