Commit 7a76aad0 authored Mar 15, 2018 by Arnd Bergmann

Merge tag 'imx-dt-4.17' of...

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

parents fed925ea f4be9b77

arch/arm/boot/dts/Makefile

+8 −1

Original line number	Diff line number	Diff line
		@@ -401,6 +401,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
		imx6dl-icore-rqs.dtb \
		imx6dl-nit6xlite.dtb \
		imx6dl-nitrogen6x.dtb \
		imx6dl-phytec-mira-rdk-nand.dtb \
		imx6dl-phytec-pbab01.dtb \
		imx6dl-rex-basic.dtb \
		imx6dl-riotboard.dtb \
		@@ -440,6 +441,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
		imx6q-dfi-fs700-m60.dtb \
		imx6q-display5-tianma-tm070-1280x768.dtb \
		imx6q-dmo-edmqmx6.dtb \
		imx6q-dms-ba16.dtb \
		imx6q-evi.dtb \
		imx6q-gk802.dtb \
		imx6q-gw51xx.dtb \
		@@ -470,6 +472,8 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
		imx6q-nitrogen6_max.dtb \
		imx6q-nitrogen6_som2.dtb \
		imx6q-novena.dtb \
		imx6q-phytec-mira-rdk-emmc.dtb \
		imx6q-phytec-mira-rdk-nand.dtb \
		imx6q-phytec-pbab01.dtb \
		imx6q-pistachio.dtb \
		imx6q-rex-pro.dtb \
		@@ -499,6 +503,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
		imx6q-zii-rdu2.dtb \
		imx6qp-nitrogen6_max.dtb \
		imx6qp-nitrogen6_som2.dtb \
		imx6qp-phytec-mira-rdk-nand.dtb \
		imx6qp-sabreauto.dtb \
		imx6qp-sabresd.dtb \
		imx6qp-tx6qp-8037.dtb \
		@@ -531,7 +536,9 @@ dtb-$(CONFIG_SOC_IMX6UL) += \
		imx6ul-tx6ul-0010.dtb \
		imx6ul-tx6ul-0011.dtb \
		imx6ul-tx6ul-mainboard.dtb \
		imx6ull-14x14-evk.dtb
		imx6ull-14x14-evk.dtb \
		imx6ull-colibri-eval-v3.dtb \
		imx6ull-colibri-wifi-eval-v3.dtb
		dtb-$(CONFIG_SOC_IMX7D) += \
		imx7d-cl-som-imx7.dtb \
		imx7d-colibri-emmc-eval-v3.dtb \

arch/arm/boot/dts/imx1-ads.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@
		stdout-path = &uart1;
		};

		memory {
		memory@8000000 {
		reg = <0x08000000 0x04000000>;
		};

arch/arm/boot/dts/imx1-apf9328.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@
		stdout-path = &uart1;
		};

		memory {
		memory@8000000 {
		reg = <0x08000000 0x00800000>;
		};
		};

arch/arm/boot/dts/imx1.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@
		* Also for U-Boot there must be a pre-existing /memory node.
		*/
		chosen {};
		memory { device_type = "memory"; reg = <0 0>; };
		memory { device_type = "memory"; };

		aliases {
		gpio0 = &gpio1;

arch/arm/boot/dts/imx23-evk.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@
		model = "Freescale i.MX23 Evaluation Kit";
		compatible = "fsl,imx23-evk", "fsl,imx23";

		memory {
		memory@40000000 {
		reg = <0x40000000 0x08000000>;
		};