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

Commit 6595cb8f authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: add display support for monaco IDP"

parents 28f0df94 40e3c555
Loading
Loading
Loading
Loading
+11 −0
Original line number Diff line number Diff line
#include "monaco-thermal-overlay.dtsi"

&dsi_rm69090_amoled_cmd {
	qcom,panel-supply-entries = <&dsi_panel_pwr_supply_no_labibb>;
	qcom,platform-reset-gpio = <&pm5100_gpios 2 0>;
	qcom,platform-reset-gpio-always-on;
	qcom,platform-en-gpio = <&pm5100_gpios 1 0>;
};

&sde_dsi {
	qcom,dsi-default-panel = <&dsi_rm69090_amoled_cmd>;
};
+28 −0
Original line number Diff line number Diff line
@@ -999,4 +999,32 @@
			};
		};
	};

	pmx_sde_te {
		sde_te_active: sde_te_active {
			mux {
				pins = "gpio73";
				function = "mdp_vsync";
			};

			config {
				pins = "gpio73";
				drive-strength = <2>;
				bias-pull-down;
			};
		};

		sde_te_suspend: sde_te_suspend {
			mux {
				pins = "gpio73";
				function = "mdp_vsync";
			};

			config {
				pins = "gpio73";
				drive-strength = <2>;
				bias-pull-down;
			};
		};
	};
};
+17 −0
Original line number Diff line number Diff line
@@ -259,6 +259,21 @@
			size = <0 0x5c00000>;
		};

		cont_splash_memory: cont_splash_region@5c000000 {
			reg = <0x0 0x5c000000 0x0 0x00f00000>;
			label = "cont_splash_region";
		};

		dfps_data_memory: dfps_data_region@5cf00000 {
			reg = <0x0 0x5cf00000 0x0 0x0100000>;
			label = "dfps_data_region";
		};

		disp_rdump_memory: disp_rdump_region@5c000000 {
			reg = <0x0 0x5c000000 0x0 0x00f00000>;
			label = "disp_rdump_region";
		};

		adsp_mem: adsp_region {
			compatible = "shared-dma-pool";
			alloc-ranges = <0 0x00000000 0 0xffffffff>;
@@ -1490,6 +1505,8 @@
#include "monaco-thermal.dtsi"
#include "monaco-vidc.dtsi"
#include "monaco-gpu.dtsi"
#include "display/monaco-sde.dtsi"
#include "display/monaco-sde-display.dtsi"

&qupv3_se6_2uart {
	status = "ok";
+30 −0
Original line number Diff line number Diff line
@@ -326,3 +326,33 @@
		};
	};
};

&pm5100_gpios {
	pmx_sde: pmx_sde {
		sde_dsi_active: sde_dsi_active {
			mux {
				pins = "gpio1", "gpio2";
				function = "gpio";
			};

			config {
				pins = "gpio1", "gpio2";
				drive-strength = <8>;
				bias-disable = <0>;
			};
		};

		sde_dsi_suspend: sde_dsi_suspend {
			mux {
				pins = "gpio1", "gpio2";
				function = "gpio";
			};

			config {
				pins = "gpio1", "gpio2";
				drive-strength = <2>;
				bias-pull-down;
			};
		};
	};
};