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

Commit 2e1762c3 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v4.8-next-dts64' of https://github.com/mbgg/linux-mediatek into next/dt64 

Pull "ARM: mediatek: dts64 updates for v4.9" from Matthias Brugger:

- add HDMI related nodes to mt8173
- enable the HDMI output on mt8173-evb

* tag 'v4.8-next-dts64' of https://github.com/mbgg/linux-mediatek:
  arm64: dts: mt8173-evb: enable HDMI output
  arm64: dts: mt8173: Add HDMI related nodes
parents 3402a63d 7475e27b

arch/arm64/boot/dts/mediatek/mt8173-evb.dts

+38 −0
Original line number Diff line number Diff line
@@ -42,6 +42,44 @@ 
		gpio = <&pio 130 GPIO_ACTIVE_HIGH>;

		enable-active-high;

	};



	connector {

		compatible = "hdmi-connector";

		label = "hdmi";

		type = "d";



		port {

			hdmi_connector_in: endpoint {

				remote-endpoint = <&hdmi0_out>;

			};

		};

	};

};



&cec {

	status = "okay";

};



&dpi0 {

	status = "okay";

};



&hdmi_phy {

	status = "okay";

};



&hdmi0 {

	status = "okay";



	ports {

		port@1 {

			reg = <1>;



			hdmi0_out: endpoint {

				remote-endpoint = <&hdmi_connector_in>;

			};

		};

	};

};



&i2c1 {

arch/arm64/boot/dts/mediatek/mt8173.dtsi

+77 −0
Original line number Diff line number Diff line
@@ -254,6 +254,16 @@ 
				     <GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>;



			hdmi_pin: xxx {



				/*hdmi htplg pin*/

				pins1 {

					pinmux = <MT8173_PIN_21_HTPLG__FUNC_HTPLG>;

					input-enable;

					bias-pull-down;

				};

			};



			i2c0_pins_a: i2c0 {

				pins1 {

					pinmux = <MT8173_PIN_45_SDA0__FUNC_SDA0>,
@@ -341,6 +351,14 @@ 
			clock-names = "spi", "wrap";

		};



		cec: cec@10013000 {

			compatible = "mediatek,mt8173-cec";

			reg = <0 0x10013000 0 0xbc>;

			interrupts = <GIC_SPI 167 IRQ_TYPE_LEVEL_LOW>;

			clocks = <&infracfg CLK_INFRA_CEC>;

			status = "disabled";

		};



		vpu: vpu@10020000 {

			compatible = "mediatek,mt8173-vpu";

			reg = <0 0x10020000 0 0x30000>,
@@ -383,6 +401,19 @@ 
			#clock-cells = <1>;

		};



		hdmi_phy: hdmi-phy@10209100 {

			compatible = "mediatek,mt8173-hdmi-phy";

			reg = <0 0x10209100 0 0x24>;

			clocks = <&apmixedsys CLK_APMIXED_HDMI_REF>;

			clock-names = "pll_ref";

			clock-output-names = "hdmitx_dig_cts";

			mediatek,ibias = <0xa>;

			mediatek,ibias_up = <0x1c>;

			#clock-cells = <0>;

			#phy-cells = <0>;

			status = "disabled";

		};



		mipi_tx0: mipi-dphy@10215000 {

			compatible = "mediatek,mt8173-mipi-tx";

			reg = <0 0x10215000 0 0x1000>;
@@ -577,6 +608,14 @@ 
			status = "disabled";

		};



		hdmiddc0: i2c@11012000 {

			compatible = "mediatek,mt8173-hdmi-ddc";

			interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_LOW>;

			reg = <0 0x11012000 0 0x1C>;

			clocks = <&pericfg CLK_PERI_I2C5>;

			clock-names = "ddc-i2c";

		};



		i2c6: i2c@11013000 {

			compatible = "mediatek,mt8173-i2c";

			reg = <0 0x11013000 0 0x70>,
@@ -885,6 +924,12 @@ 
				 <&apmixedsys CLK_APMIXED_TVDPLL>;

			clock-names = "pixel", "engine", "pll";

			status = "disabled";



			port {

				dpi0_out: endpoint {

					remote-endpoint = <&hdmi0_in>;

				};

			};

		};



		pwm0: pwm@1401e000 {
@@ -942,6 +987,38 @@ 
			clocks = <&mmsys CLK_MM_DISP_OD>;

		};



		hdmi0: hdmi@14025000 {

			compatible = "mediatek,mt8173-hdmi";

			reg = <0 0x14025000 0 0x400>;

			interrupts = <GIC_SPI 206 IRQ_TYPE_LEVEL_LOW>;

			clocks = <&mmsys CLK_MM_HDMI_PIXEL>,

				 <&mmsys CLK_MM_HDMI_PLLCK>,

				 <&mmsys CLK_MM_HDMI_AUDIO>,

				 <&mmsys CLK_MM_HDMI_SPDIF>;

			clock-names = "pixel", "pll", "bclk", "spdif";

			pinctrl-names = "default";

			pinctrl-0 = <&hdmi_pin>;

			phys = <&hdmi_phy>;

			phy-names = "hdmi";

			mediatek,syscon-hdmi = <&mmsys 0x900>;

			assigned-clocks = <&topckgen CLK_TOP_HDMI_SEL>;

			assigned-clock-parents = <&hdmi_phy>;

			status = "disabled";



			ports {

				#address-cells = <1>;

				#size-cells = <0>;



				port@0 {

					reg = <0>;



					hdmi0_in: endpoint {

						remote-endpoint = <&dpi0_out>;

					};

				};

			};

		};



		larb4: larb@14027000 {

			compatible = "mediatek,mt8173-smi-larb";

			reg = <0 0x14027000 0 0x1000>;