Skip to contentSkip to conversation

dt-bindings: cadence-quadspi: add options reset property

PATCH Applied Dinh Nguyen 3 participants 8 messages Jun 13, 2019 – Jun 28, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v6 1/2 dt-bindings: cadence-quadspi: add options reset property

The QSPI module can have an optional reset signals that will hold the module in a reset state.

---
v6: no change
v5: document reset-names
v4: no change
v3: created base on review comments
v2: did not exist
v1: did not exist

---
 Documentation/devicetree/bindings/mtd/cadence-quadspi.txt | 5 +++++
 1 file changed, 5 insertions(+)
Documentation/devicetree/bindings/mtd/cadence-quadspi.txt +5 -0
index 4345c3a6f530..945be7d5b236 100644
@@ -35,6 +35,9 @@ custom properties:
 		  (qspi_n_ss_out).
 - cdns,tslch-ns : Delay in nanoseconds between setting qspi_n_ss_out low
                   and first bit transfer.
+- resets	: Must contain an entry for each entry in reset-names.
+		  See ../reset/reset.txt for details.
+- reset-names	: Must include either "qspi" and/or "qspi-ocp".
 
 Example:
 
@@ -50,6 +53,8 @@ Example:
 		cdns,fifo-depth = <128>;
 		cdns,fifo-width = <4>;
 		cdns,trigger-address = <0x00000000>;
+		resets = <&rst QSPI_RESET>, <&rst QSPI_OCP_RESET>;
+		reset-names = "qspi", "qspi-ocp";
 
 		flash0: n25q00@0 {
 			...
Signature · 6 lines
2.20.0


______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
#1 lore raw

PATCH v6 2/2 mtd: spi-nor: cadence-quadspi: add reset control

Get the reset control properties for the QSPI controller and bring them out of reset. Most will have just one reset bit, but there is an additional OCP reset bit that is used ECC. The OCP reset bit will also need to get de-asserted as well. [1]

The reason this patch is needed is in the case where a bootloader leaves the QSPI controller in a reset state, or a state where init cannot occur successfully, the patch will put the QSPI controller into a clean state.

[1] https://www.intel.com/content/www/us/en/programmable/hps/arria-10/hps.html#reg_soc_top/sfo1429890575955.html

---
v6: no need to check for reset pointer in assert/deassert as the call to
assert/deassert is already doing the checking
v5: remove udelay(not needed) on tested hardware
group reset assert/deassert together
update commit message with reasoning for patch
v4: fix compile error
v3: return full error by using PTR_ERR(rtsc)
move reset control calls until after the clock enables use udelay(2) to be safe
Add optional OCP(Open Core Protocol) reset signal
v2: use devm_reset_control_get_optional_exclusive
print an error message
return -EPROBE_DEFER

---
 drivers/mtd/spi-nor/cadence-quadspi.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
drivers/mtd/spi-nor/cadence-quadspi.c +22 -0
index 792628750eec..732323c2adb1 100644
@@ -34,6 +34,7 @@
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
+#include <linux/reset.h>
 #include <linux/sched.h>
 #include <linux/spi/spi.h>
 #include <linux/timer.h>
@@ -1336,6 +1337,8 @@ static int cqspi_probe(struct platform_device *pdev)
 	struct cqspi_st *cqspi;
 	struct resource *res;
 	struct resource *res_ahb;
+	struct reset_control *rstc;
+	struct reset_control *rstc_ocp;
 	const struct cqspi_driver_platdata *ddata;
 	int ret;
 	int irq;
@@ -1402,6 +1405,25 @@ static int cqspi_probe(struct platform_device *pdev)
 		goto probe_clk_failed;
 	}
 
+	/* Obtain QSPI reset control */
+	rstc = devm_reset_control_get_optional_exclusive(dev, "qspi");
+	if (IS_ERR(rstc)) {
+		dev_err(dev, "Cannot get QSPI reset.\n");
+		return PTR_ERR(rstc);
+	}
+
+	rstc_ocp = devm_reset_control_get_optional_exclusive(dev, "qspi-ocp");
+	if (IS_ERR(rstc_ocp)) {
+		dev_err(dev, "Cannot get QSPI OCP reset.\n");
+		return PTR_ERR(rstc_ocp);
+	}
+
+	reset_control_assert(rstc);
+	reset_control_deassert(rstc);
+
+	reset_control_assert(rstc_ocp);
+	reset_control_deassert(rstc_ocp);
+
 	cqspi->master_ref_clk_hz = clk_get_rate(cqspi->clk);
 	ddata  = of_device_get_match_data(dev);
 	if (ddata && (ddata->quirks & CQSPI_NEEDS_WR_DELAY))
Signature · 6 lines
2.20.0


______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
#2 lore raw

Re: [PATCHv6 2/2] mtd: spi-nor: cadence-quadspi: add reset control

Hi, Dinh,

drivers/mtd/spi-nor/cadence-quadspi.c static int cqspi_probe(struct platform_device *pdev) · line 1341

Quoted 2 lines · Dinh Nguyen
drivers/mtd/spi-nor/cadence-quadspi.c +2 -0
+	struct reset_control *rstc;
+	struct reset_control *rstc_ocp;

I'll add these on a single line when applying. The patch is good, I'm waiting for Rob to review the bindings.

Thanks,
ta

#3 lore raw

Re: [PATCHv6 2/2] mtd: spi-nor: cadence-quadspi: add reset control

Hi Tudor,

Quoted 9 lines · On 6/22/19 5:21 AM, [email protected] wrote:

Hi, Dinh,

drivers/mtd/spi-nor/cadence-quadspi.c static int cqspi_probe(struct platform_device *pdev) · line 1341

Quoted 2 lines · Dinh Nguyen
drivers/mtd/spi-nor/cadence-quadspi.c +2 -0
+	struct reset_control *rstc;
+	struct reset_control *rstc_ocp;

I'll add these on a single line when applying. The patch is good, I'm waiting for Rob to review the bindings.

Thanks!

Dinh

maintainer Reviewed-by on v6 2/2
#4 lore raw

Re: [PATCHv6 2/2] mtd: spi-nor: cadence-quadspi: add reset control

In reply to Dinh Nguyen
Quoted 9 lines · Dinh Nguyen

Get the reset control properties for the QSPI controller and bring them out of reset. Most will have just one reset bit, but there is an additional OCP reset bit that is used ECC. The OCP reset bit will also need to get de-asserted as well. [1]

The reason this patch is needed is in the case where a bootloader leaves the QSPI controller in a reset state, or a state where init cannot occur successfully, the patch will put the QSPI controller into a clean state.

Quoted 5 lines

[1] https://www.intel.com/content/www/us/en/programmable/hps/arria-10/hps.html#reg_soc_top/sfo1429890575955.html

---

Regards
Vignesh

Quoted 65 lines

v6: no need to check for reset pointer in assert/deassert as the call to
assert/deassert is already doing the checking
v5: remove udelay(not needed) on tested hardware
group reset assert/deassert together
update commit message with reasoning for patch
v4: fix compile error
v3: return full error by using PTR_ERR(rtsc)
move reset control calls until after the clock enables use udelay(2) to be safe
Add optional OCP(Open Core Protocol) reset signal
v2: use devm_reset_control_get_optional_exclusive
print an error message
return -EPROBE_DEFER

---
 drivers/mtd/spi-nor/cadence-quadspi.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
drivers/mtd/spi-nor/cadence-quadspi.c +22 -0
index 792628750eec..732323c2adb1 100644
@@ -34,6 +34,7 @@
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
+#include <linux/reset.h>
 #include <linux/sched.h>
 #include <linux/spi/spi.h>
 #include <linux/timer.h>
@@ -1336,6 +1337,8 @@ static int cqspi_probe(struct platform_device *pdev)
 	struct cqspi_st *cqspi;
 	struct resource *res;
 	struct resource *res_ahb;
+	struct reset_control *rstc;
+	struct reset_control *rstc_ocp;
 	const struct cqspi_driver_platdata *ddata;
 	int ret;
 	int irq;
@@ -1402,6 +1405,25 @@ static int cqspi_probe(struct platform_device *pdev)
 		goto probe_clk_failed;
 	}
 
+	/* Obtain QSPI reset control */
+	rstc = devm_reset_control_get_optional_exclusive(dev, "qspi");
+	if (IS_ERR(rstc)) {
+		dev_err(dev, "Cannot get QSPI reset.\n");
+		return PTR_ERR(rstc);
+	}
+
+	rstc_ocp = devm_reset_control_get_optional_exclusive(dev, "qspi-ocp");
+	if (IS_ERR(rstc_ocp)) {
+		dev_err(dev, "Cannot get QSPI OCP reset.\n");
+		return PTR_ERR(rstc_ocp);
+	}
+
+	reset_control_assert(rstc);
+	reset_control_deassert(rstc);
+
+	reset_control_assert(rstc_ocp);
+	reset_control_deassert(rstc_ocp);
+
 	cqspi->master_ref_clk_hz = clk_get_rate(cqspi->clk);
 	ddata  = of_device_get_match_data(dev);
 	if (ddata && (ddata->quirks & CQSPI_NEEDS_WR_DELAY))
Signature · 6 lines
Regards
Vignesh

______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
#5 lore raw

Re: [PATCHv6 2/2] mtd: spi-nor: cadence-quadspi: add reset control

In reply to Dinh Nguyen
Quoted 47 lines · Dinh Nguyen

External E-Mail

Get the reset control properties for the QSPI controller and bring them out of reset. Most will have just one reset bit, but there is an additional OCP reset bit that is used ECC. The OCP reset bit will also need to get de-asserted as well. [1]

The reason this patch is needed is in the case where a bootloader leaves the QSPI controller in a reset state, or a state where init cannot occur successfully, the patch will put the QSPI controller into a clean state.

[1] https://www.intel.com/content/www/us/en/programmable/hps/arria-10/hps.html#reg_soc_top/sfo1429890575955.html

---
v6: no need to check for reset pointer in assert/deassert as the call to
assert/deassert is already doing the checking
v5: remove udelay(not needed) on tested hardware
group reset assert/deassert together
update commit message with reasoning for patch
v4: fix compile error
v3: return full error by using PTR_ERR(rtsc)
move reset control calls until after the clock enables use udelay(2) to be safe
Add optional OCP(Open Core Protocol) reset signal
v2: use devm_reset_control_get_optional_exclusive
print an error message
return -EPROBE_DEFER

---
 drivers/mtd/spi-nor/cadence-quadspi.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
drivers/mtd/spi-nor/cadence-quadspi.c +1 -0
index 792628750eec..732323c2adb1 100644
@@ -34,6 +34,7 @@
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
+#include <linux/reset.h>
 #include <linux/sched.h>
 #include <linux/spi/spi.h>
 #include <linux/timer.h>

drivers/mtd/spi-nor/cadence-quadspi.c static int cqspi_probe(struct platform_device *pdev) · line 1341

Quoted 5 lines
drivers/mtd/spi-nor/cadence-quadspi.c +2 -0
@@ -1336,6 +1337,8 @@ static int cqspi_probe(struct platform_device *pdev)
 	struct cqspi_st *cqspi;
 	struct resource *res;
 	struct resource *res_ahb;
+	struct reset_control *rstc;
+	struct reset_control *rstc_ocp;

declare rstc and rstc_ocp on the same line and
Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git,
spi-nor/next branch.

Thanks,
ta

Quoted 30 lines
drivers/mtd/spi-nor/cadence-quadspi.c +19 -0
 	const struct cqspi_driver_platdata *ddata;
 	int ret;
 	int irq;
@@ -1402,6 +1405,25 @@ static int cqspi_probe(struct platform_device *pdev)
 		goto probe_clk_failed;
 	}
 
+	/* Obtain QSPI reset control */
+	rstc = devm_reset_control_get_optional_exclusive(dev, "qspi");
+	if (IS_ERR(rstc)) {
+		dev_err(dev, "Cannot get QSPI reset.\n");
+		return PTR_ERR(rstc);
+	}
+
+	rstc_ocp = devm_reset_control_get_optional_exclusive(dev, "qspi-ocp");
+	if (IS_ERR(rstc_ocp)) {
+		dev_err(dev, "Cannot get QSPI OCP reset.\n");
+		return PTR_ERR(rstc_ocp);
+	}
+
+	reset_control_assert(rstc);
+	reset_control_deassert(rstc);
+
+	reset_control_assert(rstc_ocp);
+	reset_control_deassert(rstc_ocp);
+
 	cqspi->master_ref_clk_hz = clk_get_rate(cqspi->clk);
 	ddata  = of_device_get_match_data(dev);
 	if (ddata && (ddata->quirks & CQSPI_NEEDS_WR_DELAY))
#6 lore raw
In reply to Dinh Nguyen

+Rob, [email protected]

Hi, Rob,

Dinh forgot to send this to the device tree mailing list. Would you please review it?

Thanks,
ta

Quoted 42 lines · Dinh Nguyen

External E-Mail

The QSPI module can have an optional reset signals that will hold the module in a reset state.

---
v6: no change
v5: document reset-names
v4: no change
v3: created base on review comments
v2: did not exist
v1: did not exist

---
 Documentation/devicetree/bindings/mtd/cadence-quadspi.txt | 5 +++++
 1 file changed, 5 insertions(+)
Documentation/devicetree/bindings/mtd/cadence-quadspi.txt +5 -0
index 4345c3a6f530..945be7d5b236 100644
@@ -35,6 +35,9 @@ custom properties:
 		  (qspi_n_ss_out).
 - cdns,tslch-ns : Delay in nanoseconds between setting qspi_n_ss_out low
                   and first bit transfer.
+- resets	: Must contain an entry for each entry in reset-names.
+		  See ../reset/reset.txt for details.
+- reset-names	: Must include either "qspi" and/or "qspi-ocp".
 
 Example:
 
@@ -50,6 +53,8 @@ Example:
 		cdns,fifo-depth = <128>;
 		cdns,fifo-width = <4>;
 		cdns,trigger-address = <0x00000000>;
+		resets = <&rst QSPI_RESET>, <&rst QSPI_OCP_RESET>;
+		reset-names = "qspi", "qspi-ocp";
 
 		flash0: n25q00@0 {
...
#7 lore raw
In reply to Dinh Nguyen
Quoted 14 lines · Dinh Nguyen

External E-Mail

The QSPI module can have an optional reset signals that will hold the module in a reset state.

---
v6: no change
v5: document reset-names
v4: no change
v3: created base on review comments
v2: did not exist
v1: did not exist

Quoted 4 lines
---
 Documentation/devicetree/bindings/mtd/cadence-quadspi.txt | 5 +++++
 1 file changed, 5 insertions(+)

Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git,
spi-nor/next branch.

Thanks,
ta
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/