From: nicolas.ferre@microchip.com (Nicolas Ferre)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 8/9] atmel_flexcom: Support backup mode
Date: Tue, 19 Sep 2017 11:29:12 +0200 [thread overview]
Message-ID: <53aa7783-0ecf-1e68-1bf9-c470ba2f79eb@microchip.com> (raw)
In-Reply-To: <20170915140411.31716-9-romain.izard.pro@gmail.com>
On 15/09/2017 at 16:04, Romain Izard wrote:
> The controller used by a flexcom module is configured at boot, and left
> alone after this. As the configuration will be lost after backup mode,
> restore the state of the flexcom driver on resume.
>
> Signed-off-by: Romain Izard <romain.izard.pro@gmail.com>
Tested-by: Nicolas Ferre <nicolas.ferre@microchip.com>
On sama5d2 Xplained board (i2c0 from flexcom 4).
and obviously:
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Thanks Romain!
Regards,
> ---
> drivers/mfd/atmel-flexcom.c | 65 ++++++++++++++++++++++++++++++++++-----------
> 1 file changed, 50 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/mfd/atmel-flexcom.c b/drivers/mfd/atmel-flexcom.c
> index 064bde9cff5a..ef1235c4a179 100644
> --- a/drivers/mfd/atmel-flexcom.c
> +++ b/drivers/mfd/atmel-flexcom.c
> @@ -39,34 +39,44 @@
> #define FLEX_MR_OPMODE(opmode) (((opmode) << FLEX_MR_OPMODE_OFFSET) & \
> FLEX_MR_OPMODE_MASK)
>
> +struct atmel_flexcom {
> + void __iomem *base;
> + u32 opmode;
> + struct clk *clk;
> +};
>
> static int atmel_flexcom_probe(struct platform_device *pdev)
> {
> struct device_node *np = pdev->dev.of_node;
> - struct clk *clk;
> struct resource *res;
> - void __iomem *base;
> - u32 opmode;
> + struct atmel_flexcom *afc;
> int err;
> + u32 val;
> +
> + afc = devm_kzalloc(&pdev->dev, sizeof(*afc), GFP_KERNEL);
> + if (!afc)
> + return -ENOMEM;
>
> - err = of_property_read_u32(np, "atmel,flexcom-mode", &opmode);
> + platform_set_drvdata(pdev, afc);
> +
> + err = of_property_read_u32(np, "atmel,flexcom-mode", &afc->opmode);
> if (err)
> return err;
>
> - if (opmode < ATMEL_FLEXCOM_MODE_USART ||
> - opmode > ATMEL_FLEXCOM_MODE_TWI)
> + if (afc->opmode < ATMEL_FLEXCOM_MODE_USART ||
> + afc->opmode > ATMEL_FLEXCOM_MODE_TWI)
> return -EINVAL;
>
> res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> - base = devm_ioremap_resource(&pdev->dev, res);
> - if (IS_ERR(base))
> - return PTR_ERR(base);
> + afc->base = devm_ioremap_resource(&pdev->dev, res);
> + if (IS_ERR(afc->base))
> + return PTR_ERR(afc->base);
>
> - clk = devm_clk_get(&pdev->dev, NULL);
> - if (IS_ERR(clk))
> - return PTR_ERR(clk);
> + afc->clk = devm_clk_get(&pdev->dev, NULL);
> + if (IS_ERR(afc->clk))
> + return PTR_ERR(afc->clk);
>
> - err = clk_prepare_enable(clk);
> + err = clk_prepare_enable(afc->clk);
> if (err)
> return err;
>
> @@ -76,9 +86,10 @@ static int atmel_flexcom_probe(struct platform_device *pdev)
> * inaccessible and are read as zero. Also the external I/O lines of the
> * Flexcom are muxed to reach the selected device.
> */
> - writel(FLEX_MR_OPMODE(opmode), base + FLEX_MR);
> + val = FLEX_MR_OPMODE(afc->opmode);
> + writel(val, afc->base + FLEX_MR);
>
> - clk_disable_unprepare(clk);
> + clk_disable_unprepare(afc->clk);
>
> return devm_of_platform_populate(&pdev->dev);
> }
> @@ -89,10 +100,34 @@ static const struct of_device_id atmel_flexcom_of_match[] = {
> };
> MODULE_DEVICE_TABLE(of, atmel_flexcom_of_match);
>
> +#ifdef CONFIG_PM_SLEEP
> +static int atmel_flexcom_resume(struct device *dev)
> +{
> + struct atmel_flexcom *afc = dev_get_drvdata(dev);
> + int err;
> + u32 val;
> +
> + err = clk_prepare_enable(afc->clk);
> + if (err)
> + return err;
> +
> + val = FLEX_MR_OPMODE(afc->opmode),
> + writel(val, afc->base + FLEX_MR);
> +
> + clk_disable_unprepare(afc->clk);
> +
> + return 0;
> +}
> +#endif
> +
> +static SIMPLE_DEV_PM_OPS(atmel_flexcom_pm_ops, NULL,
> + atmel_flexcom_resume);
> +
> static struct platform_driver atmel_flexcom_driver = {
> .probe = atmel_flexcom_probe,
> .driver = {
> .name = "atmel_flexcom",
> + .pm = &atmel_flexcom_pm_ops,
> .of_match_table = atmel_flexcom_of_match,
> },
> };
>
--
Nicolas Ferre
next prev parent reply other threads:[~2017-09-19 9:29 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-15 14:04 [PATCH v2 0/9] Various patches for SAMA5D2 backup mode Romain Izard
2017-09-15 14:04 ` [PATCH v2 1/9] clk: at91: pmc: Wait for clocks when resuming Romain Izard
2017-09-22 12:05 ` Ludovic Desroches
2017-09-22 12:13 ` Nicolas Ferre
2017-09-15 14:04 ` [PATCH v2 2/9] clk: at91: pmc: Save SCSR during suspend Romain Izard
2017-09-15 14:04 ` [PATCH v2 3/9] clk: at91: pmc: Support backup for programmable clocks Romain Izard
2017-09-22 10:31 ` Nicolas Ferre
2017-09-25 8:25 ` Romain Izard
2017-09-15 14:04 ` [PATCH v2 4/9] mtd: nand: atmel: Avoid ECC errors when leaving backup mode Romain Izard
2017-09-18 9:50 ` Boris Brezillon
2017-09-15 14:04 ` [PATCH v2 5/9] mtd: nand: atmel: Report PMECC failures as errors Romain Izard
2017-09-18 10:00 ` Boris Brezillon
2017-09-21 9:22 ` Romain Izard
2017-09-15 14:04 ` [PATCH v2 6/9] ehci-atmel: Power down during suspend is normal Romain Izard
2017-09-22 12:40 ` Nicolas Ferre
2017-09-15 14:04 ` [PATCH v2 7/9] pwm: atmel-tcb: Support backup mode Romain Izard
2017-09-22 12:42 ` Nicolas Ferre
2017-09-15 14:04 ` [PATCH v2 8/9] atmel_flexcom: " Romain Izard
2017-09-19 9:29 ` Nicolas Ferre [this message]
2017-09-19 15:25 ` Lee Jones
2017-09-20 8:30 ` Romain Izard
2017-09-20 9:18 ` Alexandre Belloni
2017-09-15 14:04 ` [PATCH v2 9/9] tty/serial: atmel: Prevent a warning on suspend Romain Izard
2017-09-19 10:19 ` Nicolas Ferre
2017-09-20 14:35 ` Richard Genoud
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=53aa7783-0ecf-1e68-1bf9-c470ba2f79eb@microchip.com \
--to=nicolas.ferre@microchip.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).