spi: cadence: Try to read spi-tx/rx-bus width property using ACPI

Try to read bus width property using acpi_dev_get_property function, do
not rely on spi_mem_default_supports_op function only.
If of_device_get_match_data() will fail, retry with
acpi_device_get_match_data() to handle ACPI properly.

Signed-off-by: Witold Sadowski <wsadowski@marvell.com>
Signed-off-by: Piyush Malgujar <pmalgujar@marvell.com>
Link: https://patch.msgid.link/20240724154739.582367-10-wsadowski@marvell.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-cadence-xspi.c b/drivers/spi/spi-cadence-xspi.c
index 28c1aea017434edb43473761d59d2ae02ceab629..695a9bc1969ada720eb5fea5738cbf116a513927 100644 (file)
--- a/drivers/spi/spi-cadence-xspi.c
+++ b/drivers/spi/spi-cadence-xspi.c
@@ -2,6 +2,7 @@
 // Cadence XSPI flash controller driver
 // Copyright (C) 2020-21 Cadence
 
+#include <linux/acpi.h>
 #include <linux/completion.h>
 #include <linux/delay.h>
 #include <linux/err.h>
@@ -773,6 +774,66 @@ static int marvell_xspi_mem_op_execute(struct spi_mem *mem,
        return ret;
 }
 
+#ifdef CONFIG_ACPI
+static bool cdns_xspi_supports_op(struct spi_mem *mem,
+                                 const struct spi_mem_op *op)
+{
+       struct spi_device *spi = mem->spi;
+       const union acpi_object *obj;
+       struct acpi_device *adev;
+
+       adev = ACPI_COMPANION(&spi->dev);
+
+       if (!acpi_dev_get_property(adev, "spi-tx-bus-width", ACPI_TYPE_INTEGER,
+                                  &obj)) {
+               switch (obj->integer.value) {
+               case 1:
+                       break;
+               case 2:
+                       spi->mode |= SPI_TX_DUAL;
+                       break;
+               case 4:
+                       spi->mode |= SPI_TX_QUAD;
+                       break;
+               case 8:
+                       spi->mode |= SPI_TX_OCTAL;
+                       break;
+               default:
+                       dev_warn(&spi->dev,
+                                "spi-tx-bus-width %lld not supported\n",
+                                obj->integer.value);
+                       break;
+               }
+       }
+
+       if (!acpi_dev_get_property(adev, "spi-rx-bus-width", ACPI_TYPE_INTEGER,
+                                  &obj)) {
+               switch (obj->integer.value) {
+               case 1:
+                       break;
+               case 2:
+                       spi->mode |= SPI_RX_DUAL;
+                       break;
+               case 4:
+                       spi->mode |= SPI_RX_QUAD;
+                       break;
+               case 8:
+                       spi->mode |= SPI_RX_OCTAL;
+                       break;
+               default:
+                       dev_warn(&spi->dev,
+                                "spi-rx-bus-width %lld not supported\n",
+                                obj->integer.value);
+                       break;
+               }
+       }
+
+       if (!spi_mem_default_supports_op(mem, op))
+               return false;
+
+       return true;
+}
+#endif
 
 static int cdns_xspi_adjust_mem_op_size(struct spi_mem *mem, struct spi_mem_op *op)
 {
@@ -785,11 +846,17 @@ static int cdns_xspi_adjust_mem_op_size(struct spi_mem *mem, struct spi_mem_op *
 }
 
 static const struct spi_controller_mem_ops cadence_xspi_mem_ops = {
+#ifdef CONFIG_ACPI
+       .supports_op = cdns_xspi_supports_op,
+#endif
        .exec_op = cdns_xspi_mem_op_execute,
        .adjust_op_size = cdns_xspi_adjust_mem_op_size,
 };
 
 static const struct spi_controller_mem_ops marvell_xspi_mem_ops = {
+#ifdef CONFIG_ACPI
+       .supports_op = cdns_xspi_supports_op,
+#endif
        .exec_op = marvell_xspi_mem_op_execute,
        .adjust_op_size = cdns_xspi_adjust_mem_op_size,
 };
@@ -1091,8 +1158,11 @@ static int cdns_xspi_probe(struct platform_device *pdev)
 
        cdns_xspi = spi_controller_get_devdata(host);
        cdns_xspi->driver_data = of_device_get_match_data(dev);
-       if (!cdns_xspi->driver_data)
-               return -ENODEV;
+       if (!cdns_xspi->driver_data) {
+               cdns_xspi->driver_data = acpi_device_get_match_data(dev);
+               if (!cdns_xspi->driver_data)
+                       return -ENODEV;
+       }
 
        if (cdns_xspi->driver_data->mrvl_hw_overlay) {
                host->mem_ops = &marvell_xspi_mem_ops;