Merge "ARM: dts: msm: Add initial device tree for Shima for IDP/ATP" (61d49887) · Commits · e / devices / android_kernel_fairphone_FP5

bindings/arm/msm/msm.txt

+3 −1

Original line number	Diff line number	Diff line
		@@ -194,11 +194,13 @@ compatible = "qcom,lahaina-mtp"
		compatible = "qcom,lahaina-cdp"
		compatible = "qcom,lahaina-qrd"
		compatible = "qcom,lahaina-qrd-module"
		compatible = "qcom,shima-rumi"
		compatible = "qcom,lahainap-mtp"
		compatible = "qcom,lahainap-cdp"
		compatible = "qcom,lahainap-atp"
		compatible = "qcom,lahainap-qrd"
		compatible = "qcom,shima-rumi"
		compatible = "qcom,shima-idp"
		compatible = "qcom,shima-atp"
		compatible = "qcom,lito-rumi"
		compatible = "qcom,lito-mtp"
		compatible = "qcom,lito-cdp"

+9 −3

Original line number	Diff line number	Diff line
		@@ -61,11 +61,17 @@ endif

		ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
		dtbo-$(CONFIG_ARCH_SHIMA) += \
		shima-rumi-overlay.dtbo
		shima-rumi-overlay.dtbo \
		shima-idp-overlay.dtbo \
		shima-atp-overlay.dtbo

		shima-rumi-overlay.dtbo-base := shima.dtb
		shima-idp-overlay.dtbo-base := shima.dtb
		shima-atp-overlay.dtbo-base := shima.dtb
		else
		dtb-$(CONFIG_ARCH_SHIMA) += shima-rumi.dtb
		dtb-$(CONFIG_ARCH_SHIMA) += shima-rumi.dtb \
		shima-idp.dtb \
		shima-atp.dtb
		endif

		ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

0 → 100644

+11 −0

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

		#include "shima-atp.dtsi"

		/ {
		model = "Qualcomm Technologies, Inc. Shima ATP";
		compatible = "qcom,shima-atp", "qcom,shima", "qcom,atp";
		qcom,msm-id = <450 0x10000>;
		qcom,board-id = <0x10021 0>;
		};

0 → 100644

+10 −0

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

		#include "shima.dtsi"
		#include "shima-atp.dtsi"

		/ {
		model = "Qualcomm Technologies, Inc. Shima ATP";
		compatible = "qcom,shima-atp", "qcom,shima", "qcom,atp";
		qcom,board-id = <0x10021 0>;
		};

0 → 100644

+1 −0

Original line number	Diff line number	Diff line
		#include "shima-idp.dtsi"