Commit 78c47fea authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'imx-dt-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/dt 

i.MX device tree update for 5.6:

 - New board support: i.MX6SL based Tolino Shine 3 eBook reader,
   i.MX7ULP Embedded Artists COM Board, i.MX6Q/DL based Gateworks
   Ventana Boards.
 - A couple of series from Andrey Smirnov to enhance i.MX6 RDU2 and
   VF610 ZII boards.
 - Add revision in board compatible string for imx6sx-sdb-reva and
   imx7d-sdb-reva board.
 - A fixup on imx6sl-tolino-shine3 board to remove incorrect power
   supply assignment.
 - Set initial buck regulator modes explicitly for phycore-imx6 board,
   so that a wrong initial mode set by bootloader does not interfere.
 - Add Add LCD support for imx7d-pico board.
 - A couple of patches from Michael Grzeschik to enhance USB Host
   support on i.MX25.
 - A couple of patches from Michael Trimarchi to remove duplicate
   Ethernet PHY reset properties on imx6qdl-icore and switch to
   phy-handle.
 - A couple of changes to add extirq node support on LS1021A SoC and
   make use of it on the LS1021A-TSN board.
 - A few random device additions and improvements on various boards.

* tag 'imx-dt-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (33 commits)
  ARM: dts: imx: Add GW5912 board support
  ARM: dts: imx: Add GW5913 board support
  ARM: dts: imx: Add GW5910 board support
  ARM: dts: imx: Add GW5907 board support
  ARM: dts: imx6ul-14x14-evk: Pass the "broken-cd" property
  ARM: dts: imx6sl-tolino-shine3: Remove incorrect power supply assignment
  ARM: dts: imx7d-pico: Add LCD support
  ARM: dts: imx6qdl-icore: Add fec phy-handle
  ARM: dts: imx6qdl-icore-1.5: Remove duplicate phy reset methods
  ARM: dts: imx7: Unify temp-grade and speed-grade nodes
  ARM: dts: imx6: phycore-som: add pmic onkey device
  ARM: dts: imx51-babbage: Fix the DVI output description
  ARM: dts: imx6qdl-apalis: mux HDMI CEC pin
  ARM: dts: imx6sll: add PXP module
  ARM: dts: colibri-imx6ull: correct wrong pinmuxing and add comments
  ARM: dts: vf610-zii-scu4-aib: Add node for switch watchdog
  ARM: dts: vf610-zii-scu4-aib: Use generic names for DT nodes
  ARM: dts: vf610-zii-dev-rev-b: Drop redundant I2C properties
  ARM: dts: phycore-imx6: set buck regulator modes explicitly
  ARM: dts: imx6: rdu2: Limit USBH1 to Full Speed
  ...

Link: https://lore.kernel.org/r/20200113034006.17430-4-shawnguo@kernel.org


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 485e35e4 9a820b55

arch/arm/boot/dts/Makefile

+10 −0
Original line number Diff line number Diff line
@@ -422,6 +422,10 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6dl-gw560x.dtb \

	imx6dl-gw5903.dtb \

	imx6dl-gw5904.dtb \

	imx6dl-gw5907.dtb \

	imx6dl-gw5910.dtb \

	imx6dl-gw5912.dtb \

	imx6dl-gw5913.dtb \

	imx6dl-hummingboard.dtb \

	imx6dl-hummingboard-emmc-som-v15.dtb \

	imx6dl-hummingboard-som-v15.dtb \
@@ -493,6 +497,10 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6q-gw560x.dtb \

	imx6q-gw5903.dtb \

	imx6q-gw5904.dtb \

	imx6q-gw5907.dtb \

	imx6q-gw5910.dtb \

	imx6q-gw5912.dtb \

	imx6q-gw5913.dtb \

	imx6q-h100.dtb \

	imx6q-hummingboard.dtb \

	imx6q-hummingboard-emmc-som-v15.dtb \
@@ -554,6 +562,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \ 
	imx6qp-zii-rdu2.dtb

dtb-$(CONFIG_SOC_IMX6SL) += \

	imx6sl-evk.dtb \

	imx6sl-tolino-shine3.dtb \

	imx6sl-warp.dtb

dtb-$(CONFIG_SOC_IMX6SLL) += \

	imx6sll-evk.dtb \
@@ -612,6 +621,7 @@ dtb-$(CONFIG_SOC_IMX7D) += \ 
	imx7s-mba7.dtb \

	imx7s-warp.dtb

dtb-$(CONFIG_SOC_IMX7ULP) += \

	imx7ulp-com.dtb \

	imx7ulp-evk.dtb

dtb-$(CONFIG_SOC_LS1021A) += \

	ls1021a-moxa-uc-8410a.dtb \

arch/arm/boot/dts/e60k02.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -48,7 +48,8 @@ on { 
		};

	};



	memory {

	memory@80000000 {

		device_type = "memory";

		reg = <0x80000000 0x20000000>;

	};

arch/arm/boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts

+0 −2
Original line number Diff line number Diff line
@@ -165,8 +165,6 @@ &uart2 { 
};



&usbhost1 {

	phy_type = "serial";

	dr_mode = "host";

	status = "okay";

};

arch/arm/boot/dts/imx25-pdk.dts

+0 −2
Original line number Diff line number Diff line
@@ -304,8 +304,6 @@ &uart1 { 
};



&usbhost1 {

	phy_type = "serial";

	dr_mode = "host";

	status = "okay";

};

arch/arm/boot/dts/imx25.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -570,6 +570,9 @@ usbhost1: usb@53ff4400 { 
				clock-names = "ipg", "ahb", "per";

				fsl,usbmisc = <&usbmisc 1>;

				fsl,usbphy = <&usbphy1>;

				maximum-speed = "full-speed";

				phy_type = "serial";

				dr_mode = "host";

				status = "disabled";

			};