Unverified Commit df514c11 authored by AngeloGioacchino Del Regno's avatar AngeloGioacchino Del Regno
Browse files

arm64: mediatek: mt8195-cherry: Add graph for eDP and DP displays 

The base SoC devicetree now defines a display controller graph:
connect the board specific outputs (eDP internal display, DP
external display) to fully migrate Cherry and make it finally
possible to make Chromebooks and other board types to coexist
without per-board driver modifications.

Link: https://lore.kernel.org/r/20250213112008.56394-3-angelogioacchino.delregno@collabora.com


Signed-off-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
parent 681c8ba5

arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi

+177 −7
Original line number Diff line number Diff line
@@ -297,25 +297,84 @@ &cpu7 { 
	cpu-supply = <&mt6315_6_vbuck1>;

};



&dither0_out {

	remote-endpoint = <&dsc0_in>;

};



&dp_intf0 {

	status = "okay";



	port {

	ports {

		#address-cells = <1>;

		#size-cells = <0>;



		port@0 {

			reg = <0>;

			dp_intf0_in: endpoint {

				remote-endpoint = <&merge0_out>;

			};

		};



		port@1 {

			reg = <1>;

			dp_intf0_out: endpoint {

				remote-endpoint = <&edp_in>;

			};

		};

	};

};



&dp_intf1 {

	status = "okay";



	port {

		dp_intf1_out: endpoint {

	ports {

		#address-cells = <1>;

		#size-cells = <0>;



		port@0 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0>;



			dp_intf1_in: endpoint@1 {

				reg = <1>;

				remote-endpoint = <&merge5_out>;

			};

		};



		port@1 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <1>;



			dp_intf1_out: endpoint@1 {

				reg = <1>;

				remote-endpoint = <&dptx_in>;

			};

		};

	};

};



&dsc0 {

	ports {

		#address-cells = <1>;

		#size-cells = <0>;



		port@0 {

			reg = <0>;

			dsc0_in: endpoint {

				remote-endpoint = <&dither0_out>;

			};

		};



		port@1 {

			reg = <1>;

			dsc0_out: endpoint {

				remote-endpoint = <&merge0_in>;

			};

		};

	};

};



&edp_tx {

	status = "okay";
@@ -357,6 +416,35 @@ panel_in: endpoint { 
	};

};



&ethdr0 {

	ports {

		#address-cells = <1>;

		#size-cells = <0>;



		port@0 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0>;



			ethdr0_in: endpoint@1 {

				reg = <1>;

				remote-endpoint = <&vdosys1_ep_ext>;

			};

		};



		port@1 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <1>;



			ethdr0_out: endpoint@1 {

				reg = <1>;

				remote-endpoint = <&merge5_in>;

			};

		};

	};

};



&disp_pwm0 {

	status = "okay";
@@ -376,8 +464,12 @@ ports { 
		#size-cells = <0>;



		port@0 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0>;

			dptx_in: endpoint {



			dptx_in: endpoint@1 {

				reg = <1>;

				remote-endpoint = <&dp_intf1_out>;

			};

		};
@@ -511,6 +603,56 @@ pmic@34 { 
	};

};



&merge0 {

	ports {

		#address-cells = <1>;

		#size-cells = <0>;



		port@0 {

			reg = <0>;

			merge0_in: endpoint {

				remote-endpoint = <&dsc0_out>;

			};

		};



		port@1 {

			reg = <1>;

			merge0_out: endpoint {

				remote-endpoint = <&dp_intf0_in>;

			};

		};

	};

};



&merge5 {

	ports {

		#address-cells = <1>;

		#size-cells = <0>;



		port@0 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0>;



			merge5_in: endpoint@1 {

				reg = <1>;

				remote-endpoint = <&ethdr0_out>;

			};

		};



		port@1 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <1>;



			merge5_out: endpoint@1 {

				reg = <1>;

				remote-endpoint = <&dp_intf1_in>;

			};

		};

	};

};



&mfg0 {

	domain-supply = <&mt6315_7_vbuck1>;

};
@@ -612,6 +754,10 @@ flash@0 { 
	};

};



&ovl0_in {

	remote-endpoint = <&vdosys0_ep_main>;

};



&pcie1 {

	status = "okay";
@@ -1363,6 +1509,18 @@ &uart0 { 
	status = "okay";

};



&vdosys0 {

	port {

		#address-cells = <1>;

		#size-cells = <0>;



		vdosys0_ep_main: endpoint@0 {

			reg = <0>;

			remote-endpoint = <&ovl0_in>;

		};

	};

};



/*

 * For the USB Type-C ports the role and alternate modes switching is

 * done by the EC so we set dr_mode to host to avoid interfering.
@@ -1385,6 +1543,18 @@ &ssusb3 { 
	status = "okay";

};



&vdosys1 {

	port {

		#address-cells = <1>;

		#size-cells = <0>;



		vdosys1_ep_ext: endpoint@1 {

			reg = <1>;

			remote-endpoint = <&ethdr0_in>;

		};

	};

};



&xhci0 {

	status = "okay";