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

Commit 77d1acf4 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 8b5ea8a7 on remote branch 

Change-Id: Ida87a6043c53b21310767a92fd6754137e7b4dac
parents bdd4c42f 8b5ea8a7

bindings/clock/qcom,rpmcc.txt

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ Required properties : 
			"qcom,rpmcc-apq8064", "qcom,rpmcc"

			"qcom,rpmcc-msm8996", "qcom,rpmcc"

			"qcom,rpmcc-bengal", "qcom,rpmcc"

			"qcom,rpmcc-scuba", "qcom,rpmcc"



- #clock-cells : shall contain 1

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

+7 −0
Original line number Diff line number Diff line
@@ -364,6 +364,13 @@ Charger specific properties: 
  Definition: Specifies the step size of each step of FCC stepper algorithm.

		If left unspecified, the default value is 100mA.



- qcom,hvdcp2-max-icl-ua

  Usage:      optional

  Value type: <u32>

  Definition: Specifies the maximum input current limit that can be configured

		for HVDCP2 adapter.

		If left unspecified, the default value is 3000mA.



- qcom,hvdcp3-max-icl-ua

  Usage:      optional

  Value type: <u32>

qcom/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
                kona-cdp-lcd-overlay.dtbo \

                kona-mtp-overlay.dtbo \

                kona-mtp-ws-overlay.dtbo \

                kona-xr-overlay.dtbo \

                kona-rumi-overlay.dtbo \

                kona-qrd-overlay.dtbo \

                kona-hdk-overlay.dtbo
@@ -12,6 +13,7 @@ kona-cdp-overlay.dtbo-base := kona.dtb kona-v2.dtb kona-v2.1.dtb 
kona-cdp-lcd-overlay.dtbo-base := kona.dtb kona-v2.dtb kona-v2.1.dtb

kona-mtp-overlay.dtbo-base := kona.dtb kona-v2.dtb kona-v2.1.dtb

kona-mtp-ws-overlay.dtbo-base := kona.dtb kona-v2.dtb kona-v2.1.dtb

kona-xr-overlay.dtbo-base := kona.dtb kona-v2.dtb kona-v2.1.dtb

kona-rumi-overlay.dtbo-base := kona.dtb kona-v2.dtb kona-v2.1.dtb

kona-qrd-overlay.dtbo-base := kona.dtb kona-v2.dtb kona-v2.1.dtb

kona-hdk-overlay.dtbo-base := kona.dtb kona-v2.dtb kona-v2.1.dtb
@@ -19,6 +21,7 @@ else 
dtb-$(CONFIG_ARCH_KONA) += kona-rumi.dtb \

        kona-mtp.dtb \

        kona-mtp-ws.dtb \

        kona-xr.dtb \

        kona-cdp.dtb \

        kona-cdp-lcd.dtb \

        kona-qrd.dtb \

qcom/bengal-coresight.dtsi

+25 −2
Original line number Diff line number Diff line
@@ -113,6 +113,20 @@ 
		};

	};



	modem_rfxe: modem_rfxe {

		compatible = "qcom,coresight-dummy";



		coresight-name = "coresight-modem-rfxe";

		qcom,dummy-source;



		port {

			modem_rxfe_out_funnel_in1: endpoint {

				remote-endpoint =

				<&funnel_in1_in_modem_rxfe>;

			};

		};

	};



	audio_etm0: audio_etm0 {

		compatible = "qcom,coresight-remote-etm";

		coresight-name = "coresight-audio-etm0";
@@ -1162,6 +1176,15 @@ 
			};



			port@2 {

				reg = <2>;

				funnel_in1_in_modem_rxfe: endpoint {

					slave-mode;

					remote-endpoint =

					<&modem_rxfe_out_funnel_in1>;

				};

			};



			port@3 {

				reg = <3>;

				funnel_in1_in_tpdm_wcss_silver: endpoint {

					slave-mode;
@@ -1170,7 +1193,7 @@ 
				};

			};



			port@3 {

			port@4 {

				reg = <4>;

				funnel_in1_in_modem_etm0: endpoint {

					slave-mode;
@@ -1179,7 +1202,7 @@ 
				};

			};



			port@4 {

			port@5 {

				reg = <6>;

				funnel_in1_in_funnel_apss1: endpoint {

					slave-mode;

qcom/bengal-idp.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ 
	qcom,suspend-input-on-debug-batt;

	qcom,sw-jeita-enable;

	qcom,step-charging-enable;

	qcom,hvdcp2-max-icl-ua = <2000000>;

	/* SMB1355 only */

	qcom,sec-charger-config = <2>;

	dpdm-supply = <&qusb_phy0>;