dm: core: Create a new header file for 'compat' features

[oweals/u-boot.git] / drivers / spi / zynqmp_gqspi.c

diff --git a/drivers/spi/zynqmp_gqspi.c b/drivers/spi/zynqmp_gqspi.c
index 75459d156ec2653d5946227e08c9ec0231e473d6..02b78df843715ad8357e0061d352bce3e6a3987b 100644 (file)
--- a/drivers/spi/zynqmp_gqspi.c
+++ b/drivers/spi/zynqmp_gqspi.c
@@ -6,8 +6,7 @@
  */
 
 #include <common.h>
-#include <asm/arch/clk.h>
-#include <asm/arch/hardware.h>
+#include <cpu_func.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/io.h>
 #include <clk.h>
@@ -17,6 +16,8 @@
 #include <spi.h>
 #include <ubi_uboot.h>
 #include <wait_bit.h>
+#include <dm/device_compat.h>
+#include <linux/err.h>
 
 #define GQSPI_GFIFO_STRT_MODE_MASK     BIT(29)
 #define GQSPI_CONFIG_MODE_EN_MASK      (3 << 30)
@@ -267,7 +268,7 @@ void zynqmp_qspi_set_tapdelay(struct udevice *bus, u32 baudrateval)
                zynqmp_mmio_read(IOU_TAPDLY_BYPASS_OFST, &tapdlybypass);
                tapdlybypass |= (TAP_DLY_BYPASS_LQSPI_RX_VALUE <<
                                TAP_DLY_BYPASS_LQSPI_RX_SHIFT);
-       } else if (reqhz < GQSPI_FREQ_100MHZ) {
+       } else if (reqhz <= GQSPI_FREQ_100MHZ) {
                zynqmp_mmio_read(IOU_TAPDLY_BYPASS_OFST, &tapdlybypass);
                tapdlybypass |= (TAP_DLY_BYPASS_LQSPI_RX_VALUE <<
                                TAP_DLY_BYPASS_LQSPI_RX_SHIFT);
@@ -277,7 +278,7 @@ void zynqmp_qspi_set_tapdelay(struct udevice *bus, u32 baudrateval)
                datadlyadj |= ((GQSPI_USE_DATA_DLY << GQSPI_USE_DATA_DLY_SHIFT)
                                | (GQSPI_DATA_DLY_ADJ_VALUE <<
                                        GQSPI_DATA_DLY_ADJ_SHIFT));
-       } else if (reqhz < GQSPI_FREQ_150MHZ) {
+       } else if (reqhz <= GQSPI_FREQ_150MHZ) {
                lpbkdlyadj = readl(&regs->lpbkdly);
                lpbkdlyadj |= ((GQSPI_LPBK_DLY_ADJ_LPBK_MASK) |
                                GQSPI_LPBK_DLY_ADJ_DLY_0);
@@ -714,6 +715,7 @@ static const struct dm_spi_ops zynqmp_qspi_ops = {
 
 static const struct udevice_id zynqmp_qspi_ids[] = {
        { .compatible = "xlnx,zynqmp-qspi-1.0" },
+       { .compatible = "xlnx,versal-qspi-1.0" },
        { }
 };