summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-09-08 20:01:30 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-09-08 20:01:30 -0700
commit7f68d3879d6ba3f595054027eb3f203a96b21b6f (patch)
tree9811ff40eb0fcf5bbd87065db2ba2a8d18188914
parent9821c77ff53be32779345e4e60d884918d162f05 (diff)
parent70c677c554c31b875a7a21e2a1e18cbbfa18abf0 (diff)
Merge "ARM: dts: msm: Add support for apqcobalt v2.1"
-rw-r--r--arch/arm/boot/dts/qcom/Makefile5
-rw-r--r--arch/arm/boot/dts/qcom/apqcobalt-v2.1-cdp.dts22
-rw-r--r--arch/arm/boot/dts/qcom/apqcobalt-v2.1-mtp.dts22
-rw-r--r--arch/arm/boot/dts/qcom/apqcobalt-v2.1-qrd.dts22
-rw-r--r--arch/arm/boot/dts/qcom/apqcobalt-v2.1.dtsi18
5 files changed, 88 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/qcom/Makefile b/arch/arm/boot/dts/qcom/Makefile
index 073490062971..521e9a4a2079 100644
--- a/arch/arm/boot/dts/qcom/Makefile
+++ b/arch/arm/boot/dts/qcom/Makefile
@@ -121,7 +121,10 @@ dtb-$(CONFIG_ARCH_MSMCOBALT) += msmcobalt-sim.dtb \
apqcobalt-v2-qrd.dtb \
msmcobalt-v2.1-mtp.dtb \
msmcobalt-v2.1-cdp.dtb \
- msmcobalt-v2.1-qrd.dtb
+ msmcobalt-v2.1-qrd.dtb \
+ apqcobalt-v2.1-mtp.dtb \
+ apqcobalt-v2.1-cdp.dtb \
+ apqcobalt-v2.1-qrd.dtb
dtb-$(CONFIG_ARCH_MSMHAMSTER) += msmhamster-rumi.dtb
diff --git a/arch/arm/boot/dts/qcom/apqcobalt-v2.1-cdp.dts b/arch/arm/boot/dts/qcom/apqcobalt-v2.1-cdp.dts
new file mode 100644
index 000000000000..f0ab8e0afc78
--- /dev/null
+++ b/arch/arm/boot/dts/qcom/apqcobalt-v2.1-cdp.dts
@@ -0,0 +1,22 @@
+/* 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 "apqcobalt-v2.1.dtsi"
+#include "msmcobalt-cdp.dtsi"
+
+/ {
+ model = "Qualcomm Technologies, Inc. APQ COBALT V2.1 CDP";
+ compatible = "qcom,apqcobalt-cdp", "qcom,apqcobalt", "qcom,cdp";
+ qcom,board-id = <1 0>;
+};
diff --git a/arch/arm/boot/dts/qcom/apqcobalt-v2.1-mtp.dts b/arch/arm/boot/dts/qcom/apqcobalt-v2.1-mtp.dts
new file mode 100644
index 000000000000..e23134f8897b
--- /dev/null
+++ b/arch/arm/boot/dts/qcom/apqcobalt-v2.1-mtp.dts
@@ -0,0 +1,22 @@
+/* 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 "apqcobalt-v2.1.dtsi"
+#include "msmcobalt-mtp.dtsi"
+
+/ {
+ model = "Qualcomm Technologies, Inc. APQ COBALT V2.1 MTP";
+ compatible = "qcom,apqcobalt-mtp", "qcom,apqcobalt", "qcom,mtp";
+ qcom,board-id = <8 0>;
+};
diff --git a/arch/arm/boot/dts/qcom/apqcobalt-v2.1-qrd.dts b/arch/arm/boot/dts/qcom/apqcobalt-v2.1-qrd.dts
new file mode 100644
index 000000000000..8da6f90958d2
--- /dev/null
+++ b/arch/arm/boot/dts/qcom/apqcobalt-v2.1-qrd.dts
@@ -0,0 +1,22 @@
+/* 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 "apqcobalt-v2.1.dtsi"
+#include "msmcobalt-qrd.dtsi"
+
+/ {
+ model = "Qualcomm Technologies, Inc. APQ COBALT V2.1 QRD";
+ compatible = "qcom,apqcobalt-qrd", "qcom,apqcobalt", "qcom,qrd";
+ qcom,board-id = <11 0>;
+};
diff --git a/arch/arm/boot/dts/qcom/apqcobalt-v2.1.dtsi b/arch/arm/boot/dts/qcom/apqcobalt-v2.1.dtsi
new file mode 100644
index 000000000000..5a49afecd60b
--- /dev/null
+++ b/arch/arm/boot/dts/qcom/apqcobalt-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.1.dtsi"
+
+/ {
+ model = "Qualcomm Technologies, Inc. APQ COBALT V2.1";
+ qcom,msm-id = <319 0x20001>;
+};