From: Boris Brezillon <bbrezillon@kernel.org>
To: <Tudor.Ambarus@microchip.com>
Cc: <broonie@kernel.org>, <Nicolas.Ferre@microchip.com>,
<alexandre.belloni@bootlin.com>,
<Ludovic.Desroches@microchip.com>,
linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, linux-spi@vger.kernel.org
Subject: Re: [PATCH 9/9] spi: atmel-quadspi: add support for sam9x60 qspi controller
Date: Wed, 30 Jan 2019 18:43:13 +0100 [thread overview]
Message-ID: <20190130184313.281f5374@bbrezillon> (raw)
In-Reply-To: <20190130150818.24902-10-tudor.ambarus@microchip.com>
On Wed, 30 Jan 2019 15:08:47 +0000
<Tudor.Ambarus@microchip.com> wrote:
> +static int atmel_sam9x60_qspi_clk_prepare_enable(struct atmel_qspi *aq)
> +{
> + struct device *dev = &aq->pdev->dev;
> + int ret;
> +
> + if (!aq->clk) {
> + /* Get the peripheral clock */
> + aq->clk = devm_clk_get(dev, "pclk");
> + if (IS_ERR(aq->clk)) {
> + dev_err(dev, "missing peripheral clock\n");
> + return PTR_ERR(aq->clk);
> + }
> + }
> +
> + if (!aq->qspick) {
> + /* Get the QSPI system clock */
> + aq->qspick = devm_clk_get(dev, "qspick");
> + if (IS_ERR(aq->qspick)) {
> + dev_err(dev, "missing system clock\n");
> + return PTR_ERR(aq->qspick);
> + }
> + }
Move the devm_clk_get() calls to the probe path instead of doing it at
prepare time, and you can make it generic for both compats with
something like:
aq->clk = devm_clk_get(dev, "pclk");
if (IS_ERR(aq->clk))
aq->clk = devm_clk_get(dev, NULL);
if (IS_ERR(aq->clk))
return PTR_ERR(aq->clk);
if (aq->caps->qspick_required) {
aq->qspick = devm_clk_get(dev, "qspick");
if (IS_ERR(aq->qspick)) {
return PTR_ERR(aq->qspick);
}
> +
> + /* Enable the peripheral clock */
> + ret = clk_prepare_enable(aq->clk);
> + if (ret) {
> + dev_err(dev, "failed to enable the peripheral clock\n");
> + return ret;
> + }
> +
> + /* Enable the QSPI system clock */
> + ret = clk_prepare_enable(aq->qspick);
> + if (ret) {
> + dev_err(dev, "failed to enable the QSPI system clock\n");
> + clk_disable_unprepare(aq->clk);
> + }
Again, you can make the enable function generic since
clk_prepare_enable(NULL) is a NO-OP that returns 0 and aq->qspick will
be NULL when it's not required.
> +
> + return ret;
> +}
> +
> +static void atmel_sam9x60_qspi_clk_disable_unprepare(struct atmel_qspi *aq)
> +{
> + clk_disable_unprepare(aq->qspick);
> + clk_disable_unprepare(aq->clk);
Ditto.
> +}
next prev parent reply other threads:[~2019-01-30 17:43 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-30 15:08 [PATCH 0/9] spi: atmel-quadspi: introduce sam9x60 qspi contoller Tudor.Ambarus
2019-01-30 15:08 ` [PATCH 1/9] spi: atmel-quadspi: optimize qspi init Tudor.Ambarus
2019-01-30 17:15 ` Boris Brezillon
2019-01-31 10:42 ` Tudor.Ambarus
2019-01-30 15:08 ` [PATCH 2/9] spi: atmel-quadspi: order header files inclusion alphabetically Tudor.Ambarus
2019-01-30 17:16 ` Boris Brezillon
2019-01-30 15:08 ` [PATCH 3/9] spi: atmel-quadspi: fix naming scheme Tudor.Ambarus
2019-01-30 17:19 ` Boris Brezillon
2019-01-31 10:43 ` Tudor.Ambarus
2019-01-30 15:08 ` [PATCH 4/9] spi: atmel-quadspi: remove unnecessary cast Tudor.Ambarus
2019-01-30 17:20 ` Boris Brezillon
2019-01-30 15:08 ` [PATCH 5/9] spi: atmel-quadspi: return appropriate error code Tudor.Ambarus
2019-01-30 17:21 ` Boris Brezillon
2019-01-30 15:08 ` [PATCH 6/9] spi: atmel-quadspi: switch to SPDX license identifiers Tudor.Ambarus
2019-01-30 17:23 ` Boris Brezillon
2019-01-30 15:08 ` [PATCH 7/9] dt-bindings: spi: atmel-quadspi: update example to new clock binding Tudor.Ambarus
2019-01-30 17:25 ` Boris Brezillon
2019-01-30 15:08 ` [PATCH 8/9] dt-bindings: spi: atmel-quadspi: QuadSPI driver for Microchip SAM9X60 Tudor.Ambarus
2019-01-30 17:30 ` Boris Brezillon
2019-01-31 10:45 ` Tudor.Ambarus
2019-01-30 15:08 ` [PATCH 9/9] spi: atmel-quadspi: add support for sam9x60 qspi controller Tudor.Ambarus
2019-01-30 17:43 ` Boris Brezillon [this message]
2019-01-31 10:46 ` Tudor.Ambarus
2019-01-31 11:55 ` Boris Brezillon
2019-01-31 12:40 ` Tudor.Ambarus
2019-01-31 13:12 ` Boris Brezillon
2019-01-31 12:01 ` 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=20190130184313.281f5374@bbrezillon \
--to=bbrezillon@kernel.org \
--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=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=linux-spi@vger.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).