Merge "ARM: dts: qcom: Add device tree files for lahaina MTP v2.1" (ef617d99) · Commits · e / devices / android_kernel_fairphone_FP5

qcom/Makefile

+6 −2

Original line number	Diff line number	Diff line
		@@ -12,7 +12,8 @@ dtbo-$(CONFIG_ARCH_LAHAINA) += lahaina-rumi-overlay.dtbo \
		lahainap-cdp-overlay.dtbo \
		lahainap-atp-overlay.dtbo \
		lahainap-qrd-overlay.dtbo \
		lahaina-cdp-v2.2-overlay.dtbo
		lahaina-cdp-v2.2-overlay.dtbo \
		lahaina-mtp-v2.1-overlay.dtbo

		lahaina-rumi-overlay.dtbo-base := lahaina.dtb
		lahaina-mtp-hsp-overlay.dtbo-base := lahaina.dtb
		@@ -28,6 +29,8 @@ lahainap-atp-overlay.dtbo-base := lahainap.dtb lahainap-v2.dtb lahainap-v2.1.dtb
		lahainap-qrd-overlay.dtbo-base := lahainap.dtb lahainap-v2.dtb lahainap-v2.1.dtb
		lahaina-cdp-v2.2-overlay.dtbo-base := lahaina.dtb lahaina-v2.dtb \
		lahaina-v2.1.dtb
		lahaina-mtp-v2.1-overlay.dtbo-base := lahaina.dtb lahaina-v2.dtb \
		lahaina-v2.1.dtb
		else
		dtb-$(CONFIG_ARCH_LAHAINA) += lahaina-rumi.dtb \
		lahaina-mtp-hsp.dtb \
		@@ -57,7 +60,8 @@ dtb-$(CONFIG_ARCH_LAHAINA) += lahaina-rumi.dtb \
		lahainap-v2.1-mtp.dtb \
		lahainap-v2.1-cdp.dtb \
		lahainap-v2.1-atp.dtb \
		lahainap-v2.1-qrd.dtb
		lahainap-v2.1-qrd.dtb \
		lahaina-mtp-v2.1.dtb
		endif

		ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

0 → 100644

+10 −0

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

		#include "lahaina-mtp-v2.1.dtsi"

		/ {
		model = "Qualcomm Technologies, Inc. Lahaina MTP v2.1";
		compatible = "qcom,lahaina-mtp", "qcom,lahaina", "qcom,mtp";
		qcom,board-id = <0x20108 0>;
		};

0 → 100644

+10 −0

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

		#include "lahaina-v2.dtsi"
		#include "lahaina-mtp-v2.1.dtsi"

		/ {
		model = "Qualcomm Technologies, Inc. Lahaina MTP v2.1";
		compatible = "qcom,lahaina-mtp", "qcom,lahaina", "qcom,mtp";
		qcom,board-id = <0x20108 0>;
		};

0 → 100644

+1 −0

Original line number	Diff line number	Diff line
		#include "lahaina-mtp.dtsi"