spi: dw: Add KeemBay Master capability

In a further commit we'll have to get rid of the update_cr0() callback and
define a DW SSI capability instead. Since Keem Bay master/slave
functionality is controller by the CTRL0 register bitfield, we need to
first move the master mode selection into the internal corresponding
update_cr0 method, which would be activated by means of the dedicated
DW_SPI_CAP_KEEMBAY_MST capability setup.

Note this will be also useful if the driver will be ever altered to
support the DW SPI slave interface.

Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru>
Link: https://lore.kernel.org/r/20200920112914.26501-11-Sergey.Semin@baikalelectronics.ru
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-dw-core.c b/drivers/spi/spi-dw-core.c
index f01a43b1954c2128e0c85f9573f6ac262d437ff0..467f149364fa26e6a611b4fd5eb36ab765a1db46 100644 (file)
--- a/drivers/spi/spi-dw-core.c
+++ b/drivers/spi/spi-dw-core.c
@@ -258,6 +258,7 @@ u32 dw_spi_update_cr0_v1_01a(struct spi_controller *master,
                             struct spi_device *spi,
                             struct spi_transfer *transfer)
 {
+       struct dw_spi *dws = spi_controller_get_devdata(master);
        struct chip_data *chip = spi_get_ctldata(spi);
        u32 cr0;
 
@@ -281,6 +282,9 @@ u32 dw_spi_update_cr0_v1_01a(struct spi_controller *master,
        /* CTRLR0[13] Shift Register Loop */
        cr0 |= ((spi->mode & SPI_LOOP) ? 1 : 0) << DWC_SSI_CTRLR0_SRL_OFFSET;
 
+       if (dws->caps & DW_SPI_CAP_KEEMBAY_MST)
+               cr0 |= DWC_SSI_CTRLR0_KEEMBAY_MST;
+
        return cr0;
 }
 EXPORT_SYMBOL_GPL(dw_spi_update_cr0_v1_01a);

diff --git a/drivers/spi/spi-dw-mmio.c b/drivers/spi/spi-dw-mmio.c
index 7111cb7ca23bfe5de49fd9853ba8846eeb94b5f1..c0d351fde782de7c0551e485042250ec99ae2f2f 100644 (file)
--- a/drivers/spi/spi-dw-mmio.c
+++ b/drivers/spi/spi-dw-mmio.c
@@ -48,13 +48,6 @@ struct dw_spi_mmio {
 #define SPARX5_FORCE_ENA                       0xa4
 #define SPARX5_FORCE_VAL                       0xa8
 
-/*
- * For Keem Bay, CTRLR0[31] is used to select controller mode.
- * 0: SSI is slave
- * 1: SSI is master
- */
-#define KEEMBAY_CTRLR0_SSIC_IS_MST             BIT(31)
-
 struct dw_spi_mscc {
        struct regmap       *syscon;
        void __iomem        *spi_mst; /* Not sparx5 */
@@ -234,20 +227,13 @@ static int dw_spi_dwc_ssi_init(struct platform_device *pdev,
        return 0;
 }
 
-static u32 dw_spi_update_cr0_keembay(struct spi_controller *master,
-                                    struct spi_device *spi,
-                                    struct spi_transfer *transfer)
-{
-       u32 cr0 = dw_spi_update_cr0_v1_01a(master, spi, transfer);
-
-       return cr0 | KEEMBAY_CTRLR0_SSIC_IS_MST;
-}
-
 static int dw_spi_keembay_init(struct platform_device *pdev,
                               struct dw_spi_mmio *dwsmmio)
 {
+       dwsmmio->dws.caps = DW_SPI_CAP_KEEMBAY_MST;
+
        /* Register hook to configure CTRLR0 */
-       dwsmmio->dws.update_cr0 = dw_spi_update_cr0_keembay;
+       dwsmmio->dws.update_cr0 = dw_spi_update_cr0_v1_01a;
 
        return 0;
 }

diff --git a/drivers/spi/spi-dw.h b/drivers/spi/spi-dw.h
index b11fc873c3a7c12b62780b799fb4bafdd169e95e..56be1ad2ac0ed199915ff4c1cabcbb188f70ed24 100644 (file)
--- a/drivers/spi/spi-dw.h
+++ b/drivers/spi/spi-dw.h
@@ -71,6 +71,13 @@
 #define DWC_SSI_CTRLR0_FRF_OFFSET      6
 #define DWC_SSI_CTRLR0_DFS_OFFSET      0
 
+/*
+ * For Keem Bay, CTRLR0[31] is used to select controller mode.
+ * 0: SSI is slave
+ * 1: SSI is master
+ */
+#define DWC_SSI_CTRLR0_KEEMBAY_MST     BIT(31)
+
 /* Bit fields in SR, 7 bits */
 #define SR_MASK                                0x7f            /* cover 7 bits */
 #define SR_BUSY                                (1 << 0)
@@ -101,6 +108,7 @@ enum dw_ssi_type {
 
 /* DW SPI capabilities */
 #define DW_SPI_CAP_CS_OVERRIDE         BIT(0)
+#define DW_SPI_CAP_KEEMBAY_MST         BIT(1)
 
 struct dw_spi;
 struct dw_spi_dma_ops {