spi: imx: pass struct spi_transfer to prepare_transfer()

In an upcoming patch, mx51_ecspi_prepare_transfer() needs access to the
word_delay parameter. To enable controller-specific handling of such
per-transfer parameters, extend the prepare_transfer() function of the
spi_imx_devtype_data interface to take a struct spi_transfer argument,
update all controller-specific implementations accordingly.

Signed-off-by: Jonas Rebmann <jre@pengutronix.de>
Reviewed-by: Frank Li <Frank.Li@nxp.com>
Link: https://patch.msgid.link/20241113-imx-spi-word-delay-v2-1-2b65b737bf29@pengutronix.de
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index 84c3da1..a43b6a8 100644 (file)
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -71,7 +71,8 @@ struct spi_imx_data;
 struct spi_imx_devtype_data {
        void (*intctrl)(struct spi_imx_data *spi_imx, int enable);
        int (*prepare_message)(struct spi_imx_data *spi_imx, struct spi_message *msg);
-       int (*prepare_transfer)(struct spi_imx_data *spi_imx, struct spi_device *spi);
+       int (*prepare_transfer)(struct spi_imx_data *spi_imx, struct spi_device *spi,
+                               struct spi_transfer *t);
        void (*trigger)(struct spi_imx_data *spi_imx);
        int (*rx_available)(struct spi_imx_data *spi_imx);
        void (*reset)(struct spi_imx_data *spi_imx);
@@ -648,7 +649,7 @@ static void mx51_configure_cpha(struct spi_imx_data *spi_imx,
 }
 
 static int mx51_ecspi_prepare_transfer(struct spi_imx_data *spi_imx,
-                                      struct spi_device *spi)
+                                      struct spi_device *spi, struct spi_transfer *t)
 {
        u32 ctrl = readl(spi_imx->base + MX51_ECSPI_CTRL);
        u32 clk;
@@ -773,7 +774,7 @@ static int mx31_prepare_message(struct spi_imx_data *spi_imx,
 }
 
 static int mx31_prepare_transfer(struct spi_imx_data *spi_imx,
-                                struct spi_device *spi)
+                                struct spi_device *spi, struct spi_transfer *t)
 {
        unsigned int reg = MX31_CSPICTRL_ENABLE | MX31_CSPICTRL_HOST;
        unsigned int clk;
@@ -877,7 +878,7 @@ static int mx21_prepare_message(struct spi_imx_data *spi_imx,
 }
 
 static int mx21_prepare_transfer(struct spi_imx_data *spi_imx,
-                                struct spi_device *spi)
+                                struct spi_device *spi, struct spi_transfer *t)
 {
        unsigned int reg = MX21_CSPICTRL_ENABLE | MX21_CSPICTRL_HOST;
        unsigned int max = is_imx27_cspi(spi_imx) ? 16 : 18;
@@ -952,7 +953,7 @@ static int mx1_prepare_message(struct spi_imx_data *spi_imx,
 }
 
 static int mx1_prepare_transfer(struct spi_imx_data *spi_imx,
-                               struct spi_device *spi)
+                               struct spi_device *spi, struct spi_transfer *t)
 {
        unsigned int reg = MX1_CSPICTRL_ENABLE | MX1_CSPICTRL_HOST;
        unsigned int clk;
@@ -1303,7 +1304,7 @@ static int spi_imx_setupxfer(struct spi_device *spi,
                spi_imx->target_burst = t->len;
        }
 
-       spi_imx->devtype_data->prepare_transfer(spi_imx, spi);
+       spi_imx->devtype_data->prepare_transfer(spi_imx, spi, t);
 
        return 0;
 }