spi: mpc5xxx-psc: Remove unused platform_data

The platform_data for the MPC5xxx PSC SPI controllers is never used, so
remove it and the resulting code which depends on it.

Signed-off-by: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20230217-dt-mpc5xxx-spi-v1-1-3be8602fce1e@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-mpc512x-psc.c b/drivers/spi/spi-mpc512x-psc.c
index 03630359ce70db0d5d773be566c046ebf2d2c1b3..0b4d49ef84de89c80974c5515cd88a16bbff6641 100644 (file)
--- a/drivers/spi/spi-mpc512x-psc.c
+++ b/drivers/spi/spi-mpc512x-psc.c
@@ -22,7 +22,6 @@
 #include <linux/delay.h>
 #include <linux/clk.h>
 #include <linux/spi/spi.h>
-#include <linux/fsl_devices.h>
 #include <asm/mpc52xx_psc.h>
 
 enum {
@@ -51,8 +50,6 @@ enum {
        __ret; })
 
 struct mpc512x_psc_spi {
-       void (*cs_control)(struct spi_device *spi, bool on);
-
        /* driver internal data */
        int type;
        void __iomem *psc;
@@ -128,26 +125,16 @@ static void mpc512x_psc_spi_activate_cs(struct spi_device *spi)
        mps->bits_per_word = cs->bits_per_word;
 
        if (spi->cs_gpiod) {
-               if (mps->cs_control)
-                       /* boardfile override */
-                       mps->cs_control(spi, (spi->mode & SPI_CS_HIGH) ? 1 : 0);
-               else
-                       /* gpiolib will deal with the inversion */
-                       gpiod_set_value(spi->cs_gpiod, 1);
+               /* gpiolib will deal with the inversion */
+               gpiod_set_value(spi->cs_gpiod, 1);
        }
 }
 
 static void mpc512x_psc_spi_deactivate_cs(struct spi_device *spi)
 {
-       struct mpc512x_psc_spi *mps = spi_master_get_devdata(spi->master);
-
        if (spi->cs_gpiod) {
-               if (mps->cs_control)
-                       /* boardfile override */
-                       mps->cs_control(spi, (spi->mode & SPI_CS_HIGH) ? 0 : 1);
-               else
-                       /* gpiolib will deal with the inversion */
-                       gpiod_set_value(spi->cs_gpiod, 0);
+               /* gpiolib will deal with the inversion */
+               gpiod_set_value(spi->cs_gpiod, 0);
        }
 }
 
@@ -474,7 +461,6 @@ static irqreturn_t mpc512x_psc_spi_isr(int irq, void *dev_id)
 static int mpc512x_psc_spi_do_probe(struct device *dev, u32 regaddr,
                                              u32 size, unsigned int irq)
 {
-       struct fsl_spi_platform_data *pdata = dev_get_platdata(dev);
        struct mpc512x_psc_spi *mps;
        struct spi_master *master;
        int ret;
@@ -490,12 +476,6 @@ static int mpc512x_psc_spi_do_probe(struct device *dev, u32 regaddr,
        mps->type = (int)of_device_get_match_data(dev);
        mps->irq = irq;
 
-       if (pdata) {
-               mps->cs_control = pdata->cs_control;
-               master->bus_num = pdata->bus_num;
-               master->num_chipselect = pdata->max_chipselect;
-       }
-
        master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_LSB_FIRST;
        master->setup = mpc512x_psc_spi_setup;
        master->prepare_transfer_hardware = mpc512x_psc_spi_prep_xfer_hw;

diff --git a/drivers/spi/spi-mpc52xx-psc.c b/drivers/spi/spi-mpc52xx-psc.c
index 609311231e64b8955bcc5086a817ec1f4685b341..604868df913c4805887423954af30c4e656cedf7 100644 (file)
--- a/drivers/spi/spi-mpc52xx-psc.c
+++ b/drivers/spi/spi-mpc52xx-psc.c
@@ -18,7 +18,6 @@
 #include <linux/io.h>
 #include <linux/delay.h>
 #include <linux/spi/spi.h>
-#include <linux/fsl_devices.h>
 #include <linux/slab.h>
 #include <linux/of_irq.h>
 
@@ -28,10 +27,6 @@
 #define MCLK 20000000 /* PSC port MClk in hz */
 
 struct mpc52xx_psc_spi {
-       /* fsl_spi_platform data */
-       void (*cs_control)(struct spi_device *spi, bool on);
-       u32 sysclk;
-
        /* driver internal data */
        struct mpc52xx_psc __iomem *psc;
        struct mpc52xx_psc_fifo __iomem *fifo;
@@ -101,17 +96,6 @@ static void mpc52xx_psc_spi_activate_cs(struct spi_device *spi)
                ccr |= (MCLK / 1000000 - 1) & 0xFF;
        out_be16((u16 __iomem *)&psc->ccr, ccr);
        mps->bits_per_word = cs->bits_per_word;
-
-       if (mps->cs_control)
-               mps->cs_control(spi, (spi->mode & SPI_CS_HIGH) ? 1 : 0);
-}
-
-static void mpc52xx_psc_spi_deactivate_cs(struct spi_device *spi)
-{
-       struct mpc52xx_psc_spi *mps = spi_master_get_devdata(spi->master);
-
-       if (mps->cs_control)
-               mps->cs_control(spi, (spi->mode & SPI_CS_HIGH) ? 0 : 1);
 }
 
 #define MPC52xx_PSC_BUFSIZE (MPC52xx_PSC_RFNUM_MASK + 1)
@@ -220,14 +204,9 @@ int mpc52xx_psc_spi_transfer_one_message(struct spi_controller *ctlr,
                m->actual_length += t->len;
 
                spi_transfer_delay_exec(t);
-
-               if (cs_change)
-                       mpc52xx_psc_spi_deactivate_cs(spi);
        }
 
        m->status = status;
-       if (status || !cs_change)
-               mpc52xx_psc_spi_deactivate_cs(spi);
 
        mpc52xx_psc_spi_transfer_setup(spi, NULL);
 
@@ -269,7 +248,7 @@ static int mpc52xx_psc_spi_port_config(int psc_id, struct mpc52xx_psc_spi *mps)
        int ret;
 
        /* default sysclk is 512MHz */
-       mclken_div = (mps->sysclk ? mps->sysclk : 512000000) / MCLK;
+       mclken_div = 512000000 / MCLK;
        ret = mpc52xx_set_psc_clkdiv(psc_id, mclken_div);
        if (ret)
                return ret;
@@ -317,7 +296,6 @@ static irqreturn_t mpc52xx_psc_spi_isr(int irq, void *dev_id)
 static int mpc52xx_psc_spi_do_probe(struct device *dev, u32 regaddr,
                                u32 size, unsigned int irq, s16 bus_num)
 {
-       struct fsl_spi_platform_data *pdata = dev_get_platdata(dev);
        struct mpc52xx_psc_spi *mps;
        struct spi_master *master;
        int ret;
@@ -333,19 +311,8 @@ static int mpc52xx_psc_spi_do_probe(struct device *dev, u32 regaddr,
        master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_LSB_FIRST;
 
        mps->irq = irq;
-       if (pdata == NULL) {
-               dev_warn(dev,
-                        "probe called without platform data, no cs_control function will be called\n");
-               mps->cs_control = NULL;
-               mps->sysclk = 0;
-               master->bus_num = bus_num;
-               master->num_chipselect = 255;
-       } else {
-               mps->cs_control = pdata->cs_control;
-               mps->sysclk = pdata->sysclk;
-               master->bus_num = pdata->bus_num;
-               master->num_chipselect = pdata->max_chipselect;
-       }
+       master->bus_num = bus_num;
+       master->num_chipselect = 255;
        master->setup = mpc52xx_psc_spi_setup;
        master->transfer_one_message = mpc52xx_psc_spi_transfer_one_message;
        master->cleanup = mpc52xx_psc_spi_cleanup;