Commit 2e0e77e4 authored Jan 06, 2021 by Laurent Pinchart Committed by Shawn Guo Jan 11, 2021

ARM: dts: imx6q(dl): Move 'port' nodes under 'ports' for HDMI encoder



In preparation for the conversion of the DWC HDMI TX device tree
bindings to YAML, move the HDMI encoder's 'port' nodes under a 'ports'
node. The 'ports' node is optional in the OF graph implementation, but
YAML bindings require it.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

parent f3604ba1

arch/arm/boot/dts/imx6q.dtsi

+11 −9

Original line number	Original line	Diff line number	Diff line
	@@ -406,6 +406,7 @@ ipu2_csi1_mux_to_ipu2_csi1: endpoint {
	&hdmi {		&hdmi {
	compatible = "fsl,imx6q-hdmi";		compatible = "fsl,imx6q-hdmi";

			ports {
	port@2 {		port@2 {
	reg = <2>;		reg = <2>;

	@@ -422,6 +423,7 @@ hdmi_mux_3: endpoint {
	};		};
	};		};
	};		};
			};

	&iomuxc {		&iomuxc {
	compatible = "fsl,imx6q-iomuxc";		compatible = "fsl,imx6q-iomuxc";

arch/arm/boot/dts/imx6qdl.dtsi

+14 −11

Original line number	Original line	Diff line number	Diff line
	@@ -182,8 +182,6 @@ gpmi: nand-controller@112000 {
	};		};

	hdmi: hdmi@120000 {		hdmi: hdmi@120000 {
	#address-cells = <1>;
	#size-cells = <0>;
	reg = <0x00120000 0x9000>;		reg = <0x00120000 0x9000>;
	interrupts = <0 115 0x04>;		interrupts = <0 115 0x04>;
	gpr = <&gpr>;		gpr = <&gpr>;
	@@ -192,6 +190,10 @@ hdmi: hdmi@120000 {
	clock-names = "iahb", "isfr";		clock-names = "iahb", "isfr";
	status = "disabled";		status = "disabled";

			ports {
			#address-cells = <1>;
			#size-cells = <0>;

	port@0 {		port@0 {
	reg = <0>;		reg = <0>;

	@@ -208,6 +210,7 @@ hdmi_mux_1: endpoint {
	};		};
	};		};
	};		};
			};

	gpu_3d: gpu@130000 {		gpu_3d: gpu@130000 {
	compatible = "vivante,gc";		compatible = "vivante,gc";