]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
spi: imx: remove CLK calculation and check for target mode
authorClark Wang <xiaoning.wang@nxp.com>
Fri, 24 Oct 2025 05:52:11 +0000 (13:52 +0800)
committerMark Brown <broonie@kernel.org>
Thu, 6 Nov 2025 13:15:14 +0000 (13:15 +0000)
In target mode, the clock signal is controlled by the master. Target does
not need to check, calculate and configure the clock frequency division.
The target can directly use the root clock to sample the SCL signal.

Therefore, remove check, calculation and frequency division function of
the clock for target mode.

Signed-off-by: Carlos Song <carlos.song@nxp.com>
Signed-off-by: Clark Wang <xiaoning.wang@nxp.com>
Reviewed-by: Frank Li <Frank.Li@nxp.com>
Link: https://patch.msgid.link/20251024055211.408440-1-carlos.song@nxp.com
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-imx.c

index 155ddeb8fcd460925f70950c7c8de09fc4e6bcfa..510074ef4ed46df3eacbfde8592cbb247527f9ba 100644 (file)
@@ -42,6 +42,7 @@ MODULE_PARM_DESC(polling_limit_us,
                 "time in us to run a transfer in polling mode\n");
 
 #define MXC_RPM_TIMEOUT                2000 /* 2000ms */
+#define MXC_SPI_DEFAULT_SPEED  500000 /* 500KHz */
 
 #define MXC_CSPIRXDATA         0x00
 #define MXC_CSPITXDATA         0x04
@@ -684,8 +685,11 @@ static int mx51_ecspi_prepare_transfer(struct spi_imx_data *spi_imx,
        /* set clock speed */
        ctrl &= ~(0xf << MX51_ECSPI_CTRL_POSTDIV_OFFSET |
                  0xf << MX51_ECSPI_CTRL_PREDIV_OFFSET);
-       ctrl |= mx51_ecspi_clkdiv(spi_imx, spi_imx->spi_bus_clk, &clk);
-       spi_imx->spi_bus_clk = clk;
+
+       if (!spi_imx->target_mode) {
+               ctrl |= mx51_ecspi_clkdiv(spi_imx, spi_imx->spi_bus_clk, &clk);
+               spi_imx->spi_bus_clk = clk;
+       }
 
        mx51_configure_cpha(spi_imx, spi);
 
@@ -1308,15 +1312,18 @@ static int spi_imx_setupxfer(struct spi_device *spi,
        if (!t)
                return 0;
 
-       if (!t->speed_hz) {
-               if (!spi->max_speed_hz) {
-                       dev_err(&spi->dev, "no speed_hz provided!\n");
-                       return -EINVAL;
+       if (!spi_imx->target_mode) {
+               if (!t->speed_hz) {
+                       if (!spi->max_speed_hz) {
+                               dev_err(&spi->dev, "no speed_hz provided!\n");
+                               return -EINVAL;
+                       }
+                       dev_dbg(&spi->dev, "using spi->max_speed_hz!\n");
+                       spi_imx->spi_bus_clk = spi->max_speed_hz;
+               } else {
+                       spi_imx->spi_bus_clk = t->speed_hz;
                }
-               dev_dbg(&spi->dev, "using spi->max_speed_hz!\n");
-               spi_imx->spi_bus_clk = spi->max_speed_hz;
-       } else
-               spi_imx->spi_bus_clk = t->speed_hz;
+       }
 
        spi_imx->bits_per_word = t->bits_per_word;
        spi_imx->count = t->len;
@@ -1831,6 +1838,7 @@ static int spi_imx_probe(struct platform_device *pdev)
        controller->prepare_message = spi_imx_prepare_message;
        controller->unprepare_message = spi_imx_unprepare_message;
        controller->target_abort = spi_imx_target_abort;
+       spi_imx->spi_bus_clk = MXC_SPI_DEFAULT_SPEED;
        controller->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_NO_CS |
                                SPI_MOSI_IDLE_LOW;