Merge tag 'pci-v5.18-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / drivers / spi / spi-cadence-quadspi.c

diff --git a/drivers/spi/spi-cadence-quadspi.c b/drivers/spi/spi-cadence-quadspi.c
index b808c94641fa67ad8854fe870f2367adc9c8c130..b0c9f62ccefbb9eaa83aa9d9897fa8d9c0a6148a 100644 (file)
--- a/drivers/spi/spi-cadence-quadspi.c
+++ b/drivers/spi/spi-cadence-quadspi.c
@@ -1441,10 +1441,7 @@ static bool cqspi_supports_mem_op(struct spi_mem *mem,
        if (!(all_true || all_false))
                return false;
 
-       if (all_true)
-               return spi_mem_dtr_supports_op(mem, op);
-       else
-               return spi_mem_default_supports_op(mem, op);
+       return spi_mem_default_supports_op(mem, op);
 }
 
 static int cqspi_of_get_flash_pdata(struct platform_device *pdev,
@@ -1595,6 +1592,10 @@ static const struct spi_controller_mem_ops cqspi_mem_ops = {
        .supports_op = cqspi_supports_mem_op,
 };
 
+static const struct spi_controller_mem_caps cqspi_mem_caps = {
+       .dtr = true,
+};
+
 static int cqspi_setup_flash(struct cqspi_st *cqspi)
 {
        struct platform_device *pdev = cqspi->pdev;
@@ -1652,6 +1653,7 @@ static int cqspi_probe(struct platform_device *pdev)
        }
        master->mode_bits = SPI_RX_QUAD | SPI_RX_DUAL;
        master->mem_ops = &cqspi_mem_ops;
+       master->mem_caps = &cqspi_mem_caps;
        master->dev.of_node = pdev->dev.of_node;
 
        cqspi = spi_master_get_devdata(master);