From 1241c48c67e36af3ebbbd7b79d3192e78c3cd48b Mon Sep 17 00:00:00 2001
From: lijuang <lijuang@qti.qualcomm.com>
Date: Wed, 18 Dec 2019 16:07:54 +0800
Subject: [PATCH] ARM: dts: msm: Add initial device tree for Lahaina QRD Module

Add device tree support for Lahaina QRD module platform.

Change-Id: Ic79368f317f090c7f4ee1ac2e1c2a544008c002d
---
 bindings/arm/msm/msm.txt            |  1 +
 qcom/Makefile                       |  7 +++++--
 qcom/lahaina-qrd-common.dtsi        | 29 +++++++++++++++++++++++++++++
 qcom/lahaina-qrd-module-overlay.dts | 10 ++++++++++
 qcom/lahaina-qrd-module.dts         | 10 ++++++++++
 qcom/lahaina-qrd-module.dtsi        |  1 +
 qcom/lahaina-qrd.dtsi               | 29 +----------------------------
 7 files changed, 57 insertions(+), 30 deletions(-)
 create mode 100644 qcom/lahaina-qrd-common.dtsi
 create mode 100644 qcom/lahaina-qrd-module-overlay.dts
 create mode 100644 qcom/lahaina-qrd-module.dts
 create mode 100644 qcom/lahaina-qrd-module.dtsi

diff --git a/bindings/arm/msm/msm.txt b/bindings/arm/msm/msm.txt
index 0065a0641884..f8ead7d21a28 100644
--- a/bindings/arm/msm/msm.txt
+++ b/bindings/arm/msm/msm.txt
@@ -172,6 +172,7 @@ compatible = "qcom,lahaina-rumi"
 compatible = "qcom,lahaina-mtp"
 compatible = "qcom,lahaina-cdp"
 compatible = "qcom,lahaina-qrd"
+compatible = "qcom,lahaina-qrd-module"
 compatible = "qcom,lito-rumi"
 compatible = "qcom,lito-mtp"
 compatible = "qcom,lito-cdp"
diff --git a/qcom/Makefile b/qcom/Makefile
index d7c8060780c0..21cad5417253 100644
--- a/qcom/Makefile
+++ b/qcom/Makefile
@@ -2,17 +2,20 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
 dtbo-$(CONFIG_ARCH_LAHAINA) += lahaina-rumi-overlay.dtbo \
 	lahaina-mtp-overlay.dtbo \
 	lahaina-cdp-overlay.dtbo \
-	lahaina-qrd-overlay.dtbo
+	lahaina-qrd-overlay.dtbo \
+	lahaina-qrd-module-overlay.dtbo
 
 lahaina-rumi-overlay.dtbo-base := lahaina.dtb
 lahaina-mtp-overlay.dtbo-base := lahaina.dtb
 lahaina-cdp-overlay.dtbo-base := lahaina.dtb
 lahaina-qrd-overlay.dtbo-base := lahaina.dtb
+lahaina-qrd-module-overlay.dtbo-base := lahaina.dtb
 else
 dtb-$(CONFIG_ARCH_LAHAINA) += lahaina-rumi.dtb \
 	lahaina-mtp.dtb \
 	lahaina-cdp.dtb \
-	lahaina-qrd.dtb
+	lahaina-qrd.dtb \
+	lahaina-qrd-module.dtb
 endif
 
 always		:= $(dtb-y)
diff --git a/qcom/lahaina-qrd-common.dtsi b/qcom/lahaina-qrd-common.dtsi
new file mode 100644
index 000000000000..138e3dba9b26
--- /dev/null
+++ b/qcom/lahaina-qrd-common.dtsi
@@ -0,0 +1,29 @@
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
+#include "lahaina-pmic-overlay.dtsi"
+
+&spmi_debug_bus {
+	status = "ok";
+};
+
+&soc {
+	gpio_keys {
+		compatible = "gpio-keys";
+		label = "gpio-keys";
+
+		pinctrl-names = "default";
+		pinctrl-0 = <&key_vol_up_default>;
+
+		vol_up {
+			label = "volume_up";
+			gpios = <&pm8350_gpios 6 GPIO_ACTIVE_LOW>;
+			linux,input-type = <1>;
+			linux,code = <KEY_VOLUMEUP>;
+			gpio-key,wakeup;
+			debounce-interval = <15>;
+			linux,can-disable;
+		};
+	};
+};
+
diff --git a/qcom/lahaina-qrd-module-overlay.dts b/qcom/lahaina-qrd-module-overlay.dts
new file mode 100644
index 000000000000..cce8094ba3c2
--- /dev/null
+++ b/qcom/lahaina-qrd-module-overlay.dts
@@ -0,0 +1,10 @@
+/dts-v1/;
+/plugin/;
+
+#include "lahaina-qrd-module.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Lahaina QRD Module";
+	compatible = "qcom,lahaina-qrd-module", "qcom,lahaina", "qcom,qrd";
+	qcom,board-id = <0x1000B 0x8>;
+};
diff --git a/qcom/lahaina-qrd-module.dts b/qcom/lahaina-qrd-module.dts
new file mode 100644
index 000000000000..c7943336f5c3
--- /dev/null
+++ b/qcom/lahaina-qrd-module.dts
@@ -0,0 +1,10 @@
+/dts-v1/;
+
+#include "lahaina.dtsi"
+#include "lahaina-qrd-module.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Lahaina QRD Module";
+	compatible = "qcom,lahaina-qrd-module", "qcom,lahaina", "qcom,qrd";
+	qcom,board-id = <0x1000B 0x8>;
+};
diff --git a/qcom/lahaina-qrd-module.dtsi b/qcom/lahaina-qrd-module.dtsi
new file mode 100644
index 000000000000..82a081b2ed99
--- /dev/null
+++ b/qcom/lahaina-qrd-module.dtsi
@@ -0,0 +1 @@
+#include "lahaina-qrd-common.dtsi"
diff --git a/qcom/lahaina-qrd.dtsi b/qcom/lahaina-qrd.dtsi
index 1aac5c1d094c..82a081b2ed99 100644
--- a/qcom/lahaina-qrd.dtsi
+++ b/qcom/lahaina-qrd.dtsi
@@ -1,28 +1 @@
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
-#include "lahaina-pmic-overlay.dtsi"
-
-&spmi_debug_bus {
-	status = "ok";
-};
-
-&soc {
-	gpio_keys {
-		compatible = "gpio-keys";
-		label = "gpio-keys";
-
-		pinctrl-names = "default";
-		pinctrl-0 = <&key_vol_up_default>;
-
-		vol_up {
-			label = "volume_up";
-			gpios = <&pm8350_gpios 6 GPIO_ACTIVE_LOW>;
-			linux,input-type = <1>;
-			linux,code = <KEY_VOLUMEUP>;
-			gpio-key,wakeup;
-			debounce-interval = <15>;
-			linux,can-disable;
-		};
-	};
-};
+#include "lahaina-qrd-common.dtsi"