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

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

Merge 6eb3db1f on remote branch 

Change-Id: Id6c5a0bf90e17f4dabdafdc48fbeb34bdfaee592
parents 8b126daf 6eb3db1f

bindings/arm/msm/msm.txt

+12 −0
Original line number Diff line number Diff line
@@ -62,6 +62,12 @@ SoCs: 
- KHAJE

  compatible = "qcom,khaje"



- KHAJEP

  compatible = "qcom,khajep"



- KHAJEQ

  compatible = "qcom,khajeq"



- SCUBA

  compatible = "qcom,scuba"
@@ -253,6 +259,12 @@ compatible = "qcom,bengalp-idp" 
compatible = "qcom,khaje-idp"

compatible = "qcom,khaje-qrd"

compatible = "qcom,khaje-atp"

compatible = "qcom,khajep-idp"

compatible = "qcom,khajep-qrd"

compatible = "qcom,khajeq-idp"

compatible = "qcom,khajeq-qrd"

compatible = "qcom,khajep-atp"

compatible = "qcom,khajeq-atp"

compatible = "qcom,scuba-rumi"

compatible = "qcom,scuba-idp"

compatible = "qcom,scuba-qrd"

qcom/Makefile

+72 −9
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
                kona-xrfusion-overlay.dtbo \

                kona-xrfusion-ult-overlay.dtbo \

                kona-arglass-overlay.dtbo \

                kona-xrsku4-overlay.dtbo \

                kona-hdk-overlay.dtbo



kona-cdp-overlay.dtbo-base := kona.dtb kona-v2.dtb kona-v2.1.dtb
@@ -26,6 +27,7 @@ kona-qrd-overlay.dtbo-base := kona.dtb kona-v2.dtb kona-v2.1.dtb 
kona-xrfusion-overlay.dtbo-base := kona.dtb kona-v2.dtb kona-v2.1.dtb

kona-xrfusion-ult-overlay.dtbo-base := kona.dtb kona-v2.dtb kona-v2.1.dtb

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

kona-xrsku4-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

else

dtb-$(CONFIG_ARCH_KONA) += kona-rumi.dtb \
@@ -36,6 +38,7 @@ dtb-$(CONFIG_ARCH_KONA) += kona-rumi.dtb \ 
        kona-xrfusion.dtb \

        kona-xrfusion-ult.dtb \

        kona-arglass.dtb \

        kona-xrsku4.dtb \

        kona-cdp.dtb \

        kona-cdp-lcd.dtb \

        kona-cdp-lcd-tron.dtb \
@@ -49,6 +52,7 @@ dtb-$(CONFIG_ARCH_KONA) += kona-rumi.dtb \ 
        kona-v2-xrfusion.dtb \

        kona-v2-xrfusion-ult.dtb \

        kona-v2-arglass.dtb \

        kona-v2-xrsku4.dtb \

        kona-hdk.dtb \

        kona-v2.1-mtp.dtb \

        kona-v2.1-mtp-ws.dtb \
@@ -59,6 +63,7 @@ dtb-$(CONFIG_ARCH_KONA) += kona-rumi.dtb \ 
        kona-v2.1-xrfusion.dtb \

        kona-v2.1-xrfusion-ult.dtb \

        kona-v2.1-arglass.dtb \

        kona-v2.1-xrsku4.dtb \

        qrb5165-iot-rb5.dtb \

        qrb5165n-iot-rb5.dtb \

        kona-v2.1-iot-rb5.dtb
@@ -240,27 +245,67 @@ endif 


ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

        dtbo-$(CONFIG_ARCH_KHAJE) += \

		khaje-idp-overlay.dtbo \

		khaje-atp-overlay.dtbo \

		khaje-qrd-overlay.dtbo \

		khaje-qrd-hvdcp3p5-overlay.dtbo \

		khaje-qrd-nowcd9375-overlay.dtbo \

		khaje-qrd-nopmi-overlay.dtbo \

		khaje-idp-overlay.dtbo \

		khaje-idp-nopmi-overlay.dtbo \

		khaje-idp-usbc-overlay.dtbo \

		khaje-idp-pm8010-overlay.dtbo \

		khaje-qrd-nopmi-overlay.dtbo \

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

		khaje-atp-overlay.dtbo

		khajep-atp-overlay.dtbo \

		khajep-qrd-overlay.dtbo \

		khajep-qrd-hvdcp3p5-overlay.dtbo \

		khajep-qrd-nowcd9375-overlay.dtbo \

		khajep-qrd-nopmi-overlay.dtbo \

		khajep-idp-overlay.dtbo \

		khajep-idp-nopmi-overlay.dtbo \

		khajep-idp-usbc-overlay.dtbo \

		khajep-idp-pm8010-overlay.dtbo \

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

		khajeq-atp-overlay.dtbo \

		khajeq-qrd-overlay.dtbo \

		khajeq-qrd-hvdcp3p5-overlay.dtbo \

		khajeq-qrd-nowcd9375-overlay.dtbo \

		khajeq-qrd-nopmi-overlay.dtbo \

		khajeq-idp-overlay.dtbo \

		khajeq-idp-nopmi-overlay.dtbo \

		khajeq-idp-usbc-overlay.dtbo \

		khajeq-idp-pm8010-overlay.dtbo \

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



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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

else

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

		khaje-qrd.dtb \
@@ -271,7 +316,25 @@ dtb-$(CONFIG_ARCH_KHAJE) += khaje-idp.dtb \ 
		khaje-idp-pm8010.dtb \

		khaje-qrd-nopmi.dtb \

		khaje-idps-display-90hz.dtb \

		khaje-atp.dtb

		khaje-atp.dtb \

		khajep-atp.dtb \

		khajep-qrd.dtb \

		khajep-qrd-hvdcp3p5.dtb \

		khajep-idps-display-90hz.dtb \

		khajep-idp-nopmi.dtb \

		khajep-idp-usbc.dtb \

		khajep-idp-pm8010.dtb \

		khajep-qrd-nowcd9375.dtb \

		khajep-qrd-nopmi.dtb \

		khajeq-atp.dtb \

		khajeq-idps-display-90hz.dtb \

		khajeq-idp-nopmi.dtb \

		khajeq-idp-usbc.dtb \

		khajeq-idp-pm8010.dtb \

		khajeq-qrd.dtb \

		khajeq-qrd-nowcd9375.dtb \

		khajeq-qrd-hvdcp3p5.dtb \

		khajeq-qrd-nopmi.dtb

endif



ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

qcom/khajep-atp-overlay.dts

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

/plugin/;



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

#include "khajep-atp.dtsi"



/ {

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

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

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

	qcom,board-id = <33 0>;

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

};

qcom/khajep-atp.dts

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



#include "khajep.dtsi"

#include "khajep-atp.dtsi"



/ {

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

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

	qcom,board-id = <33 0>;

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

};

qcom/khajep-atp.dtsi

0 → 100644
+1 −0
Original line number Diff line number Diff line 
#include "khaje-atp.dtsi"