Merge tag 'u-boot-imx-20191105' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

[oweals/u-boot.git] / arch / arm / dts / imx7s.dtsi

diff --git a/arch/arm/dts/imx7s.dtsi b/arch/arm/dts/imx7s.dtsi
index 4d42335c0dee991aa18ff8c40526865eb89cd97c..5067b9f7e7ccda2621b5c6e7474a80aefa8e13a9 100644 (file)
--- a/arch/arm/dts/imx7s.dtsi
+++ b/arch/arm/dts/imx7s.dtsi
@@ -82,10 +82,11 @@
                serial4 = &uart5;
                serial5 = &uart6;
                serial6 = &uart7;
-               spi0 = &ecspi1;
-               spi1 = &ecspi2;
-               spi2 = &ecspi3;
-               spi3 = &ecspi4;
+               spi0 = &qspi1;
+               spi1 = &ecspi1;
+               spi2 = &ecspi2;
+               spi3 = &ecspi3;
+               spi4 = &ecspi4;
        };
 
        cpus {
@@ -1072,6 +1073,19 @@
                                status = "disabled";
                        };
 
+                       qspi1: qspi@30bb0000 {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               compatible = "fsl,imx7d-qspi";
+                               reg = <0x30bb0000 0x10000>, <0x60000000 0x10000000>;
+                               reg-names = "QuadSPI", "QuadSPI-memory";
+                               interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
+                               clocks = <&clks IMX7D_QSPI_ROOT_CLK>,
+                                       <&clks IMX7D_QSPI_ROOT_CLK>;
+                               clock-names = "qspi_en", "qspi";
+                               status = "disabled";
+                       };
+
                        sdma: sdma@30bd0000 {
                                compatible = "fsl,imx7d-sdma", "fsl,imx35-sdma";
                                reg = <0x30bd0000 0x10000>;