Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac4af82b authored by Lucas Stach's avatar Lucas Stach Committed by Shawn Guo
Browse files

ARM: dts: imx6qdl: move HDMI controller to right location in DT 



Currently the HDMI controller is a child device of the AIPS bus in the
DT which is clearly wrong. Move it to the right location.
This introduces no functional change it just aligns the DT representation
with reality.

Signed-off-by: default avatarLucas Stach <l.stach@pengutronix.de>
Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
parent 0ed4668a

arch/arm/boot/dts/imx6qdl.dtsi

+28 −28
Original line number Diff line number Diff line
@@ -119,6 +119,34 @@ 
			status = "disabled";

		};



		hdmi: hdmi@0120000 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0x00120000 0x9000>;

			interrupts = <0 115 0x04>;

			gpr = <&gpr>;

			clocks = <&clks IMX6QDL_CLK_HDMI_IAHB>,

				 <&clks IMX6QDL_CLK_HDMI_ISFR>;

			clock-names = "iahb", "isfr";

			status = "disabled";



			port@0 {

				reg = <0>;



				hdmi_mux_0: endpoint {

					remote-endpoint = <&ipu1_di0_hdmi>;

				};

			};



			port@1 {

				reg = <1>;



				hdmi_mux_1: endpoint {

					remote-endpoint = <&ipu1_di1_hdmi>;

				};

			};

		};



		timer@00a00600 {

			compatible = "arm,cortex-a9-twd-timer";

			reg = <0x00a00600 0x20>;
@@ -778,34 +806,6 @@ 
				};

			};



			hdmi: hdmi@0120000 {

				#address-cells = <1>;

				#size-cells = <0>;

				reg = <0x00120000 0x9000>;

				interrupts = <0 115 0x04>;

				gpr = <&gpr>;

				clocks = <&clks IMX6QDL_CLK_HDMI_IAHB>,

					 <&clks IMX6QDL_CLK_HDMI_ISFR>;

				clock-names = "iahb", "isfr";

				status = "disabled";



				port@0 {

					reg = <0>;



					hdmi_mux_0: endpoint {

						remote-endpoint = <&ipu1_di0_hdmi>;

					};

				};



				port@1 {

					reg = <1>;



					hdmi_mux_1: endpoint {

						remote-endpoint = <&ipu1_di1_hdmi>;

					};

				};

			};



			dcic1: dcic@020e4000 {

				reg = <0x020e4000 0x4000>;

				interrupts = <0 124 IRQ_TYPE_LEVEL_HIGH>;