spi: dw: Add 'mfld' suffix to Intel Medfield related routines

In order to prepare driver for the extension to support newer hardware,
add 'mfld' suffix to some related functions.

While here, move DMA parameters assignment under existing #ifdef
CONFIG_SPI_DW_MID_DMA.

There is no functional change intended.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20200506153025.21441-6-andriy.shevchenko@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-dw-mid.c b/drivers/spi/spi-dw-mid.c
index 64523e68490d772eaa03755060e0985d5ec88689..13b548915c8f0e57a9515f803ec97276769e767c 100644 (file)
--- a/drivers/spi/spi-dw-mid.c
+++ b/drivers/spi/spi-dw-mid.c
@@ -34,7 +34,7 @@ static bool mid_spi_dma_chan_filter(struct dma_chan *chan, void *param)
        return true;
 }
 
-static int mid_spi_dma_init(struct dw_spi *dws)
+static int mid_spi_dma_init_mfld(struct dw_spi *dws)
 {
        struct pci_dev *dma_dev;
        struct dw_dma_slave *tx = dws->dma_tx;
@@ -276,14 +276,23 @@ static void mid_spi_dma_stop(struct dw_spi *dws)
        }
 }
 
-static const struct dw_spi_dma_ops mid_dma_ops = {
-       .dma_init       = mid_spi_dma_init,
+static const struct dw_spi_dma_ops mfld_dma_ops = {
+       .dma_init       = mid_spi_dma_init_mfld,
        .dma_exit       = mid_spi_dma_exit,
        .dma_setup      = mid_spi_dma_setup,
        .can_dma        = mid_spi_can_dma,
        .dma_transfer   = mid_spi_dma_transfer,
        .dma_stop       = mid_spi_dma_stop,
 };
+
+static void dw_spi_mid_setup_dma_mfld(struct dw_spi *dws)
+{
+       dws->dma_tx = &mid_dma_tx;
+       dws->dma_rx = &mid_dma_rx;
+       dws->dma_ops = &mfld_dma_ops;
+}
+#else  /* CONFIG_SPI_DW_MID_DMA */
+static inline void dw_spi_mid_setup_dma_mfld(struct dw_spi *dws) {}
 #endif
 
 /* Some specific info for SPI0 controller on Intel MID */
@@ -297,7 +306,7 @@ static const struct dw_spi_dma_ops mid_dma_ops = {
 #define CLK_SPI_CDIV_MASK      0x00000e00
 #define CLK_SPI_DISABLE_OFFSET 8
 
-int dw_spi_mid_init(struct dw_spi *dws)
+int dw_spi_mid_init_mfld(struct dw_spi *dws)
 {
        void __iomem *clk_reg;
        u32 clk_cdiv;
@@ -314,14 +323,9 @@ int dw_spi_mid_init(struct dw_spi *dws)
 
        iounmap(clk_reg);
 
-#ifdef CONFIG_SPI_DW_MID_DMA
-       dws->dma_tx = &mid_dma_tx;
-       dws->dma_rx = &mid_dma_rx;
-       dws->dma_ops = &mid_dma_ops;
-#endif
-
        /* Register hook to configure CTRLR0 */
        dws->update_cr0 = dw_spi_update_cr0;
 
+       dw_spi_mid_setup_dma_mfld(dws);
        return 0;
 }

diff --git a/drivers/spi/spi-dw-pci.c b/drivers/spi/spi-dw-pci.c
index 172a9f2996316b2a022b11ad739a70d68c29327d..dd59df5122ee7c9cb2d6dba767d0e6d69158d6f5 100644 (file)
--- a/drivers/spi/spi-dw-pci.c
+++ b/drivers/spi/spi-dw-pci.c
@@ -23,13 +23,13 @@ struct spi_pci_desc {
 };
 
 static struct spi_pci_desc spi_pci_mid_desc_1 = {
-       .setup = dw_spi_mid_init,
+       .setup = dw_spi_mid_init_mfld,
        .num_cs = 5,
        .bus_num = 0,
 };
 
 static struct spi_pci_desc spi_pci_mid_desc_2 = {
-       .setup = dw_spi_mid_init,
+       .setup = dw_spi_mid_init_mfld,
        .num_cs = 2,
        .bus_num = 1,
 };

diff --git a/drivers/spi/spi-dw.h b/drivers/spi/spi-dw.h
index 5e1e78210d8d46072563105ad1492a3fbebd6c9d..b7e3f0ebba44fbb75d130a773bbdb83ba4f9236f 100644 (file)
--- a/drivers/spi/spi-dw.h
+++ b/drivers/spi/spi-dw.h
@@ -260,5 +260,6 @@ extern u32 dw_spi_update_cr0_v1_01a(struct spi_controller *master,
                                    struct spi_transfer *transfer);
 
 /* platform related setup */
-extern int dw_spi_mid_init(struct dw_spi *dws); /* Intel MID platforms */
+extern int dw_spi_mid_init_mfld(struct dw_spi *dws);
+
 #endif /* DW_SPI_HEADER_H */