Merge "ARM: dts: msm: Add device tree files for scuba QRD ELDO device" (9b68e2e4) · Commits · e / devices / android_kernel_fairphone_FP4

qcom/Makefile

+6 −3

Original line number	Diff line number	Diff line
		@@ -143,17 +143,20 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
		scuba-rumi-overlay.dtbo \
		scuba-idp-overlay.dtbo \
		scuba-idp-usbc-overlay.dtbo \
		scuba-qrd-overlay.dtbo
		scuba-qrd-eldo-overlay.dtbo \
		scuba-qrd-non-eldo-overlay.dtbo

		scuba-rumi-overlay.dtbo-base := scuba.dtb
		scuba-idp-overlay.dtbo-base := scuba.dtb
		scuba-qrd-overlay.dtbo-base := scuba.dtb
		scuba-qrd-eldo-overlay.dtbo-base := scuba.dtb
		scuba-qrd-non-eldo-overlay.dtbo-base := scuba.dtb
		scuba-idp-usbc-overlay.dtbo-base := scuba.dtb
		else
		dtb-$(CONFIG_ARCH_SCUBA) += scuba-rumi.dtb \
		scuba-idp.dtb \
		scuba-idp-usbc.dtb \
		scuba-qrd.dtb
		scuba-qrd-eldo.dtb \
		scuba-qrd-non-eldo.dtb
		endif

		always := $(dtb-y)

0 → 100644

+12 −0

Original line number	Diff line number	Diff line
		/dts-v1/;
		/plugin/;

		#include <dt-bindings/interrupt-controller/arm-gic.h>
		#include "scuba-qrd-eldo.dtsi"

		/ {
		model = "Qualcomm Technologies, Inc. Scuba QRD ELDO";
		compatible = "qcom,scuba-qrd", "qcom,scuba", "qcom,qrd";
		qcom,msm-id = <441 0x10000>;
		qcom,board-id = <0x2000B 0>;
		};

0 → 100644

+10 −0

Original line number	Diff line number	Diff line
		/dts-v1/;

		#include "scuba.dtsi"
		#include "scuba-qrd-eldo.dtsi"

		/ {
		model = "Qualcomm Technologies, Inc. Scuba QRD ELDO";
		compatible = "qcom,scuba-qrd", "qcom,scuba", "qcom,qrd";
		qcom,board-id = <0x2000B 0>;
		};

0 → 100644

+1 −0

Original line number	Diff line number	Diff line
		#include "scuba-qrd.dtsi"

+1 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@
		#include "scuba-qrd.dtsi"

		/ {
		model = "Qualcomm Technologies, Inc. Scuba QRD";
		model = "Qualcomm Technologies, Inc. Scuba QRD NON ELDO";
		compatible = "qcom,scuba-qrd", "qcom,scuba", "qcom,qrd";
		qcom,msm-id = <441 0x10000>;
		qcom,board-id = <0x1000B 0>;