From: Boris Brezillon <bbrezillon@kernel.org>
To: <Tudor.Ambarus@microchip.com>
Cc: <broonie@kernel.org>, <robh+dt@kernel.org>,
<mark.rutland@arm.com>, <Nicolas.Ferre@microchip.com>,
<alexandre.belloni@bootlin.com>,
<Ludovic.Desroches@microchip.com>,
<Cyrille.Pitchen@microchip.com>, <bugalski.piotr@gmail.com>,
<linux-spi@vger.kernel.org>, <devicetree@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>, <linux-mtd@lists.infradead.org>
Subject: Re: [PATCH v3 11/13] spi: atmel-quadspi: add support for named peripheral clock
Date: Sat, 2 Feb 2019 08:16:25 +0100 [thread overview]
Message-ID: <20190202081625.58a0be1d@bbrezillon> (raw)
In-Reply-To: <20190202040653.1217-12-tudor.ambarus@microchip.com>
On Sat, 2 Feb 2019 04:07:41 +0000
<Tudor.Ambarus@microchip.com> wrote:
> From: Tudor Ambarus <tudor.ambarus@microchip.com>
>
> Naming clocks is a good practice. Keep supporting unnamed
> peripheral clock, to be backward compatible with old DTs.
> While here, rename clk to pclk, to indicate that it is a
> peripheral clock.
>
> Suggested-by: Boris Brezillon <bbrezillon@kernel.org>
> Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
Reviewed-by: Boris Brezillon <bbrezillon@kernel.org>
> ---
> v3: new patch
>
> drivers/spi/atmel-quadspi.c | 33 ++++++++++++++++++---------------
> 1 file changed, 18 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c
> index bfa5f5e92d96..c9548942535a 100644
> --- a/drivers/spi/atmel-quadspi.c
> +++ b/drivers/spi/atmel-quadspi.c
> @@ -136,7 +136,7 @@
> struct atmel_qspi {
> void __iomem *regs;
> void __iomem *mem;
> - struct clk *clk;
> + struct clk *pclk;
> struct platform_device *pdev;
> u32 pending;
> u32 smm;
> @@ -338,7 +338,7 @@ static int atmel_qspi_setup(struct spi_device *spi)
> if (!spi->max_speed_hz)
> return -EINVAL;
>
> - src_rate = clk_get_rate(aq->clk);
> + src_rate = clk_get_rate(aq->pclk);
> if (!src_rate)
> return -EINVAL;
>
> @@ -429,15 +429,18 @@ static int atmel_qspi_probe(struct platform_device *pdev)
> }
>
> /* Get the peripheral clock */
> - aq->clk = devm_clk_get(&pdev->dev, NULL);
> - if (IS_ERR(aq->clk)) {
> + aq->pclk = devm_clk_get(&pdev->dev, "pclk");
> + if (IS_ERR(aq->pclk))
> + aq->pclk = devm_clk_get(&pdev->dev, NULL);
> +
> + if (IS_ERR(aq->pclk)) {
> dev_err(&pdev->dev, "missing peripheral clock\n");
> - err = PTR_ERR(aq->clk);
> + err = PTR_ERR(aq->pclk);
> goto exit;
> }
>
> /* Enable the peripheral clock */
> - err = clk_prepare_enable(aq->clk);
> + err = clk_prepare_enable(aq->pclk);
> if (err) {
> dev_err(&pdev->dev, "failed to enable the peripheral clock\n");
> goto exit;
> @@ -448,25 +451,25 @@ static int atmel_qspi_probe(struct platform_device *pdev)
> if (irq < 0) {
> dev_err(&pdev->dev, "missing IRQ\n");
> err = irq;
> - goto disable_clk;
> + goto disable_pclk;
> }
> err = devm_request_irq(&pdev->dev, irq, atmel_qspi_interrupt,
> 0, dev_name(&pdev->dev), aq);
> if (err)
> - goto disable_clk;
> + goto disable_pclk;
>
> err = atmel_qspi_init(aq);
> if (err)
> - goto disable_clk;
> + goto disable_pclk;
>
> err = spi_register_controller(ctrl);
> if (err)
> - goto disable_clk;
> + goto disable_pclk;
>
> return 0;
>
> -disable_clk:
> - clk_disable_unprepare(aq->clk);
> +disable_pclk:
> + clk_disable_unprepare(aq->pclk);
> exit:
> spi_controller_put(ctrl);
>
> @@ -480,7 +483,7 @@ static int atmel_qspi_remove(struct platform_device *pdev)
>
> spi_unregister_controller(ctrl);
> writel_relaxed(QSPI_CR_QSPIDIS, aq->regs + QSPI_CR);
> - clk_disable_unprepare(aq->clk);
> + clk_disable_unprepare(aq->pclk);
> return 0;
> }
>
> @@ -488,7 +491,7 @@ static int __maybe_unused atmel_qspi_suspend(struct device *dev)
> {
> struct atmel_qspi *aq = dev_get_drvdata(dev);
>
> - clk_disable_unprepare(aq->clk);
> + clk_disable_unprepare(aq->pclk);
>
> return 0;
> }
> @@ -497,7 +500,7 @@ static int __maybe_unused atmel_qspi_resume(struct device *dev)
> {
> struct atmel_qspi *aq = dev_get_drvdata(dev);
>
> - clk_prepare_enable(aq->clk);
> + clk_prepare_enable(aq->pclk);
>
> return atmel_qspi_init(aq);
> }
next prev parent reply other threads:[~2019-02-02 7:16 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-02 4:07 [PATCH v3 00/13] spi: atmel-quadspi: introduce sam9x60 qspi controller Tudor.Ambarus
2019-02-02 4:07 ` [PATCH v3 01/13] spi: atmel-quadspi: cache MR value to avoid a write access Tudor.Ambarus
2019-02-02 7:06 ` Boris Brezillon
2019-02-02 8:38 ` Tudor.Ambarus
2019-02-02 13:20 ` Boris Brezillon
2019-02-02 4:07 ` [PATCH v3 02/13] spi: atmel-quadspi: order header files inclusion alphabetically Tudor.Ambarus
2019-02-02 4:07 ` [PATCH v3 03/13] spi: atmel-quadspi: drop wrappers for iomem accesses Tudor.Ambarus
2019-02-02 7:11 ` Boris Brezillon
2019-02-02 8:44 ` Tudor.Ambarus
2019-02-02 13:23 ` Boris Brezillon
2019-02-02 4:07 ` [PATCH v3 04/13] spi: atmel-quadspi: fix naming scheme Tudor.Ambarus
2019-02-02 7:12 ` Boris Brezillon
2019-02-02 4:07 ` [PATCH v3 05/13] spi: atmel-quadspi: remove unnecessary cast Tudor.Ambarus
2019-02-02 4:07 ` [PATCH v3 06/13] spi: atmel-quadspi: return appropriate error code Tudor.Ambarus
2019-02-02 4:07 ` [PATCH v3 07/13] spi: atmel-quadspi: switch to SPDX license identifiers Tudor.Ambarus
2019-02-02 4:07 ` [PATCH v3 08/13] spi: atmel-quadspi: drop unused and NOP transfer macros Tudor.Ambarus
2019-02-02 7:13 ` Boris Brezillon
2019-02-02 8:46 ` Tudor.Ambarus
2019-02-02 13:27 ` Boris Brezillon
2019-02-02 4:07 ` [PATCH v3 09/13] dt-bindings: spi: atmel-quadspi: update example to new clock binding Tudor.Ambarus
2019-02-02 4:07 ` [PATCH v3 10/13] dt-bindings: spi: atmel-quadspi: make "pclk" mandatory Tudor.Ambarus
2019-02-02 7:15 ` Boris Brezillon
2019-02-02 8:47 ` Tudor.Ambarus
2019-02-02 4:07 ` [PATCH v3 11/13] spi: atmel-quadspi: add support for named peripheral clock Tudor.Ambarus
2019-02-02 7:16 ` Boris Brezillon [this message]
2019-02-02 4:07 ` [PATCH v3 12/13] dt-bindings: spi: atmel-quadspi: QuadSPI driver for Microchip SAM9X60 Tudor.Ambarus
2019-02-02 7:17 ` Boris Brezillon
2019-02-02 4:07 ` [PATCH v3 13/13] spi: atmel-quadspi: add support for sam9x60 qspi controller Tudor.Ambarus
2019-02-02 7:29 ` Boris Brezillon
2019-02-02 8:58 ` Tudor.Ambarus
2019-02-02 13:30 ` Boris Brezillon
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=20190202081625.58a0be1d@bbrezillon \
--to=bbrezillon@kernel.org \
--cc=Cyrille.Pitchen@microchip.com \
--cc=Ludovic.Desroches@microchip.com \
--cc=Nicolas.Ferre@microchip.com \
--cc=Tudor.Ambarus@microchip.com \
--cc=alexandre.belloni@bootlin.com \
--cc=broonie@kernel.org \
--cc=bugalski.piotr@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=linux-spi@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.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).