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

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
  ...

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/arm/boot/dts/imx6q-sbc6x.dts b/arch/arm/boot/dts/imx6q-sbc6x.dts
index 255733063ea4..b7aa2f0b9f53 100644
--- a/arch/arm/boot/dts/imx6q-sbc6x.dts
+++ b/arch/arm/boot/dts/imx6q-sbc6x.dts
@@ -12,7 +12,7 @@
 	model = "MicroSys sbc6x board";
 	compatible = "microsys,sbc6x", "fsl,imx6q";
 
-	memory {
+	memory@10000000 {
 		reg = <0x10000000 0x80000000>;
 	};
 };