Merge tag 'imx-dt-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/shawngu...

Pull "i.MX device tree updates for 4.17" from Shawn Guo:

 - New board support: phyBOARD-Mira i.MX6 boards; Advantech DMS-BA16
   i.MX6Q board; Toradex Colibri iMX6ULL boards.
 - ZII RDU board updates: add RAVE SP device; disable on-chip watchdog
   as the external watchdog is being used instead; improve USDHC node
   regarding to voltage and SDIO capability.
 - i.MX6UL/ULL updates: cpufreq clock cleanup; add IOMUXC_SNVS pins and
   missing daisy chain configurations; add more devices like WDOG3,
   UART8, PMU, architected timer etc.
 - Hummingboard updates: correct USBOTG-ID pin; remove mention of
   nonexistent node.
 - Fix compatibles of atmel eeprom devices.
 - A couple of improvements on i.MX25 pinfunc header regarding to eSDHC
   pins.
 - A bunch of patches from Fabio and Marco to fix DTC warnings seen with
   W=1 switch.
 - Remove GPU subsystem nodes, as they are not needed by the etnaviv
   driver anymore and have been removed from the binding.
 - Add FIFO depth definition for i.MX25 SSI devices.
 - Add missing '#sound-dai-cells' for sgtl5000 codec which is complained
   by DTC.
 - Miscellaneous and random updates.

* tag 'imx-dt-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (66 commits)
  ARM: dts: i.MX25: define SSI FIFO depth
  ARM: dts: vf610m4: Remove the zero length reg property
  ARM: dts: vf610m4: Remove skeleton.dtsi inclusion
  ARM: dts: vf500: Remove the zero length reg property
  ARM: dts: vf: Add memory node unit name
  ARM: dts: vf500: Remove skeleton.dtsi inclusion
  ARM: dts: imx7s: add temperature monitor support
  ARM: dts: imx: Add missing #sound-dai-cells for sgtl5000 codec
  ARM: dts: imx51-zii-rdu1: Add node for RAVE SP device
  ARM: dts: imx6: RDU2: Add RAVE SP device
  ARM: dts: imx5: Pass the memory unit-address
  ARM: dts: imx7s: add spba-bus abstraction
  ARM: dts: imx6dl-icore-rqs: Fix invalid PHY address assignment for ethernet
  ARM: dts: imx6ul: add wdog3 node
  ARM: dts: imx7: add CPU PMU support
  ARM: dts: imx6dl-colibri-eval-v3: Add chosen node
  ARM: dts: imx6: Pass memory unit-adress
  ARM: dts: imx6dl: remove 'lcdif' node
  ARM: dts: hummingboard: Remove mention of nonexistent node
  ARM: dts: imx6qdl-hummingboard: fix USBOTG-ID pin
  ...

diff --cc arch/arm/boot/dts/Makefile
Simple merge

diff --cc arch/arm/boot/dts/imx7s.dtsi
index 39fae570f23028430e946837e46b56c7454402a2,cd6964f658c00feb180a7330360ca8cbc48dccbb..4d42335c0dee991aa18ff8c40526865eb89cd97c
--- 1/arch/arm/boot/dts/imx7s.dtsi
--- 2/arch/arm/boot/dts/imx7s.dtsi
+++ b/arch/arm/boot/dts/imx7s.dtsi
@@@ -718,150 -734,128 +744,158 @@@
                        reg = <0x30800000 0x400000>;
                        ranges;
  
-                       ecspi1: ecspi@30820000 {
+                       spba-bus@30800000 {
+                               compatible = "fsl,spba-bus", "simple-bus";
                                #address-cells = <1>;
-                               #size-cells = <0>;
-                               compatible = "fsl,imx7d-ecspi", "fsl,imx51-ecspi";
-                               reg = <0x30820000 0x10000>;
-                               interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
-                               clocks = <&clks IMX7D_ECSPI1_ROOT_CLK>,
-                                       <&clks IMX7D_ECSPI1_ROOT_CLK>;
-                               clock-names = "ipg", "per";
-                               status = "disabled";
-                       };
+                               #size-cells = <1>;
+                               reg = <0x30800000 0x100000>;
+                               ranges;
  
-                       ecspi2: ecspi@30830000 {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-                               compatible = "fsl,imx7d-ecspi", "fsl,imx51-ecspi";
-                               reg = <0x30830000 0x10000>;
-                               interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
-                               clocks = <&clks IMX7D_ECSPI2_ROOT_CLK>,
-                                       <&clks IMX7D_ECSPI2_ROOT_CLK>;
-                               clock-names = "ipg", "per";
-                               status = "disabled";
-                       };
+                               ecspi1: ecspi@30820000 {
+                                       #address-cells = <1>;
+                                       #size-cells = <0>;
+                                       compatible = "fsl,imx7d-ecspi", "fsl,imx51-ecspi";
+                                       reg = <0x30820000 0x10000>;
+                                       interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
+                                       clocks = <&clks IMX7D_ECSPI1_ROOT_CLK>,
+                                               <&clks IMX7D_ECSPI1_ROOT_CLK>;
+                                       clock-names = "ipg", "per";
+                                       status = "disabled";
+                               };
  
-                       ecspi3: ecspi@30840000 {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-                               compatible = "fsl,imx7d-ecspi", "fsl,imx51-ecspi";
-                               reg = <0x30840000 0x10000>;
-                               interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
-                               clocks = <&clks IMX7D_ECSPI3_ROOT_CLK>,
-                                       <&clks IMX7D_ECSPI3_ROOT_CLK>;
-                               clock-names = "ipg", "per";
-                               status = "disabled";
-                       };
+                               ecspi2: ecspi@30830000 {
+                                       #address-cells = <1>;
+                                       #size-cells = <0>;
+                                       compatible = "fsl,imx7d-ecspi", "fsl,imx51-ecspi";
+                                       reg = <0x30830000 0x10000>;
+                                       interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
+                                       clocks = <&clks IMX7D_ECSPI2_ROOT_CLK>,
+                                               <&clks IMX7D_ECSPI2_ROOT_CLK>;
+                                       clock-names = "ipg", "per";
+                                       status = "disabled";
+                               };
  
-                       uart1: serial@30860000 {
-                               compatible = "fsl,imx7d-uart",
-                                            "fsl,imx6q-uart";
-                               reg = <0x30860000 0x10000>;
-                               interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
-                               clocks = <&clks IMX7D_UART1_ROOT_CLK>,
-                                       <&clks IMX7D_UART1_ROOT_CLK>;
-                               clock-names = "ipg", "per";
-                               status = "disabled";
-                       };
+                               ecspi3: ecspi@30840000 {
+                                       #address-cells = <1>;
+                                       #size-cells = <0>;
+                                       compatible = "fsl,imx7d-ecspi", "fsl,imx51-ecspi";
+                                       reg = <0x30840000 0x10000>;
+                                       interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
+                                       clocks = <&clks IMX7D_ECSPI3_ROOT_CLK>,
+                                               <&clks IMX7D_ECSPI3_ROOT_CLK>;
+                                       clock-names = "ipg", "per";
+                                       status = "disabled";
+                               };
  
-                       uart2: serial@30890000 {
-                               compatible = "fsl,imx7d-uart",
-                                            "fsl,imx6q-uart";
-                               reg = <0x30890000 0x10000>;
-                               interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>;
-                               clocks = <&clks IMX7D_UART2_ROOT_CLK>,
-                                       <&clks IMX7D_UART2_ROOT_CLK>;
-                               clock-names = "ipg", "per";
-                               status = "disabled";
-                       };
+                               uart1: serial@30860000 {
+                                       compatible = "fsl,imx7d-uart",
+                                                    "fsl,imx6q-uart";
+                                       reg = <0x30860000 0x10000>;
+                                       interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
+                                       clocks = <&clks IMX7D_UART1_ROOT_CLK>,
+                                               <&clks IMX7D_UART1_ROOT_CLK>;
+                                       clock-names = "ipg", "per";
+                                       status = "disabled";
+                               };
  
-                       uart3: serial@30880000 {
-                               compatible = "fsl,imx7d-uart",
-                                            "fsl,imx6q-uart";
-                               reg = <0x30880000 0x10000>;
-                               interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
-                               clocks = <&clks IMX7D_UART3_ROOT_CLK>,
-                                       <&clks IMX7D_UART3_ROOT_CLK>;
-                               clock-names = "ipg", "per";
-                               status = "disabled";
-                       };
+                               uart2: serial@30890000 {
+                                       compatible = "fsl,imx7d-uart",
+                                                    "fsl,imx6q-uart";
+                                       reg = <0x30890000 0x10000>;
+                                       interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>;
+                                       clocks = <&clks IMX7D_UART2_ROOT_CLK>,
+                                               <&clks IMX7D_UART2_ROOT_CLK>;
+                                       clock-names = "ipg", "per";
+                                       status = "disabled";
+                               };
  
-                       sai1: sai@308a0000 {
-                               #sound-dai-cells = <0>;
-                               compatible = "fsl,imx7d-sai", "fsl,imx6sx-sai";
-                               reg = <0x308a0000 0x10000>;
-                               interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>;
-                               clocks = <&clks IMX7D_SAI1_IPG_CLK>,
-                                        <&clks IMX7D_SAI1_ROOT_CLK>,
-                                        <&clks IMX7D_CLK_DUMMY>,
-                                        <&clks IMX7D_CLK_DUMMY>;
-                               clock-names = "bus", "mclk1", "mclk2", "mclk3";
-                               dma-names = "rx", "tx";
-                               dmas = <&sdma 8 24 0>, <&sdma 9 24 0>;
-                               status = "disabled";
-                       };
+                               uart3: serial@30880000 {
+                                       compatible = "fsl,imx7d-uart",
+                                                    "fsl,imx6q-uart";
+                                       reg = <0x30880000 0x10000>;
+                                       interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
+                                       clocks = <&clks IMX7D_UART3_ROOT_CLK>,
+                                               <&clks IMX7D_UART3_ROOT_CLK>;
+                                       clock-names = "ipg", "per";
+                                       status = "disabled";
+                               };
  
-                       sai2: sai@308b0000 {
-                               #sound-dai-cells = <0>;
-                               compatible = "fsl,imx7d-sai", "fsl,imx6sx-sai";
-                               reg = <0x308b0000 0x10000>;
-                               interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
-                               clocks = <&clks IMX7D_SAI2_IPG_CLK>,
-                                        <&clks IMX7D_SAI2_ROOT_CLK>,
-                                        <&clks IMX7D_CLK_DUMMY>,
-                                        <&clks IMX7D_CLK_DUMMY>;
-                               clock-names = "bus", "mclk1", "mclk2", "mclk3";
-                               dma-names = "rx", "tx";
-                               dmas = <&sdma 10 24 0>, <&sdma 11 24 0>;
-                               status = "disabled";
-                       };
+                               sai1: sai@308a0000 {
+                                       #sound-dai-cells = <0>;
+                                       compatible = "fsl,imx7d-sai", "fsl,imx6sx-sai";
+                                       reg = <0x308a0000 0x10000>;
+                                       interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>;
+                                       clocks = <&clks IMX7D_SAI1_IPG_CLK>,
+                                                <&clks IMX7D_SAI1_ROOT_CLK>,
+                                                <&clks IMX7D_CLK_DUMMY>,
+                                                <&clks IMX7D_CLK_DUMMY>;
+                                       clock-names = "bus", "mclk1", "mclk2", "mclk3";
+                                       dma-names = "rx", "tx";
+                                       dmas = <&sdma 8 24 0>, <&sdma 9 24 0>;
+                                       status = "disabled";
+                               };
  
-                       sai3: sai@308c0000 {
-                               #sound-dai-cells = <0>;
-                               compatible = "fsl,imx7d-sai", "fsl,imx6sx-sai";
-                               reg = <0x308c0000 0x10000>;
-                               interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
-                               clocks = <&clks IMX7D_SAI3_IPG_CLK>,
-                                        <&clks IMX7D_SAI3_ROOT_CLK>,
-                                        <&clks IMX7D_CLK_DUMMY>,
-                                        <&clks IMX7D_CLK_DUMMY>;
-                               clock-names = "bus", "mclk1", "mclk2", "mclk3";
-                               dma-names = "rx", "tx";
-                               dmas = <&sdma 12 24 0>, <&sdma 13 24 0>;
-                               status = "disabled";
+                               sai2: sai@308b0000 {
+                                       #sound-dai-cells = <0>;
+                                       compatible = "fsl,imx7d-sai", "fsl,imx6sx-sai";
+                                       reg = <0x308b0000 0x10000>;
+                                       interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
+                                       clocks = <&clks IMX7D_SAI2_IPG_CLK>,
+                                                <&clks IMX7D_SAI2_ROOT_CLK>,
+                                                <&clks IMX7D_CLK_DUMMY>,
+                                                <&clks IMX7D_CLK_DUMMY>;
+                                       clock-names = "bus", "mclk1", "mclk2", "mclk3";
+                                       dma-names = "rx", "tx";
+                                       dmas = <&sdma 10 24 0>, <&sdma 11 24 0>;
+                                       status = "disabled";
+                               };
+ 
+                               sai3: sai@308c0000 {
+                                       #sound-dai-cells = <0>;
+                                       compatible = "fsl,imx7d-sai", "fsl,imx6sx-sai";
+                                       reg = <0x308c0000 0x10000>;
+                                       interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
+                                       clocks = <&clks IMX7D_SAI3_IPG_CLK>,
+                                                <&clks IMX7D_SAI3_ROOT_CLK>,
+                                                <&clks IMX7D_CLK_DUMMY>,
+                                                <&clks IMX7D_CLK_DUMMY>;
+                                       clock-names = "bus", "mclk1", "mclk2", "mclk3";
+                                       dma-names = "rx", "tx";
+                                       dmas = <&sdma 12 24 0>, <&sdma 13 24 0>;
+                                       status = "disabled";
+                               };
                        };
  
 +                      crypto: caam@30900000 {
 +                              compatible = "fsl,sec-v4.0";
 +                              #address-cells = <1>;
 +                              #size-cells = <1>;
 +                              reg = <0x30900000 0x40000>;
 +                              ranges = <0 0x30900000 0x40000>;
 +                              interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>;
 +                              clocks = <&clks IMX7D_CAAM_CLK>,
 +                                       <&clks IMX7D_AHB_CHANNEL_ROOT_CLK>;
 +                              clock-names = "ipg", "aclk";
 +
 +                              sec_jr0: jr0@1000 {
 +                                      compatible = "fsl,sec-v4.0-job-ring";
 +                                      reg = <0x1000 0x1000>;
 +                                      interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
 +                              };
 +
 +                              sec_jr1: jr1@2000 {
 +                                      compatible = "fsl,sec-v4.0-job-ring";
 +                                      reg = <0x2000 0x1000>;
 +                                      interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
 +                              };
 +
 +                              sec_jr2: jr1@3000 {
 +                                      compatible = "fsl,sec-v4.0-job-ring";
 +                                      reg = <0x3000 0x1000>;
 +                                      interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>;
 +                              };
 +                      };
 +
                        flexcan1: can@30a00000 {
                                compatible = "fsl,imx7d-flexcan", "fsl,imx6q-flexcan";
                                reg = <0x30a00000 0x10000>;

diff --cc arch/arm/boot/dts/vf610m4-colibri.dts
index 5532e40e350a9e721f430968e01f9e1ff6af4108,2b237ef887b852c95f51e0ce2e8f1171f479019b..41ec66a969907d492dabec284e6a101f592e0216
--- 1/arch/arm/boot/dts/vf610m4-colibri.dts
--- 2/arch/arm/boot/dts/vf610m4-colibri.dts
+++ b/arch/arm/boot/dts/vf610m4-colibri.dts
@@@ -51,10 -51,10 +51,10 @@@
  
        chosen {
                bootargs = "console=ttyLP2,115200 clk_ignore_unused init=/linuxrc rw";
 -              linux,stdout-path = "&uart2";
 +              stdout-path = "&uart2";
        };
  
-       memory {
+       memory@8c000000 {
                reg = <0x8c000000 0x3000000>;
        };
  };