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

Commit 290156ed authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 7aa544aa on remote branch 

Change-Id: I37f5be34dcdbfa8af8bb0a9dbf9d5abbb90bf21a
parents 2b0e1087 7aa544aa

bindings/arm/msm/msm.txt

+4 −0
Original line number Diff line number Diff line
@@ -59,6 +59,9 @@ SoCs: 
- BENGAL

  compatible = "qcom,bengal"



- KHAJE

  compatible = "qcom,khaje"



- SCUBA

  compatible = "qcom,scuba"
@@ -247,6 +250,7 @@ compatible = "qcom,bengal-qrd" 
compatible = "qcom,bengal-idp"

compatible = "qcom,bengalp"

compatible = "qcom,bengalp-idp"

compatible = "qcom,khaje-idp"

compatible = "qcom,scuba-rumi"

compatible = "qcom,scuba-idp"

compatible = "qcom,scuba-qrd"

bindings/leds/leds-qpnp-flash-v2.txt

+6 −0
Original line number Diff line number Diff line
@@ -22,6 +22,12 @@ Optional properties: 
			  128, 192. Unit is uS.

- qcom,warmup-delay-us	: Integer type to specify warm up delay. Valid values are 32, 64,

			  128, 192. Unit is uS.

- qcom,ramp-up-step	: Integer property to specify flash current ramp up time

			  step. Unit is in nS. Allowed values are: 200, 400, 800, 1600,

			  3200, 6400, 12800, 25600.

- qcom,ramp-down-step	: Integer property to specify flash current ramp down

			  time step. Unit is in nS. Allowed values are: 200, 400, 800, 1600,

			  3200, 6400, 12800, 25600.

- qcom,short-circuit-det	: Boolean property which enables short circuit fault detection.

- qcom,open-circuit-det		: Boolean property which enables open circuit fault detection.

- qcom,vph-droop-det		: Boolean property which enables VPH droop detection.

qcom/Makefile

+12 −0
Original line number Diff line number Diff line
@@ -228,6 +228,18 @@ dtb-$(CONFIG_ARCH_SCUBA) += scuba-rumi.dtb \ 
	scuba-iot-idp-usbc-2gb.dtb

endif



ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

        dtbo-$(CONFIG_ARCH_KHAJE) += \

		khaje-idp-overlay.dtbo \

		khaje-idp-nopmi-overlay.dtbo



khaje-idp-overlay.dtbo-base := khaje.dtb

khaje-idp-nopmi-overlay.dtbo-base := khaje.dtb

else

dtb-$(CONFIG_ARCH_KHAJE) += khaje-idp.dtb \

		khaje-idp-nopmi.dtb

endif



ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

        dtbo-$(CONFIG_ARCH_SDM660) += \

                sdm660-mtp-external-codec-overlay.dtbo \

qcom/khaje-idp-nopmi-overlay.dts

0 → 100644
+13 −0
Original line number Diff line number Diff line 
/dts-v1/;

/plugin/;



#include <dt-bindings/interrupt-controller/arm-gic.h>

#include "khaje-idp-nopmi.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. KHAJE IDP nopmi";

	compatible = "qcom,khaje-idp", "qcom,khaje", "qcom,idp";

	qcom,msm-id = <518 0x10000>;

	qcom,board-id = <34 0>;

	qcom,pmic-id = <0x2D 0x0 0x0 0x0>;

};

qcom/khaje-idp-nopmi.dts

0 → 100644
+11 −0
Original line number Diff line number Diff line 
/dts-v1/;



#include "khaje.dtsi"

#include "khaje-idp-nopmi.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. KHAJE IDP nopmi";

	compatible = "qcom,khaje-idp", "qcom,khaje", "qcom,idp";

	qcom,board-id = <34 0>;

	qcom,pmic-id = <0x2D 0x0 0x0 0x0>;

};