spi: spi-s3c64xx: Rename S3C64XX_SPI_SLAVE_* to S3C64XX_SPI_CS_*

Rename S3C64XX_SPI_SLAVE_* to S3C64XX_SPI_CS_* to match documentation.

Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
Link: https://lore.kernel.org/r/20201002122243.26849-6-l.stelmach@samsung.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index 86b6125..13b53f9 100644 (file)
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -29,7 +29,7 @@
 #define S3C64XX_SPI_CH_CFG             0x00
 #define S3C64XX_SPI_CLK_CFG            0x04
 #define S3C64XX_SPI_MODE_CFG           0x08
-#define S3C64XX_SPI_SLAVE_SEL          0x0C
+#define S3C64XX_SPI_CS_REG             0x0C
 #define S3C64XX_SPI_INT_EN             0x10
 #define S3C64XX_SPI_STATUS             0x14
 #define S3C64XX_SPI_TX_DATA            0x18
@@ -64,9 +64,9 @@
 #define S3C64XX_SPI_MODE_TXDMA_ON              (1<<1)
 #define S3C64XX_SPI_MODE_4BURST                        (1<<0)
 
-#define S3C64XX_SPI_SLAVE_AUTO                 (1<<1)
-#define S3C64XX_SPI_SLAVE_SIG_INACT            (1<<0)
-#define S3C64XX_SPI_SLAVE_NSC_CNT_2            (2<<4)
+#define S3C64XX_SPI_CS_NSC_CNT_2               (2<<4)
+#define S3C64XX_SPI_CS_AUTO                    (1<<1)
+#define S3C64XX_SPI_CS_SIG_INACT               (1<<0)
 
 #define S3C64XX_SPI_INT_TRAILING_EN            (1<<6)
 #define S3C64XX_SPI_INT_RX_OVERRUN_EN          (1<<5)
@@ -332,18 +332,18 @@ static void s3c64xx_spi_set_cs(struct spi_device *spi, bool enable)
 
        if (enable) {
                if (!(sdd->port_conf->quirks & S3C64XX_SPI_QUIRK_CS_AUTO)) {
-                       writel(0, sdd->regs + S3C64XX_SPI_SLAVE_SEL);
+                       writel(0, sdd->regs + S3C64XX_SPI_CS_REG);
                } else {
-                       u32 ssel = readl(sdd->regs + S3C64XX_SPI_SLAVE_SEL);
+                       u32 ssel = readl(sdd->regs + S3C64XX_SPI_CS_REG);
 
-                       ssel |= (S3C64XX_SPI_SLAVE_AUTO |
-                                               S3C64XX_SPI_SLAVE_NSC_CNT_2);
-                       writel(ssel, sdd->regs + S3C64XX_SPI_SLAVE_SEL);
+                       ssel |= (S3C64XX_SPI_CS_AUTO |
+                                               S3C64XX_SPI_CS_NSC_CNT_2);
+                       writel(ssel, sdd->regs + S3C64XX_SPI_CS_REG);
                }
        } else {
                if (!(sdd->port_conf->quirks & S3C64XX_SPI_QUIRK_CS_AUTO))
-                       writel(S3C64XX_SPI_SLAVE_SIG_INACT,
-                              sdd->regs + S3C64XX_SPI_SLAVE_SEL);
+                       writel(S3C64XX_SPI_CS_SIG_INACT,
+                              sdd->regs + S3C64XX_SPI_CS_REG);
        }
 }
 
@@ -982,9 +982,9 @@ static void s3c64xx_spi_hwinit(struct s3c64xx_spi_driver_data *sdd)
        sdd->cur_speed = 0;
 
        if (sci->no_cs)
-               writel(0, sdd->regs + S3C64XX_SPI_SLAVE_SEL);
+               writel(0, sdd->regs + S3C64XX_SPI_CS_REG);
        else if (!(sdd->port_conf->quirks & S3C64XX_SPI_QUIRK_CS_AUTO))
-               writel(S3C64XX_SPI_SLAVE_SIG_INACT, sdd->regs + S3C64XX_SPI_SLAVE_SEL);
+               writel(S3C64XX_SPI_CS_SIG_INACT, sdd->regs + S3C64XX_SPI_CS_REG);
 
        /* Disable Interrupts - we use Polling if not DMA mode */
        writel(0, regs + S3C64XX_SPI_INT_EN);