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

Commit 6d454fe4 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add initial device tree support for two QRD khaje SKUs"

parents 0adb6c6a 35e335b4
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -237,6 +237,8 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
        dtbo-$(CONFIG_ARCH_KHAJE) += \
		khaje-idp-overlay.dtbo \
		khaje-qrd-overlay.dtbo \
		khaje-qrd-hvdcp3p5-overlay.dtbo \
		khaje-qrd-wcd9368-overlay.dtbo \
		khaje-idp-nopmi-overlay.dtbo \
		khaje-qrd-nopmi-overlay.dtbo \
		khaje-idps-display-90hz-overlay.dtbo \
@@ -244,6 +246,8 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

khaje-idp-overlay.dtbo-base := khaje.dtb
khaje-qrd-overlay.dtbo-base := khaje.dtb
khaje-qrd-hvdcp3p5-overlay.dtbo-base := khaje.dtb
khaje-qrd-wcd9368-overlay.dtbo-base := khaje.dtb
khaje-idp-nopmi-overlay.dtbo-base := khaje.dtb
khaje-qrd-nopmi-overlay.dtbo-base := khaje.dtb
khaje-idps-display-90hz-overlay.dtbo-base := khaje.dtb
@@ -251,6 +255,8 @@ khaje-atp-overlay.dtbo-base := khaje.dtb
else
dtb-$(CONFIG_ARCH_KHAJE) += khaje-idp.dtb \
		khaje-qrd.dtb \
		khaje-qrd-hvdcp3p5.dtb \
		khaje-qrd-wcd9368.dtb \
		khaje-idp-nopmi.dtb \
		khaje-qrd-nopmi.dtb \
		khaje-idps-display-90hz.dtb \
+14 −0
Original line number Diff line number Diff line
/dts-v1/;
/plugin/;

#include <dt-bindings/interrupt-controller/arm-gic.h>
#include "khaje-qrd-hvdcp3p5.dtsi"
#include "khaje-qrd-pm7250b.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. Khaje QRD HVDCP3P5";
	compatible = "qcom,khaje-qrd", "qcom,khaje", "qcom,qrd";
	qcom,msm-id = <518 0x10000>;
	qcom,board-id = <0x1010B 0>;
	qcom,pmic-id = <0x2D 0x2E 0x0 0x0>;
};
+12 −0
Original line number Diff line number Diff line
/dts-v1/;

#include "khaje.dtsi"
#include "khaje-qrd-hvdcp3p5.dtsi"
#include "khaje-qrd-pm7250b.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. KHAJE QRD HVDCP3P5";
	compatible = "qcom,khaje-qrd", "qcom,khaje", "qcom,qrd";
	qcom,board-id = <0x1010B 0>;
	qcom,pmic-id = <0x2D 0x2E 0x0 0x0>;
};
+1 −0
Original line number Diff line number Diff line
#include "khaje-qrd.dtsi"
+14 −0
Original line number Diff line number Diff line
/dts-v1/;
/plugin/;

#include <dt-bindings/interrupt-controller/arm-gic.h>
#include "khaje-qrd-wcd9368.dtsi"
#include "khaje-qrd-pm7250b.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. Khaje QRD WCD9368";
	compatible = "qcom,khaje-qrd", "qcom,khaje", "qcom,qrd";
	qcom,msm-id = <518 0x10000>;
	qcom,board-id = <0x2010B 0>;
	qcom,pmic-id = <0x2D 0x2E 0x0 0x0>;
};
Loading