spi: fsl-dspi: use common proptery 'spi-cs-setup(hold)-delay-ns'

Use SPI common DT binding properties 'spi-cs-setup-delay-ns' and
'spi-cs-hold-delay-ns'. If these properties do not exist, fall back to
legacy 'fsl,spi-cs-sck-delay' and 'fsl,spi-sck-cs-delay'.

Signed-off-by: Frank Li <Frank.Li@nxp.com>
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
Link: https://patch.msgid.link/20240624-ls_qspi-v4-1-3d1c6f5005bf@nxp.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c
index 0a2730cd07c6a104cab472131c2d2cff31446dac..191de1917f8316784e07a3737f491dcba2388427 100644 (file)
--- a/drivers/spi/spi-fsl-dspi.c
+++ b/drivers/spi/spi-fsl-dspi.c
@@ -1006,6 +1006,7 @@ static int dspi_setup(struct spi_device *spi)
        struct chip_data *chip;
        unsigned long clkrate;
        bool cs = true;
+       int val;
 
        /* Only alloc on first setup */
        chip = spi_get_ctldata(spi);
@@ -1018,11 +1019,19 @@ static int dspi_setup(struct spi_device *spi)
        pdata = dev_get_platdata(&dspi->pdev->dev);
 
        if (!pdata) {
-               of_property_read_u32(spi->dev.of_node, "fsl,spi-cs-sck-delay",
-                                    &cs_sck_delay);
-
-               of_property_read_u32(spi->dev.of_node, "fsl,spi-sck-cs-delay",
-                                    &sck_cs_delay);
+               val = spi_delay_to_ns(&spi->cs_setup, NULL);
+               cs_sck_delay = val >= 0 ? val : 0;
+               if (!cs_sck_delay)
+                       of_property_read_u32(spi->dev.of_node,
+                                            "fsl,spi-cs-sck-delay",
+                                            &cs_sck_delay);
+
+               val = spi_delay_to_ns(&spi->cs_hold, NULL);
+               sck_cs_delay =  val >= 0 ? val : 0;
+               if (!sck_cs_delay)
+                       of_property_read_u32(spi->dev.of_node,
+                                            "fsl,spi-sck-cs-delay",
+                                            &sck_cs_delay);
        } else {
                cs_sck_delay = pdata->cs_sck_delay;
                sck_cs_delay = pdata->sck_cs_delay;