Merge branch 'fixes-v5.14' into fixes

[linux-2.6-microblaze.git] / arch / arm64 / boot / dts / freescale / imx8mp.dtsi

diff --git a/arch/arm64/boot/dts/freescale/imx8mp.dtsi b/arch/arm64/boot/dts/freescale/imx8mp.dtsi
index c2d51a4..9f7c7f5 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx8mp.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mp.dtsi
@@ -37,6 +37,7 @@
                serial1 = &uart2;
                serial2 = &uart3;
                serial3 = &uart4;
+               spi0 = &flexspi;
        };
 
        cpus {
@@ -407,7 +408,6 @@
                                                  <&clk IMX8MP_CLK_GIC>,
                                                  <&clk IMX8MP_CLK_AUDIO_AHB>,
                                                  <&clk IMX8MP_CLK_AUDIO_AXI_SRC>,
-                                                 <&clk IMX8MP_CLK_IPG_AUDIO_ROOT>,
                                                  <&clk IMX8MP_AUDIO_PLL1>,
                                                  <&clk IMX8MP_AUDIO_PLL2>;
                                assigned-clock-parents = <&clk IMX8MP_SYS_PLL1_800M>,
@@ -423,7 +423,6 @@
                                                       <500000000>,
                                                       <400000000>,
                                                       <800000000>,
-                                                      <400000000>,
                                                       <393216000>,
                                                       <361267200>;
                        };
@@ -761,6 +760,21 @@
                                status = "disabled";
                        };
 
+                       flexspi: spi@30bb0000 {
+                               compatible = "nxp,imx8mp-fspi";
+                               reg = <0x30bb0000 0x10000>, <0x8000000 0x10000000>;
+                               reg-names = "fspi_base", "fspi_mmap";
+                               interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
+                               clocks = <&clk IMX8MP_CLK_QSPI_ROOT>,
+                                        <&clk IMX8MP_CLK_QSPI_ROOT>;
+                               clock-names = "fspi", "fspi_en";
+                               assigned-clock-rates = <80000000>;
+                               assigned-clocks = <&clk IMX8MP_CLK_QSPI>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               status = "disabled";
+                       };
+
                        sdma1: dma-controller@30bd0000 {
                                compatible = "fsl,imx8mp-sdma", "fsl,imx8mq-sdma";
                                reg = <0x30bd0000 0x10000>;