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

Commit 21fc906a authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 5054306d on remote branch 

Change-Id: I912d0d05bfb049554aac507b8db602c8a0b69a7c
parents c49e11c7 5054306d

bindings/interrupt-controller/qcom,pdc.txt

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ Properties: 
	Value type: <string>

	Definition: Should contain "qcom,<soc>-pdc"

		    - "qcom,sdm845-pdc": For SDM845

		    - "qcom,lagoon-pdc": For Lagoon



- reg:

	Usage: required

bindings/power/supply/qcom/qpnp-smb5.txt

+8 −0
Original line number Diff line number Diff line
@@ -178,6 +178,14 @@ Charger specific properties: 
  Definition: Boolean flag which when present enables input suspend for

		debug battery.



- qcom,fake-chg-status-on-debug-batt

  Usage:      optional

  Value type: <empty>

  Definition: Boolean flag which when present shows charging status as

		unknown for debug battery. This needs to be specified only if

		the device needs to be kept powered on always with

		"svc power stayon true".



- qcom,min-freq-khz

  Usage:      optional

  Value type: <u32>

qcom/bengal-audio-overlay.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -89,8 +89,8 @@ 
			qcom,mipi-sdw-block-packing-mode = <1>;

			swrm-io-base = <0xa740000 0x0>;

			interrupts =

				<&intc GIC_SPI 296 IRQ_TYPE_LEVEL_HIGH>,

				<&intc GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>;

				<0 296 IRQ_TYPE_LEVEL_HIGH>,

				<0 79 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "swr_master_irq", "swr_wake_irq";

			qcom,swr-wakeup-required = <1>;

			qcom,swr-num-ports = <3>;

qcom/bengal-idp.dtsi

+30 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include "bengal-audio-overlay.dtsi"

#include "bengal-thermal-overlay.dtsi"

#include "bengal-sde-display.dtsi"

#include "camera/bengal-camera-sensor-idp.dtsi"



&soc {

	mtp_batterydata: qcom,battery-data {
@@ -212,3 +213,32 @@ 
&sde_dsi {

	qcom,dsi-default-panel = <&dsi_td4330_truly_v2_video>;

};



&qupv3_se2_i2c {

	status = "okay";

	qcom,i2c-touch-active="synaptics,tcm-i2c";



	synaptics_tcm@20 {

		compatible = "synaptics,tcm-i2c";

		reg = <0x20>;

		interrupt-parent = <&tlmm>;

		interrupts = <80 0x2008>;

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

			"pmx_ts_release";

		pinctrl-0 = <&ts_int_active &ts_reset_active>;

		pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;

		pinctrl-2 = <&ts_release>;

		synaptics,irq-gpio = <&tlmm 80 0x2008>;

		synaptics,irq-on-state = <0>;

		synaptics,reset-gpio = <&tlmm 71 0x00>;

		synaptics,reset-on-state = <0>;

		synaptics,reset-active-ms = <20>;

		synaptics,reset-delay-ms = <200>;

		synaptics,power-delay-ms = <200>;

		synaptics,ubl-i2c-addr = <0x20>;

		synaptics,extend_report;

		synaptics,firmware-name = "synaptics_firmware_k.img";



		panel = <&dsi_td4330_truly_v2_video &dsi_td4330_truly_v2_cmd>;

	};

};

qcom/bengal-pinctrl.dtsi

+75 −0
Original line number Diff line number Diff line
@@ -947,5 +947,80 @@ 
				};

			};

		};



		pmx_ts_int_active {

			ts_int_active: ts_int_active {

				mux {

					pins = "gpio80";

					function = "gpio";

				};



				config {

					pins = "gpio80";

					drive-strength = <8>;

					bias-pull-up;

				};

			};

		};



		pmx_ts_int_suspend {

			ts_int_suspend: ts_int_suspend {

				mux {

					pins = "gpio80";

					function = "gpio";

				};



				config {

					pins = "gpio80";

					drive-strength = <2>;

					bias-pull-down;

				};

			};

		};



		pmx_ts_reset_active {

			ts_reset_active: ts_reset_active {

				mux {

					pins = "gpio71";

					function = "gpio";

				};



				config {

					pins = "gpio71";

					drive-strength = <8>;

					bias-pull-up;

				};

			};

		};



		pmx_ts_reset_suspend {

			ts_reset_suspend: ts_reset_suspend {

				mux {

					pins = "gpio71";

					function = "gpio";

				};



				config {

					pins = "gpio71";

					drive-strength = <2>;

					bias-pull-down;

				};

			};

		};



		pmx_ts_release {

			ts_release: ts_release {

				mux {

					pins = "gpio80", "gpio71";

					function = "gpio";

				};



				config {

					pins = "gpio80", "gpio71";

					drive-strength = <2>;

					bias-pull-down;

				};

			};

		};

	};

};