From: "Álvaro Fernández Rojas" <noltari@gmail.com>
To: broonie@kernel.org, f.fainelli@gmail.com,
bcm-kernel-feedback-list@broadcom.com, p.zabel@pengutronix.de,
linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Cc: "Álvaro Fernández Rojas" <noltari@gmail.com>
Subject: [PATCH 3/4] spi: bcm63xx-hsspi: add reset support
Date: Mon, 15 Jun 2020 10:03:08 +0200 [thread overview]
Message-ID: <20200615080309.2897694-4-noltari@gmail.com> (raw)
In-Reply-To: <20200615080309.2897694-1-noltari@gmail.com>
bcm63xx arch resets the HSSPI controller at early boot. However, bmips arch
needs to perform a reset when probing the driver.
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---
drivers/spi/spi-bcm63xx-hsspi.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/drivers/spi/spi-bcm63xx-hsspi.c b/drivers/spi/spi-bcm63xx-hsspi.c
index 6c235306c0e4..a20a0b88c23a 100644
--- a/drivers/spi/spi-bcm63xx-hsspi.c
+++ b/drivers/spi/spi-bcm63xx-hsspi.c
@@ -20,6 +20,7 @@
#include <linux/spi/spi.h>
#include <linux/mutex.h>
#include <linux/of.h>
+#include <linux/reset.h>
#define HSSPI_GLOBAL_CTRL_REG 0x0
#define GLOBAL_CTRL_CS_POLARITY_SHIFT 0
@@ -334,6 +335,7 @@ static int bcm63xx_hsspi_probe(struct platform_device *pdev)
struct clk *clk, *pll_clk = NULL;
int irq, ret;
u32 reg, rate, num_cs = HSSPI_SPI_MAX_CS;
+ struct reset_control *reset;
irq = platform_get_irq(pdev, 0);
if (irq < 0)
@@ -348,10 +350,25 @@ static int bcm63xx_hsspi_probe(struct platform_device *pdev)
if (IS_ERR(clk))
return PTR_ERR(clk);
+ reset = devm_reset_control_get(dev, NULL);
+ if (IS_ERR(reset)) {
+ ret = PTR_ERR(reset);
+ if (ret != -EPROBE_DEFER)
+ dev_err(dev,
+ "failed to get reset controller: %d\n", ret);
+ return ret;
+ }
+
ret = clk_prepare_enable(clk);
if (ret)
return ret;
+ ret = reset_control_reset(reset);
+ if (ret) {
+ dev_err(dev, "unable to reset device: %d\n", ret);
+ goto out_disable_clk;
+ }
+
rate = clk_get_rate(clk);
if (!rate) {
pll_clk = devm_clk_get(dev, "pll");
--
2.27.0
next prev parent reply other threads:[~2020-06-15 8:03 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-15 8:03 [PATCH 0/4] spi: bcm63xx: add BMIPS support Álvaro Fernández Rojas
2020-06-15 8:03 ` [PATCH 1/4] spi: bcm63xx-spi: add reset support Álvaro Fernández Rojas
2020-06-15 8:12 ` Philipp Zabel
2020-06-15 8:03 ` [PATCH 2/4] spi: bcm63xx-spi: allow building for BMIPS Álvaro Fernández Rojas
2020-06-15 8:03 ` Álvaro Fernández Rojas [this message]
2020-06-15 8:03 ` [PATCH 4/4] spi: bcm63xx-hsspi: " Álvaro Fernández Rojas
2020-06-15 9:09 ` [PATCH v2 0/4] spi: bcm63xx: add BMIPS support Álvaro Fernández Rojas
2020-06-15 9:09 ` [PATCH v2 1/4] spi: bcm63xx-spi: add reset support Álvaro Fernández Rojas
2020-06-15 16:26 ` Florian Fainelli
2020-06-15 9:09 ` [PATCH v2 2/4] spi: bcm63xx-spi: allow building for BMIPS Álvaro Fernández Rojas
2020-06-15 16:26 ` Florian Fainelli
2020-06-15 9:09 ` [PATCH v2 3/4] spi: bcm63xx-hsspi: add reset support Álvaro Fernández Rojas
2020-06-15 9:09 ` [PATCH v2 4/4] spi: bcm63xx-hsspi: allow building for BMIPS Álvaro Fernández Rojas
2020-06-15 16:26 ` Florian Fainelli
2020-06-15 11:26 ` [PATCH v2 0/4] spi: bcm63xx: add BMIPS support Mark Brown
2020-06-15 16:27 ` Florian Fainelli
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=20200615080309.2897694-4-noltari@gmail.com \
--to=noltari@gmail.com \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=broonie@kernel.org \
--cc=f.fainelli@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=p.zabel@pengutronix.de \
/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).