The patch

   spi: spi-qcom-qspi: Fix remaining driver nits

has been applied to the regulator tree at

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git 

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.  

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

>From dc04f0e4ca82103889895615b3c2eb77110b1b1a Mon Sep 17 00:00:00 2001
From: Ryan Case <ryandc...@chromium.org>
Date: Mon, 22 Oct 2018 18:07:07 -0700
Subject: [PATCH] spi: spi-qcom-qspi: Fix remaining driver nits

Address remaining comments from original driver patch series

* Move RD_FIFO_CFG to be ordered corretly
* Expand spinlock comment

Signed-off-by: Ryan Case <ryandc...@chromium.org>
Reviewed-by: Stephen Boyd <swb...@chromium.org>
Reviewed-by: Douglas Anderson <diand...@chromium.org>
Signed-off-by: Mark Brown <broo...@kernel.org>
---
 drivers/spi/spi-qcom-qspi.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/spi/spi-qcom-qspi.c b/drivers/spi/spi-qcom-qspi.c
index b8163b40bb92..e0f061139c8f 100644
--- a/drivers/spi/spi-qcom-qspi.c
+++ b/drivers/spi/spi-qcom-qspi.c
@@ -90,6 +90,9 @@
 #define PIO_DATAOUT_1B         0x0020
 #define PIO_DATAOUT_4B         0x0024
 
+#define RD_FIFO_CFG            0x0028
+#define CONTINUOUS_MODE                BIT(0)
+
 #define RD_FIFO_STATUS 0x002c
 #define FIFO_EMPTY     BIT(11)
 #define WR_CNTS_MSK    0x7f0
@@ -99,9 +102,6 @@
 #define RDY_16BYTE     BIT(1)
 #define FIFO_RDY       BIT(0)
 
-#define RD_FIFO_CFG            0x0028
-#define CONTINUOUS_MODE                BIT(0)
-
 #define RD_FIFO_RESET          0x0030
 #define RESET_FIFO             BIT(0)
 
@@ -139,7 +139,7 @@ struct qcom_qspi {
        struct device *dev;
        struct clk_bulk_data clks[QSPI_NUM_CLKS];
        struct qspi_xfer xfer;
-       /* Lock to protect data accessed by IRQs */
+       /* Lock to protect xfer and IRQ accessed registers */
        spinlock_t lock;
 };
 
-- 
2.19.0.rc2

Reply via email to