1 files changed, 11 insertions, 10 deletions

diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c
index 9f24d5f0b431..6a7d7b553d95 100644
--- a/drivers/spi/atmel-quadspi.c
+++ b/drivers/spi/atmel-quadspi.c
@@ -151,6 +151,7 @@ struct atmel_qspi {
         const struct atmel_qspi_caps *caps;
         u32                     pending;
         u32                     mr;
+        u32                     scr;
         struct completion       cmd_completion;
 };
 
@@ -382,7 +383,7 @@ static int atmel_qspi_setup(struct spi_device *spi)
         struct spi_controller *ctrl = spi->master;
         struct atmel_qspi *aq = spi_controller_get_devdata(ctrl);
         unsigned long src_rate;
-        u32 scr, scbr;
+        u32 scbr;
 
         if (ctrl->busy)
                 return -EBUSY;
@@ -399,13 +400,13 @@ static int atmel_qspi_setup(struct spi_device *spi)
         if (scbr > 0)
                 scbr--;
 
-        scr = QSPI_SCR_SCBR(scbr);
-        writel_relaxed(scr, aq->regs + QSPI_SCR);
+        aq->scr = QSPI_SCR_SCBR(scbr);
+        writel_relaxed(aq->scr, aq->regs + QSPI_SCR);
 
         return 0;
 }
 
-static int atmel_qspi_init(struct atmel_qspi *aq)
+static void atmel_qspi_init(struct atmel_qspi *aq)
 {
         /* Reset the QSPI controller */
         writel_relaxed(QSPI_CR_SWRST, aq->regs + QSPI_CR);
@@ -416,8 +417,6 @@ static int atmel_qspi_init(struct atmel_qspi *aq)
 
         /* Enable the QSPI controller */
         writel_relaxed(QSPI_CR_QSPIEN, aq->regs + QSPI_CR);
-
-        return 0;
 }
 
 static irqreturn_t atmel_qspi_interrupt(int irq, void *dev_id)
@@ -536,9 +535,7 @@ static int atmel_qspi_probe(struct platform_device *pdev)
         if (err)
                 goto disable_qspick;
 
-        err = atmel_qspi_init(aq);
-        if (err)
-                goto disable_qspick;
+        atmel_qspi_init(aq);
 
         err = spi_register_controller(ctrl);
         if (err)
@@ -587,7 +584,11 @@ static int __maybe_unused atmel_qspi_resume(struct device *dev)
         clk_prepare_enable(aq->pclk);
         clk_prepare_enable(aq->qspick);
 
-        return atmel_qspi_init(aq);
+        atmel_qspi_init(aq);
+
+        writel_relaxed(aq->scr, aq->regs + QSPI_SCR);
+
+        return 0;
 }
 
 static SIMPLE_DEV_PM_OPS(atmel_qspi_pm_ops, atmel_qspi_suspend,