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

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

Merge "ARM: dts: msm: Move qbt_handler to soc"

parents 78d6cd5f 53a6ca4d

qcom/lahaina-cdp.dtsi

+6 −5
Original line number Diff line number Diff line
@@ -33,6 +33,12 @@ 
		};

	};



	qcom,qbt_handler {

		compatible = "qcom,qbt-handler";

		qcom,ipc-gpio = <&tlmm 38 0>;

		qcom,finger-detect-gpio = <&tlmm 39 0>;

	};



	extcon_usb1: extcon_usb1 {

		compatible = "linux,extcon-usb-gpio";

		vbus-gpio =  <&pm8350_gpios 9 GPIO_ACTIVE_HIGH>;
@@ -70,11 +76,6 @@ 
		panel = <&dsi_sw43404_amoled_cmd &dsi_sw43404_amoled_video

			 &dsi_sw43404_amoled_fhd_plus_cmd>;

	};

	qcom,qbt_handler {

		compatible = "qcom,qbt-handler";

		qcom,ipc-gpio = <&tlmm 38 0>;

		qcom,finger-detect-gpio = <&tlmm 39 0>;

	};



	focaltech@38 {

		compatible = "focaltech,fts_ts";

qcom/lahaina-mtp.dtsi

+6 −5
Original line number Diff line number Diff line
@@ -33,6 +33,12 @@ 
		};

	};



	qcom,qbt_handler {

		compatible = "qcom,qbt-handler";

		qcom,ipc-gpio = <&tlmm 38 0>;

		qcom,finger-detect-gpio = <&tlmm 39 0>;

	};



	extcon_usb1: extcon_usb1 {

		compatible = "linux,extcon-usb-gpio";

		vbus-gpio =  <&pm8350_gpios 9 GPIO_ACTIVE_HIGH>;
@@ -72,11 +78,6 @@ 
		panel = <&dsi_sw43404_amoled_cmd &dsi_sw43404_amoled_video

			 &dsi_sw43404_amoled_fhd_plus_cmd>;

	};

	qcom,qbt_handler {

		compatible = "qcom,qbt-handler";

		qcom,ipc-gpio = <&tlmm 38 0>;

		qcom,finger-detect-gpio = <&tlmm 39 0>;

	};

};



&i3c3 {