Merge branch '2021-02-02-drop-asm_global_data-when-unused'

[platform/kernel/u-boot.git] / drivers / spi / fsl_qspi.c

diff --git a/drivers/spi/fsl_qspi.c b/drivers/spi/fsl_qspi.c
index c27c606..3f97730 100644 (file)
--- a/drivers/spi/fsl_qspi.c
+++ b/drivers/spi/fsl_qspi.c
@@ -260,14 +260,6 @@ static const struct fsl_qspi_devtype_data ls1021a_data = {
        .little_endian = false,
 };
 
-static const struct fsl_qspi_devtype_data ls1088a_data = {
-       .rxfifo = SZ_128,
-       .txfifo = SZ_128,
-       .ahb_buf_size = SZ_1K,
-       .quirks = QUADSPI_QUIRK_TKT253890,
-       .little_endian = true,
-};
-
 static const struct fsl_qspi_devtype_data ls2080a_data = {
        .rxfifo = SZ_128,
        .txfifo = SZ_64,
@@ -410,7 +402,7 @@ static bool fsl_qspi_supports_op(struct spi_slave *slave,
            op->data.nbytes > q->devtype_data->txfifo)
                return false;
 
-       return true;
+       return spi_mem_default_supports_op(slave, op);
 }
 
 static void fsl_qspi_prepare_lut(struct fsl_qspi *q,
@@ -878,7 +870,7 @@ static const struct udevice_id fsl_qspi_ids[] = {
        { .compatible = "fsl,imx7d-qspi", .data = (ulong)&imx7d_data, },
        { .compatible = "fsl,imx7ulp-qspi", .data = (ulong)&imx7ulp_data, },
        { .compatible = "fsl,ls1021a-qspi", .data = (ulong)&ls1021a_data, },
-       { .compatible = "fsl,ls1088a-qspi", .data = (ulong)&ls1088a_data, },
+       { .compatible = "fsl,ls1088a-qspi", .data = (ulong)&ls2080a_data, },
        { .compatible = "fsl,ls2080a-qspi", .data = (ulong)&ls2080a_data, },
        { }
 };