Merge patch series "net: ksz9477: add support for KSZ GbE switches using SPI bus"

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

diff --git a/drivers/spi/fsl_qspi.c b/drivers/spi/fsl_qspi.c
index f965301d6ac288efe6d9f3c78299d0042c2d23db..c7f554826c3d4ba8291471398d7c638d8fdbc7be 100644 (file)
--- a/drivers/spi/fsl_qspi.c
+++ b/drivers/spi/fsl_qspi.c
@@ -23,12 +23,12 @@
  * Transition to spi-mem in spi-fsl-qspi.c
  */
 
-#include <common.h>
 #include <dm.h>
 #include <dm/device_compat.h>
 #include <log.h>
 #include <spi.h>
 #include <spi-mem.h>
+#include <asm/global_data.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/libfdt.h>
@@ -510,10 +510,10 @@ static void fsl_qspi_select_mem(struct fsl_qspi *q, struct spi_slave *slave)
        struct dm_spi_slave_plat *plat =
                dev_get_parent_plat(slave->dev);
 
-       if (q->selected == plat->cs)
+       if (q->selected == plat->cs[0])
                return;
 
-       q->selected = plat->cs;
+       q->selected = plat->cs[0];
        fsl_qspi_invalidate(q);
 }