1 files changed, 21 insertions, 0 deletions

diff --git a/drivers/mtd/spi-nor/cadence-quadspi.c b/drivers/mtd/spi-nor/cadence-quadspi.c
index 792628750eec..59b8cc3457b6 100644
--- a/drivers/mtd/spi-nor/cadence-quadspi.c
+++ b/drivers/mtd/spi-nor/cadence-quadspi.c
@@ -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,7 @@ static int cqspi_probe(struct platform_device *pdev)
         struct cqspi_st *cqspi;
         struct resource *res;
         struct resource *res_ahb;
+        struct reset_control *rstc, *rstc_ocp;
         const struct cqspi_driver_platdata *ddata;
         int ret;
         int irq;
@@ -1402,6 +1404,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))