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

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

Merge 36f79702 on remote branch 

Change-Id: Ieb5d885af39a77de0877ce36143302c0789fbce9
parents e3c7b384 36f79702

bindings/arm/msm/msm.txt

+6 −0
Original line number Diff line number Diff line
@@ -68,6 +68,9 @@ SoCs: 
- KHAJEQ

  compatible = "qcom,khajeq"



- KHAJEG

  compatible = "qcom,khajeg"



- SCUBA

  compatible = "qcom,scuba"
@@ -265,6 +268,9 @@ compatible = "qcom,khajeq-idp" 
compatible = "qcom,khajeq-qrd"

compatible = "qcom,khajep-atp"

compatible = "qcom,khajeq-atp"

compatible = "qcom,khajeg-idp"

compatible = "qcom,khajeg-qrd"

compatible = "qcom,khajeg-atp"

compatible = "qcom,scuba-rumi"

compatible = "qcom,scuba-idp"

compatible = "qcom,scuba-qrd"

qcom/Makefile

+32 −2
Original line number Diff line number Diff line
@@ -286,7 +286,17 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
		khajeq-idp-nopmi-overlay.dtbo \

		khajeq-idp-usbc-overlay.dtbo \

		khajeq-idp-pm8010-overlay.dtbo \

		khajeq-idps-display-90hz-overlay.dtbo

		khajeq-idps-display-90hz-overlay.dtbo \

		khajeg-atp-overlay.dtbo \

		khajeg-qrd-overlay.dtbo \

		khajeg-qrd-hvdcp3p5-overlay.dtbo \

		khajeg-qrd-nowcd9375-overlay.dtbo \

		khajeg-qrd-nopmi-overlay.dtbo \

		khajeg-idp-overlay.dtbo \

		khajeg-idp-nopmi-overlay.dtbo \

		khajeg-idp-usbc-overlay.dtbo \

		khajeg-idp-pm8010-overlay.dtbo \

		khajeg-idps-display-90hz-overlay.dtbo



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

khaje-idp-overlay.dtbo-base := khaje.dtb
@@ -318,6 +328,16 @@ khajeq-idp-overlay.dtbo-base := khajeq.dtb 
khajeq-idp-nopmi-overlay.dtbo-base := khajeq.dtb

khajeq-idp-pm8010-overlay.dtbo-base := khajeq.dtb

khajeq-idp-usbc-overlay.dtbo-base := khajeq.dtb

khajeg-atp-overlay.dtbo-base := khajeg.dtb

khajeg-qrd-overlay.dtbo-base := khajeg.dtb

khajeg-qrd-hvdcp3p5-overlay.dtbo-base := khajeg.dtb

khajeg-qrd-nowcd9375-overlay.dtbo-base := khajeg.dtb

khajeg-qrd-nopmi-overlay.dtbo-base := khajeg.dtb

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

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

khajeg-idp-pm8010-overlay.dtbo-base := khajeg.dtb

khajeg-idp-usbc-overlay.dtbo-base := khajeg.dtb

khajeg-idps-display-90hz-overlay.dtbo-base := khajeg.dtb

else

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

		khaje-qrd.dtb \
@@ -346,7 +366,17 @@ dtb-$(CONFIG_ARCH_KHAJE) += khaje-idp.dtb \ 
		khajeq-qrd.dtb \

		khajeq-qrd-nowcd9375.dtb \

		khajeq-qrd-hvdcp3p5.dtb \

		khajeq-qrd-nopmi.dtb

		khajeq-qrd-nopmi.dtb \

		khajeg-atp.dtb \

		khajeg-qrd.dtb \

		khajeg-qrd-nowcd9375.dtb \

		khajeg-qrd-hvdcp3p5.dtb \

		khajeg-qrd-nopmi.dtb \

		khajeg-idp.dtb \

		khajeg-idp-nopmi.dtb \

		khajeg-idp-usbc.dtb \

		khajeg-idp-pm8010.dtb \

		khajeg-idps-display-90hz.dtb

endif



ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

qcom/bengal-sde-display.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
		qcom,panel-supply-entry@1 {

			reg = <1>;

			qcom,supply-name = "lab";

			qcom,supply-min-voltage = <4600000>;

			qcom,supply-min-voltage = <5600000>;

			qcom,supply-max-voltage = <6000000>;

			qcom,supply-enable-load = <100000>;

			qcom,supply-disable-load = <100>;
@@ -32,7 +32,7 @@ 
		qcom,panel-supply-entry@2 {

			reg = <2>;

			qcom,supply-name = "ibb";

			qcom,supply-min-voltage = <4600000>;

			qcom,supply-min-voltage = <5600000>;

			qcom,supply-max-voltage = <6000000>;

			qcom,supply-enable-load = <100000>;

			qcom,supply-disable-load = <100>;

qcom/khaje.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -616,7 +616,7 @@ 
		interrupts-extended = <&wakegic GIC_SPI 197

						IRQ_TYPE_EDGE_RISING>;

		reg = <0x45f01b8 0x1000>,

			<0xf011008 0x4>;  /* MSM_APCS_GCC_BASE 4K */

			<0xf111008 0x4>;  /* MSM_APCS_GCC_BASE 4K */

		reg-names = "vmpm", "ipc";

		qcom,num-mpm-irqs = <96>;

		interrupt-controller;

qcom/khajeg-atp-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 "khajeg-atp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. Khajeg ATP";

	compatible = "qcom,khajeg-atp", "qcom,khajeg", "qcom,atp";

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

	qcom,board-id = <33 0>;

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

};