Merge "ARM: dts: qcom: Add additional board files for sdxpinn"

bindings/arm/msm/msm.txt

@@ -315,8 +315,7 @@ compatible = "qcom,khaje-idp"
 compatible = "qcom,khaje-qrd"
 compatible = "qcom,khaje-atp"
 compatible = "qcom,sdxpinn-rumi"
-compatible = "qcom,sdxpinn-mtp"
-compatible = "qcom,sdxpinn-cdp"
+compatible = "qcom,sdxpinn-idp"
 compatible = "qcom,sa410m-rumi"
 compatible = "qcom,quinvm"
 compatible = "qcom,sdxbaagha-rumi"

qcom/Makefile

@@ -170,10 +170,7 @@ gen4auto-overlays-dtb-$(CONFIG_ARCH_LEMANS) +=  \
 dtb-y += $(gen4auto-dtb-y)
 
 sdxpinn-dtb-$(CONFIG_ARCH_SDXPINN) += sdxpinn-rumi.dtb sa525m-rumi.dtb \
-                 sdxpinn-mtp.dtb \
-                 sdxpinn-cdp.dtb
-
-sdxpinn-dtb-$(CONFIG_ARCH_SDXPINN) += sdxpinn-rumi.dtb sa525m-rumi.dtb
+		sdxpinn-idp-mbb.dtb
 dtb-y += $(sdxpinn-dtb-y)
 
 sa410m_auto-dtb-$(CONFIG_ARCH_SA410M) += \

qcom/sdxpinn-cdp.dts

@@ -1,11 +0,0 @@
-/dts-v1/;
-
-#include "sdxpinn.dtsi"
-#include "sdxpinn-cdp.dtsi"
-
-/ {
-	model = "Qualcomm Technologies, Inc. SDXPINN CDP";
-	compatible = "qcom,sdxpinn-cdp",
-		"qcom,sdxpinn", "qcom,cdp";
-	qcom,board-id = <0x10001 0x0>;
-};

qcom/sdxpinn-idp-mbb.dts

@@ -0,0 +1,11 @@
+/dts-v1/;
+
+#include "sdxpinn.dtsi"
+#include "sdxpinn-idp-mbb.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SDXPINN IDP MBB";
+	compatible = "qcom,sdxpinn-idp",
+		"qcom,sdxpinn", "qcom,idp";
+	qcom,board-id = <34 0>;
+};

qcom/sdxpinn-mtp.dts

@@ -1,11 +0,0 @@
-/dts-v1/;
-
-#include "sdxpinn.dtsi"
-#include "sdxpinn-mtp.dtsi"
-
-/ {
-	model = "Qualcomm Technologies, Inc. SDXPINN MTP";
-	compatible = "qcom,sdxpinn-mtp",
-		"qcom,sdxpinn", "qcom,mtp";
-	qcom,board-id = <0x10008 0x0>;
-};

qcom/sdxpinn-mtp.dtsi

@@ -1,2 +0,0 @@
-&soc {
-};