Merge "ARM: dts: msm: Add support for msmcobalt v2.1"

6 files changed, 93 insertions, 1 deletions

diff --git a/Documentation/devicetree/bindings/arm/msm/msm.txt b/Documentation/devicetree/bindings/arm/msm/msm.txt
index fa2ed7c9754b..42daa8a61e4c 100644
--- a/Documentation/devicetree/bindings/arm/msm/msm.txt
+++ b/Documentation/devicetree/bindings/arm/msm/msm.txt
@@ -251,6 +251,8 @@ compatible = "qcom,msm8996-mtp"
 compatible = "qcom,msm8996-adp"
 compatible = "qcom,msmcobalt-sim"
 compatible = "qcom,msmcobalt-rumi"
+compatible = "qcom,msmcobalt-cdp"
+compatible = "qcom,msmcobalt-mtp"
 compatible = "qcom,msmcobalt-qrd"
 compatible = "qcom,msmhamster-rumi"
 compatible = "qcom,msmhamster-cdp"
diff --git a/arch/arm/boot/dts/qcom/Makefile b/arch/arm/boot/dts/qcom/Makefile
index 3550f166f3a9..8b9a4849a6f3 100644
--- a/arch/arm/boot/dts/qcom/Makefile
+++ b/arch/arm/boot/dts/qcom/Makefile
@@ -116,7 +116,10 @@ dtb-$(CONFIG_ARCH_MSMCOBALT) += msmcobalt-sim.dtb \
 	apqcobalt-cdp.dtb \
 	apqcobalt-v2-mtp.dtb \
 	apqcobalt-v2-cdp.dtb \
-	apqcobalt-v2-qrd.dtb
+	apqcobalt-v2-qrd.dtb \
+	msmcobalt-v2.1-mtp.dtb \
+	msmcobalt-v2.1-cdp.dtb \
+	msmcobalt-v2.1-qrd.dtb
 
 dtb-$(CONFIG_ARCH_MSMHAMSTER) += msmhamster-rumi.dtb
 
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-v2.1-cdp.dts b/arch/arm/boot/dts/qcom/msmcobalt-v2.1-cdp.dts
new file mode 100644
index 000000000000..d5afb1d3c151
--- /dev/null
+++ b/arch/arm/boot/dts/qcom/msmcobalt-v2.1-cdp.dts
@@ -0,0 +1,23 @@
+/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+
+/dts-v1/;
+
+#include "msmcobalt-v2.1.dtsi"
+#include "msmcobalt-cdp.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. MSM COBALT v2.1 CDP";
+	compatible = "qcom,msmcobalt-cdp", "qcom,msmcobalt", "qcom,cdp";
+	qcom,board-id = <1 0>;
+};
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-v2.1-mtp.dts b/arch/arm/boot/dts/qcom/msmcobalt-v2.1-mtp.dts
new file mode 100644
index 000000000000..f49b43420a06
--- /dev/null
+++ b/arch/arm/boot/dts/qcom/msmcobalt-v2.1-mtp.dts
@@ -0,0 +1,23 @@
+/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+
+/dts-v1/;
+
+#include "msmcobalt-v2.1.dtsi"
+#include "msmcobalt-mtp.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. MSM COBALT v2.1 MTP";
+	compatible = "qcom,msmcobalt-mtp", "qcom,msmcobalt", "qcom,mtp";
+	qcom,board-id = <8 0>;
+};
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-v2.1-qrd.dts b/arch/arm/boot/dts/qcom/msmcobalt-v2.1-qrd.dts
new file mode 100644
index 000000000000..7a3b6f50932b
--- /dev/null
+++ b/arch/arm/boot/dts/qcom/msmcobalt-v2.1-qrd.dts
@@ -0,0 +1,23 @@
+/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+
+/dts-v1/;
+
+#include "msmcobalt-v2.1.dtsi"
+#include "msmcobalt-qrd.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. MSM COBALT v2.1 QRD";
+	compatible = "qcom,msmcobalt-qrd", "qcom,msmcobalt", "qcom,qrd";
+	qcom,board-id = <11 0>;
+};
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-v2.1.dtsi b/arch/arm/boot/dts/qcom/msmcobalt-v2.1.dtsi
new file mode 100644
index 000000000000..3f5c42ae8cc8
--- /dev/null
+++ b/arch/arm/boot/dts/qcom/msmcobalt-v2.1.dtsi
@@ -0,0 +1,18 @@
+/* Copyright (c) 2016 The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include "msmcobalt-v2.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. MSMCOBALT v2.1";
+	qcom,msm-id = <292 0x20001>;
+};