Merge "ARM: dts: msm: Add device tree for msmfalcon QRD"

3 files changed, 49 insertions, 1 deletions

diff --git a/arch/arm/boot/dts/qcom/Makefile b/arch/arm/boot/dts/qcom/Makefile
index 4d82f51be778..bc918a9a6402 100644
--- a/arch/arm/boot/dts/qcom/Makefile
+++ b/arch/arm/boot/dts/qcom/Makefile
@@ -138,7 +138,8 @@ dtb-$(CONFIG_ARCH_MSMFALCON) += msmfalcon-sim.dtb \
 	msmfalcon-rumi.dtb \
 	msmfalcon-cdp.dtb \
 	msmfalcon-mtp.dtb \
-	msmfalcon-rcm.dtb
+	msmfalcon-rcm.dtb \
+	msmfalcon-qrd.dtb
 
 dtb-$(CONFIG_ARCH_MSMTRITON) += msmtriton-rumi.dtb
 
diff --git a/arch/arm/boot/dts/qcom/msmfalcon-qrd.dts b/arch/arm/boot/dts/qcom/msmfalcon-qrd.dts
new file mode 100644
index 000000000000..229676f17456
--- /dev/null
+++ b/arch/arm/boot/dts/qcom/msmfalcon-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 "msmfalcon.dtsi"
+#include "msmfalcon-qrd.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. MSM FALCON QRD";
+	compatible = "qcom,msmfalcon-qrd", "qcom,msmfalcon", "qcom,qrd";
+	qcom,board-id = <0x1000b 0>;
+};
diff --git a/arch/arm/boot/dts/qcom/msmfalcon-qrd.dtsi b/arch/arm/boot/dts/qcom/msmfalcon-qrd.dtsi
new file mode 100644
index 000000000000..3ec991b82bba
--- /dev/null
+++ b/arch/arm/boot/dts/qcom/msmfalcon-qrd.dtsi
@@ -0,0 +1,24 @@
+/* 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 "msmfalcon-pinctrl.dtsi"
+/ {
+};
+
+&uartblsp1dm1 {
+	status = "ok";
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart_console_active>;
+};
+
+&soc {
+};