Merge "ARM: dts: msm: add touch support of lcd panel for Blair target" (fc92a98f) · Commits · e / devices / android_kernel_fairphone_FP5

qcom/blair-cdp.dtsi

+34 −0

Original line number	Diff line number	Diff line
		#include "holi-cdp-pm6125.dtsi"
		#include "display/blair-sde-display-cdp.dtsi"
		/ {
		};

		@@ -6,3 +7,36 @@
		compatible = "qcom,ufs-phy-qmp-v4-yupik";
		vdda-phy-max-microamp = <85700>;
		};

		&pm6125_pwm {
		status = "ok";
		};

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

		status = "ok";

		novatek@62 {
		compatible = "novatek,NVT-ts";
		reg = <0x62>;

		interrupt-parent = <&tlmm>;
		interrupts = <22 0x2008>;

		pinctrl-names = "pmx_ts_active","pmx_ts_suspend",
		"pmx_ts_release";

		pinctrl-0 = <&ts_active>;
		pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;
		pinctrl-2 = <&pmx_ts_release>;

		novatek,reset-gpio = <&tlmm 21 0x00>;
		novatek,irq-gpio = <&tlmm 22 0x2008>;

		panel = <&dsi_nt36672e_fhd_plus_60_video
		&dsi_nt36672e_fhd_plus_120_video
		&dsi_nt36672e_fhd_plus_144_video>;
		};
		};

+1 −0

Original line number	Diff line number	Diff line
		#include "holi-mtp-pm6125.dtsi"
		#include "display/blair-sde-display-mtp.dtsi"
		/ {
		};

+1 −6

Original line number	Diff line number	Diff line
		@@ -3354,7 +3354,7 @@
		#include "camera/holi-camera.dtsi"
		#include "holi-thermal.dtsi"
		#include "holi-qupv3.dtsi"
		#include "display/holi-sde.dtsi"
		#include "display/blair-sde.dtsi"
		#include "holi-audio.dtsi"
		#include "blair-usb.dtsi"
		#include "ipcc-test-holi.dtsi"
		@@ -3376,11 +3376,6 @@
		regulator-max-microvolt = <3544000>;
		};

		/* Dummy LDO handle*/
		&mdss_dsi_phy0 {
		vdda-0p9-supply = <&L2A>;
		};

		&gcc_camss_top_gdsc {
		status = "ok";
		};