From 2b6fafe8fa5fc73e43ee8452d105797ec583aa9b Mon Sep 17 00:00:00 2001
From: Zhiqiang Liu <zhiqliu@qti.qualcomm.com>
Date: Wed, 3 Feb 2021 16:38:51 +0800
Subject: [PATCH 1/2] ARM: dts: msm: include display device tree for
 sa8155/sa8195

Include display device tree for platform sa8155 and sa8195.

Change-Id: I36efc8bb829aa0ebd57cb4c0a7c437c63fd71d0f
---
 qcom/sa8155-adp-star-overlay.dts    | 1 +
 qcom/sa8155-adp-star.dts            | 1 +
 qcom/sa8155-adp-star.dtsi           | 1 +
 qcom/sa8155-v2-adp-air-overlay.dts  | 2 ++
 qcom/sa8155-v2-adp-air.dts          | 2 ++
 qcom/sa8155-v2-adp-star.dts         | 1 +
 qcom/sa8155p-adp-star-overlay.dts   | 1 +
 qcom/sa8155p-adp-star.dts           | 1 +
 qcom/sa8155p-v2-adp-air-overlay.dts | 2 ++
 qcom/sa8155p-v2-adp-air.dts         | 2 ++
 qcom/sa8155p-v2-adp-star.dts        | 1 +
 qcom/sa8195p-adp-star-overlay.dts   | 1 +
 qcom/sa8195p-adp-star.dts           | 1 +
 qcom/sa8195p-adp-star.dtsi          | 1 +
 qcom/sa8195p-v2-adp-air-overlay.dts | 2 ++
 qcom/sa8195p-v2-adp-air.dts         | 2 ++
 qcom/sdmshrike.dtsi                 | 3 +++
 qcom/sm8150.dtsi                    | 3 +++
 18 files changed, 28 insertions(+)

diff --git a/qcom/sa8155-adp-star-overlay.dts b/qcom/sa8155-adp-star-overlay.dts
index 13d64ac124da..7a9369b949a0 100644
--- a/qcom/sa8155-adp-star-overlay.dts
+++ b/qcom/sa8155-adp-star-overlay.dts
@@ -2,6 +2,7 @@
 /plugin/;
 
 #include "sa8155-adp-star.dtsi"
+#include "display/sa8155-adp-star-display-shd.dtsi"
 
 / {
 	model = "ADP-STAR";
diff --git a/qcom/sa8155-adp-star.dts b/qcom/sa8155-adp-star.dts
index 1be5c92116a7..b6a703a985b5 100644
--- a/qcom/sa8155-adp-star.dts
+++ b/qcom/sa8155-adp-star.dts
@@ -2,6 +2,7 @@
 
 #include "sa8155-v1.dtsi"
 #include "sa8155-adp-star.dtsi"
+#include "display/sa8155-adp-star-display-shd.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. SA8155 ADP-STAR";
diff --git a/qcom/sa8155-adp-star.dtsi b/qcom/sa8155-adp-star.dtsi
index 3fd19bf8fb86..bf2bd25f3846 100644
--- a/qcom/sa8155-adp-star.dtsi
+++ b/qcom/sa8155-adp-star.dtsi
@@ -1 +1,2 @@
 #include "sa8155-adp-common.dtsi"
+#include "display/sa8155-adp-star-display.dtsi"
diff --git a/qcom/sa8155-v2-adp-air-overlay.dts b/qcom/sa8155-v2-adp-air-overlay.dts
index a342483d71af..9512d6154682 100644
--- a/qcom/sa8155-v2-adp-air-overlay.dts
+++ b/qcom/sa8155-v2-adp-air-overlay.dts
@@ -2,6 +2,8 @@
 /plugin/;
 
 #include "sa8155-adp-common.dtsi"
+#include "display/sa8155-adp-star-display.dtsi"
+#include "display/sa8155-adp-star-display-shd.dtsi"
 
 / {
 	model = "ADP-AIR";
diff --git a/qcom/sa8155-v2-adp-air.dts b/qcom/sa8155-v2-adp-air.dts
index c0c93a3a12ac..fb99004d2e49 100644
--- a/qcom/sa8155-v2-adp-air.dts
+++ b/qcom/sa8155-v2-adp-air.dts
@@ -2,6 +2,8 @@
 
 #include "sa8155-v2.dtsi"
 #include "sa8155-adp-common.dtsi"
+#include "display/sa8155-adp-star-display.dtsi"
+#include "display/sa8155-adp-star-display-shd.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. SA8155 V2 ADP AIR";
diff --git a/qcom/sa8155-v2-adp-star.dts b/qcom/sa8155-v2-adp-star.dts
index bb5b257a53a3..59fd12b62ecb 100644
--- a/qcom/sa8155-v2-adp-star.dts
+++ b/qcom/sa8155-v2-adp-star.dts
@@ -2,6 +2,7 @@
 
 #include "sa8155-v2.dtsi"
 #include "sa8155-adp-star.dtsi"
+#include "display/sa8155-adp-star-display-shd.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. SA8155 V2 ADP STAR";
diff --git a/qcom/sa8155p-adp-star-overlay.dts b/qcom/sa8155p-adp-star-overlay.dts
index db8d3b48f01e..9c32e380748e 100644
--- a/qcom/sa8155p-adp-star-overlay.dts
+++ b/qcom/sa8155p-adp-star-overlay.dts
@@ -2,6 +2,7 @@
 /plugin/;
 
 #include "sa8155-adp-star.dtsi"
+#include "display/sa8155-adp-star-display-shd.dtsi"
 
 / {
 	model = "ADP-STAR";
diff --git a/qcom/sa8155p-adp-star.dts b/qcom/sa8155p-adp-star.dts
index 3472b77f72c0..a6f77a6b13e2 100644
--- a/qcom/sa8155p-adp-star.dts
+++ b/qcom/sa8155p-adp-star.dts
@@ -2,6 +2,7 @@
 
 #include "sa8155p.dtsi"
 #include "sa8155-adp-star.dtsi"
+#include "display/sa8155-adp-star-display-shd.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. SA8155P ADP-STAR";
diff --git a/qcom/sa8155p-v2-adp-air-overlay.dts b/qcom/sa8155p-v2-adp-air-overlay.dts
index 57ac3cae9aff..fd881bfdaa06 100644
--- a/qcom/sa8155p-v2-adp-air-overlay.dts
+++ b/qcom/sa8155p-v2-adp-air-overlay.dts
@@ -2,6 +2,8 @@
 /plugin/;
 
 #include "sa8155-adp-common.dtsi"
+#include "display/sa8155-adp-star-display.dtsi"
+#include "display/sa8155-adp-star-display-shd.dtsi"
 
 / {
 	model = "ADP-AIR";
diff --git a/qcom/sa8155p-v2-adp-air.dts b/qcom/sa8155p-v2-adp-air.dts
index 954e155b7673..56731ff9e3af 100644
--- a/qcom/sa8155p-v2-adp-air.dts
+++ b/qcom/sa8155p-v2-adp-air.dts
@@ -2,6 +2,8 @@
 
 #include "sa8155p-v2.dtsi"
 #include "sa8155-adp-common.dtsi"
+#include "display/sa8155-adp-star-display.dtsi"
+#include "display/sa8155-adp-star-display-shd.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. SA8155P V2 ADP AIR";
diff --git a/qcom/sa8155p-v2-adp-star.dts b/qcom/sa8155p-v2-adp-star.dts
index ef21fb5e1883..4f9780a53a42 100644
--- a/qcom/sa8155p-v2-adp-star.dts
+++ b/qcom/sa8155p-v2-adp-star.dts
@@ -2,6 +2,7 @@
 
 #include "sa8155p-v2.dtsi"
 #include "sa8155-adp-star.dtsi"
+#include "display/sa8155-adp-star-display-shd.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. SA8155P V2 ADP STAR";
diff --git a/qcom/sa8195p-adp-star-overlay.dts b/qcom/sa8195p-adp-star-overlay.dts
index e6ae85d95bf7..dc01d9417bc5 100644
--- a/qcom/sa8195p-adp-star-overlay.dts
+++ b/qcom/sa8195p-adp-star-overlay.dts
@@ -2,6 +2,7 @@
 /plugin/;
 
 #include "sa8195p-adp-star.dtsi"
+#include "display/sa8195p-adp-star-display-shd.dtsi"
 
 / {
 	model = "ADP-STAR";
diff --git a/qcom/sa8195p-adp-star.dts b/qcom/sa8195p-adp-star.dts
index 6183b7cb3c68..6e00a1813e86 100644
--- a/qcom/sa8195p-adp-star.dts
+++ b/qcom/sa8195p-adp-star.dts
@@ -2,6 +2,7 @@
 
 #include "sa8195p.dtsi"
 #include "sa8195p-adp-common.dtsi"
+#include "display/sa8195p-adp-star-display-shd.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. SA8195P ADP-STAR";
diff --git a/qcom/sa8195p-adp-star.dtsi b/qcom/sa8195p-adp-star.dtsi
index ec4afde21db4..91b92282255e 100644
--- a/qcom/sa8195p-adp-star.dtsi
+++ b/qcom/sa8195p-adp-star.dtsi
@@ -1 +1,2 @@
 #include "sa8195p-adp-common.dtsi"
+#include "display/sa8195p-adp-star-display.dtsi"
diff --git a/qcom/sa8195p-v2-adp-air-overlay.dts b/qcom/sa8195p-v2-adp-air-overlay.dts
index dd8060574532..9b3cf9300f5f 100644
--- a/qcom/sa8195p-v2-adp-air-overlay.dts
+++ b/qcom/sa8195p-v2-adp-air-overlay.dts
@@ -2,6 +2,8 @@
 /plugin/;
 
 #include "sa8195p-v2-adp-air.dtsi"
+#include "display/sa8195p-adp-star-display.dtsi"
+#include "display/sa8195p-adp-star-display-shd.dtsi"
 
 / {
 	model = "ADP-AIR";
diff --git a/qcom/sa8195p-v2-adp-air.dts b/qcom/sa8195p-v2-adp-air.dts
index 398606ccb6e2..f2b96c2ca359 100644
--- a/qcom/sa8195p-v2-adp-air.dts
+++ b/qcom/sa8195p-v2-adp-air.dts
@@ -2,6 +2,8 @@
 
 #include "sa8195p.dtsi"
 #include "sa8195p-adp-common.dtsi"
+#include "display/sa8195p-adp-star-display.dtsi"
+#include "display/sa8195p-adp-star-display-shd.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. SA8195P V2 ADP AIR";
diff --git a/qcom/sdmshrike.dtsi b/qcom/sdmshrike.dtsi
index 2d15aff8059a..a2613e74c4a7 100644
--- a/qcom/sdmshrike.dtsi
+++ b/qcom/sdmshrike.dtsi
@@ -518,6 +518,9 @@
 	soc: soc { };
 };
 
+#include "display/sdmshrike-sde-pll.dtsi"
+#include "display/sdmshrike-sde.dtsi"
+
 &soc {
 	#address-cells = <1>;
 	#size-cells = <1>;
diff --git a/qcom/sm8150.dtsi b/qcom/sm8150.dtsi
index 1108f8366fdd..0fa4025f4f08 100644
--- a/qcom/sm8150.dtsi
+++ b/qcom/sm8150.dtsi
@@ -589,6 +589,9 @@
 	};
 };
 
+#include "display/sm8150-sde.dtsi"
+#include "display/sm8150-sde-pll.dtsi"
+
 &soc {
 	#address-cells = <1>;
 	#size-cells = <1>;

From 16e82d6a0cd11d3d2f9e89738d135eb055738ae0 Mon Sep 17 00:00:00 2001
From: Zhiqiang Liu <zhiqliu@qti.qualcomm.com>
Date: Thu, 28 Jan 2021 11:23:14 +0800
Subject: [PATCH 2/2] ARM: dts: msm: add lxc overlay devicetree for Gen3
 platform

Create new lxc overlay devicetree for Gen3 platform, and add
lxc multi-card configuration to these overlay devicetrees.

Change-Id: Ic5ba96064413e062cba462d7fa0c78f9f07ae9c8
---
 qcom/sa6155p-v2-adp-air-lxc-overlay.dts | 12 ++++++++++++
 qcom/sa8155-v2-adp-air-lxc-overlay.dts  | 13 +++++++++++++
 qcom/sa8155p-v2-adp-air-lxc-overlay.dts | 13 +++++++++++++
 qcom/sa8195p-v2-adp-air-lxc-overlay.dts | 19 +++++++++++++++++++
 4 files changed, 57 insertions(+)
 create mode 100644 qcom/sa6155p-v2-adp-air-lxc-overlay.dts
 create mode 100644 qcom/sa8155-v2-adp-air-lxc-overlay.dts
 create mode 100644 qcom/sa8155p-v2-adp-air-lxc-overlay.dts
 create mode 100644 qcom/sa8195p-v2-adp-air-lxc-overlay.dts

diff --git a/qcom/sa6155p-v2-adp-air-lxc-overlay.dts b/qcom/sa6155p-v2-adp-air-lxc-overlay.dts
new file mode 100644
index 000000000000..6e45ada0cdc8
--- /dev/null
+++ b/qcom/sa6155p-v2-adp-air-lxc-overlay.dts
@@ -0,0 +1,12 @@
+/dts-v1/;
+/plugin/;
+
+#include "sa6155-adp-air.dtsi"
+#include "display/sa6155p-v2-adp-air-display-lxc-shd.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SA6155P ADP-AIR V2";
+	compatible = "qcom,sa6155p-adp-air", "qcom,sa6155p", "qcom,adp-air";
+	qcom,msm-id = <377 0x0>, <380 0>;
+	qcom,board-id = <0x03020019 0>;
+};
diff --git a/qcom/sa8155-v2-adp-air-lxc-overlay.dts b/qcom/sa8155-v2-adp-air-lxc-overlay.dts
new file mode 100644
index 000000000000..afc71383d737
--- /dev/null
+++ b/qcom/sa8155-v2-adp-air-lxc-overlay.dts
@@ -0,0 +1,13 @@
+/dts-v1/;
+/plugin/;
+
+#include "sa8155-adp-common.dtsi"
+#include "display/sa8155-adp-star-display.dtsi"
+#include "display/sa8155-v2-adp-air-display-lxc-shd.dtsi"
+
+/ {
+	model = "ADP-AIR";
+	compatible = "qcom,sa8155-v2-adp-air", "qcom,sa8155",
+		"qcom,adp-air";
+	qcom,board-id = <0X01000019 0>;
+};
diff --git a/qcom/sa8155p-v2-adp-air-lxc-overlay.dts b/qcom/sa8155p-v2-adp-air-lxc-overlay.dts
new file mode 100644
index 000000000000..08e7c1a4b79a
--- /dev/null
+++ b/qcom/sa8155p-v2-adp-air-lxc-overlay.dts
@@ -0,0 +1,13 @@
+/dts-v1/;
+/plugin/;
+
+#include "sa8155-adp-common.dtsi"
+#include "display/sa8155-adp-star-display.dtsi"
+#include "display/sa8155-v2-adp-air-display-lxc-shd.dtsi"
+
+/ {
+	model = "ADP-AIR";
+	compatible = "qcom,sa8155p-v2-adp-air", "qcom,sa8155p",
+		"qcom,adp-air";
+	qcom,board-id = <0x01000019 0>;
+};
diff --git a/qcom/sa8195p-v2-adp-air-lxc-overlay.dts b/qcom/sa8195p-v2-adp-air-lxc-overlay.dts
new file mode 100644
index 000000000000..1d57b6a2338b
--- /dev/null
+++ b/qcom/sa8195p-v2-adp-air-lxc-overlay.dts
@@ -0,0 +1,19 @@
+/dts-v1/;
+/plugin/;
+
+#include "sa8195p-adp-common.dtsi"
+#include "display/sa8195p-adp-star-display.dtsi"
+#include "display/sa8195p-v2-adp-air-display-lxc-shd.dtsi"
+
+/ {
+	model = "ADP-AIR";
+	compatible = "qcom,sa8195p-v2-adp-air", "qcom,sa8195p",
+		"qcom,adp-air";
+	qcom,board-id = <0x02010019 0>;
+};
+
+&qupv3_se0_spi {
+	can-controller@0 {
+		status = "disabled";
+	};
+};