diff options
author | Mark Brown <broonie@kernel.org> | 2018-12-21 13:43:32 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-12-21 13:43:32 +0000 |
commit | b27d9668be60d42904b71ab1a9e4d152c7b5c920 (patch) | |
tree | 62c1b3e52abb5b60cc19a2a772b005e9f00b814b /drivers/spi/spi-qcom-qspi.c | |
parent | 67a2ab931e9f79f516566e69c92e566b71fb20d1 (diff) | |
parent | cd07e3701fa6a4c68f8493ee1d12caa18d46ec6a (diff) | |
download | talos-op-linux-b27d9668be60d42904b71ab1a9e4d152c7b5c920.tar.gz talos-op-linux-b27d9668be60d42904b71ab1a9e4d152c7b5c920.zip |
Merge branch 'regulator-4.21' into regulator-next
Diffstat (limited to 'drivers/spi/spi-qcom-qspi.c')
-rw-r--r-- | drivers/spi/spi-qcom-qspi.c | 8 |
1 files 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; }; |