From: Nolen Johnson <johnsonnolen@gmail.com>
Date: Sat, 16 Mar 2024 19:53:42 +0000 (-0400)
Subject: arch: arm64: dts: g12a*/b* & sm1*: Use dynamic deadpool partition scheme
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=refs%2Fheads%2Flineage-20;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

arch: arm64: dts: g12a*/b* & sm1*: Use dynamic deadpool partition scheme

* We only support g12a/g12b/sm1 in this kernel, and then only
  either dynamic native or retrofit.

* normal_dynamic might be usable but we use the deadpool partition
  scheme on devices that need a defined one (devkits).

Change-Id: Id6ac93524c23e58f1118c4b4875bfce2bc235a6c
(cherry picked from commit c065b2702e57df88bd939a19839a7ed06403a7d0)
---

diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt.dts
index 833ff4e32caa..62373a54af66 100644
--- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt.dts
@@ -18,7 +18,7 @@
 /dts-v1/;
 
 #include "mesong12a.dtsi"
-#include "partition_mbox_normal.dtsi"
+#include "partition_mbox_dynamic_deadpool.dtsi"
 #include "mesong12a_skt-panel.dtsi"
 
 / {
diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt_buildroot.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt_buildroot.dts
index 648bcac95951..e4a765c0a8cd 100644
--- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt_buildroot.dts
@@ -18,7 +18,7 @@
 /dts-v1/;
 
 #include "mesong12a.dtsi"
-#include "partition_mbox_normal.dtsi"
+#include "partition_mbox_dynamic_deadpool.dtsi"
 #include "mesong12a_skt-panel.dtsi"
 #include "mesong12a_drm.dtsi"
 
diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200.dts
index 8c227464abe5..ac5e8b4ddecc 100644
--- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200.dts
@@ -18,7 +18,7 @@
 /dts-v1/;
 
 #include "mesong12a.dtsi"
-#include "partition_mbox_normal_dynamic.dtsi"
+#include "partition_mbox_dynamic_deadpool.dtsi"
 #include "mesong12a_skt-panel.dtsi"
 
 / {
diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_1g.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_1g.dts
index d779630ddc95..0dac6a15c333 100644
--- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u200_1g.dts
@@ -18,7 +18,7 @@
 /dts-v1/;
 
 #include "mesong12a.dtsi"
-#include "partition_mbox_normal_dynamic.dtsi"
+#include "partition_mbox_dynamic_deadpool.dtsi"
 #include "mesong12a_skt-panel.dtsi"
 
 / {
diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u202.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u202.dts
index f120dd640245..2478383294d5 100644
--- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u202.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u202.dts
@@ -18,7 +18,7 @@
 /dts-v1/;
 
 #include "mesong12a.dtsi"
-#include "partition_mbox_normal.dtsi"
+#include "partition_mbox_dynamic_deadpool.dtsi"
 #include "mesong12a_skt-panel.dtsi"
 
 / {
diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u202_1g.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u202_1g.dts
index d28d80cb6d18..9a369d34193d 100644
--- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_u202_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_u202_1g.dts
@@ -18,7 +18,7 @@
 /dts-v1/;
 
 #include "mesong12a.dtsi"
-#include "partition_mbox_normal.dtsi"
+#include "partition_mbox_dynamic_deadpool.dtsi"
 #include "mesong12a_skt-panel.dtsi"
 
 / {
diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211.dts b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211.dts
index a18c7aab1fb5..9a45466e3bc1 100644
--- a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211.dts
@@ -18,7 +18,7 @@
 /dts-v1/;
 
 #include "mesong12a.dtsi"
-#include "partition_mbox_normal.dtsi"
+#include "partition_mbox_dynamic_deadpool.dtsi"
 
 / {
 	model = "Amlogic";
diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_1g.dts b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_1g.dts
index 4c3144681a81..e18e20c77a2a 100644
--- a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_1g.dts
@@ -18,7 +18,7 @@
 /dts-v1/;
 
 #include "mesong12a.dtsi"
-#include "partition_mbox_normal.dtsi"
+#include "partition_mbox_dynamic_deadpool.dtsi"
 
 / {
 	model = "Amlogic";
diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_512m.dts b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_512m.dts
index 2348bc323d78..f2d4462da2b0 100644
--- a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_512m.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_512m.dts
@@ -18,7 +18,7 @@
 /dts-v1/;
 
 #include "mesong12a.dtsi"
-#include "partition_mbox_normal.dtsi"
+#include "partition_mbox_dynamic_deadpool.dtsi"
 
 / {
 	model = "Amlogic";
diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212.dts b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212.dts
index 57c7d0f674e0..db0c154dbf41 100644
--- a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212.dts
@@ -18,7 +18,7 @@
 /dts-v1/;
 
 #include "mesong12a.dtsi"
-#include "partition_mbox_normal_dynamic.dtsi"
+#include "partition_mbox_dynamic_deadpool.dtsi"
 
 / {
 	model = "Amlogic";
diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_1g.dts b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_1g.dts
index 397ccfcbb940..5b06dd04049f 100644
--- a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_1g.dts
@@ -18,7 +18,7 @@
 /dts-v1/;
 
 #include "mesong12a.dtsi"
-#include "partition_mbox_normal_P_32.dtsi"
+#include "partition_mbox_dynamic_deadpool.dtsi"
 
 / {
 	model = "Amlogic";
diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u215.dts b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u215.dts
index c3767fecd1eb..13fda95b624c 100644
--- a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u215.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u215.dts
@@ -18,7 +18,7 @@
 /dts-v1/;
 
 #include "mesong12a.dtsi"
-#include "partition_mbox_normal_dynamic.dtsi"
+#include "partition_mbox_dynamic_deadpool.dtsi"
 
 / {
 	model = "Amlogic";
diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905y2_u220.dts b/arch/arm64/boot/dts/amlogic/g12a_s905y2_u220.dts
index 77ea13905fdb..67b9c2513bb2 100644
--- a/arch/arm64/boot/dts/amlogic/g12a_s905y2_u220.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905y2_u220.dts
@@ -18,7 +18,7 @@
 /dts-v1/;
 
 #include "mesong12a.dtsi"
-#include "partition_mbox_normal.dtsi"
+#include "partition_mbox_dynamic_deadpool.dtsi"
 
 / {
 	model = "Amlogic";
diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905y2_u221.dts b/arch/arm64/boot/dts/amlogic/g12a_s905y2_u221.dts
index b90368cb13e9..26d2f894a12b 100644
--- a/arch/arm64/boot/dts/amlogic/g12a_s905y2_u221.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905y2_u221.dts
@@ -18,7 +18,7 @@
 /dts-v1/;
 
 #include "mesong12a.dtsi"
-#include "partition_mbox_normal.dtsi"
+#include "partition_mbox_dynamic_deadpool.dtsi"
 
 / {
 	model = "Amlogic";
diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905y2_u223_lp.dts b/arch/arm64/boot/dts/amlogic/g12a_s905y2_u223_lp.dts
index 091125d61b45..88185838e3ff 100644
--- a/arch/arm64/boot/dts/amlogic/g12a_s905y2_u223_lp.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905y2_u223_lp.dts
@@ -18,7 +18,7 @@
 /dts-v1/;
 
 #include "mesong12a.dtsi"
-#include "partition_mbox_normal.dtsi"
+#include "partition_mbox_dynamic_deadpool.dtsi"
 
 / {
 	model = "Amlogic";
diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_skt.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_skt.dts
index 58c0cda49eee..2a2deb817298 100644
--- a/arch/arm64/boot/dts/amlogic/g12b_a311d_skt.dts
+++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_skt.dts
@@ -17,7 +17,7 @@
 
 /dts-v1/;
 
-#include "partition_mbox_normal.dtsi"
+#include "partition_mbox_dynamic_deadpool.dtsi"
 #include "mesong12b.dtsi"
 #include "mesong12b_skt-panel.dtsi"
 
diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_skt_a.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_skt_a.dts
index f82cc705fb41..34c4399fe418 100644
--- a/arch/arm64/boot/dts/amlogic/g12b_a311d_skt_a.dts
+++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_skt_a.dts
@@ -17,7 +17,7 @@
 
 /dts-v1/;
 
-#include "partition_mbox_normal.dtsi"
+#include "partition_mbox_dynamic_deadpool.dtsi"
 #include "mesong12b_a.dtsi"
 #include "mesong12b_skt-panel.dtsi"
 
diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_w200.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_w200.dts
index ac2dd436f384..9f41a14a514c 100644
--- a/arch/arm64/boot/dts/amlogic/g12b_a311d_w200.dts
+++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_w200.dts
@@ -17,7 +17,7 @@
 
 /dts-v1/;
 
-#include "partition_mbox_normal.dtsi"
+#include "partition_mbox_dynamic_deadpool.dtsi"
 #include "mesong12b.dtsi"
 #include "mesong12b_skt-panel.dtsi"
 
diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_w200_a.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_w200_a.dts
index 5beba1647b17..4cc263c76eb3 100644
--- a/arch/arm64/boot/dts/amlogic/g12b_a311d_w200_a.dts
+++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_w200_a.dts
@@ -17,7 +17,7 @@
 
 /dts-v1/;
 
-#include "partition_mbox_normal.dtsi"
+#include "partition_mbox_dynamic_deadpool.dtsi"
 #include "mesong12b_a.dtsi"
 #include "mesong12b_skt-panel.dtsi"
 
diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400.dts
index 7b48f204f2c3..7a8bbef2c925 100644
--- a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400.dts
+++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400.dts
@@ -17,7 +17,7 @@
 
 /dts-v1/;
 
-#include "partition_mbox_normal_Q.dtsi"
+#include "partition_mbox_dynamic_deadpool.dtsi"
 #include "mesong12b.dtsi"
 #include "mesong12b_skt-panel.dtsi"
 
diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_a.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_a.dts
index 1db5a362bd40..bde2fec738ad 100644
--- a/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_a.dts
+++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_w400_a.dts
@@ -17,7 +17,7 @@
 
 /dts-v1/;
 
-#include "partition_mbox_normal.dtsi"
+#include "partition_mbox_dynamic_deadpool.dtsi"
 #include "mesong12b_a.dtsi"
 #include "mesong12b_skt-panel.dtsi"
 
diff --git a/arch/arm64/boot/dts/amlogic/sm1_pxp.dts b/arch/arm64/boot/dts/amlogic/sm1_pxp.dts
index d8da28e6cce0..b4a63a7118b8 100644
--- a/arch/arm64/boot/dts/amlogic/sm1_pxp.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_pxp.dts
@@ -18,7 +18,7 @@
 /dts-v1/;
 
 #include "mesonsm1.dtsi"
-#include "partition_mbox_normal.dtsi"
+#include "partition_mbox_dynamic_deadpool.dtsi"
 
 / {
 	model = "Amlogic";
diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905c1_ac232.dts b/arch/arm64/boot/dts/amlogic/sm1_s905c1_ac232.dts
index a2529ce54670..ba872fe8e501 100644
--- a/arch/arm64/boot/dts/amlogic/sm1_s905c1_ac232.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_s905c1_ac232.dts
@@ -18,7 +18,7 @@
 /dts-v1/;
 
 #include "mesonsm1.dtsi"
-#include "partition_mbox_normal_dynamic.dtsi"
+#include "partition_mbox_dynamic_deadpool.dtsi"
 #include "mesonsm1_skt-panel.dtsi"
 
 / {
diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts
index 9aae0e76c978..7ff66c311c95 100644
--- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts
@@ -18,7 +18,7 @@
 /dts-v1/;
 
 #include "mesonsm1.dtsi"
-#include "partition_mbox_normal_dynamic.dtsi"
+#include "partition_mbox_dynamic_deadpool.dtsi"
 #include "mesonsm1_skt-panel.dtsi"
 
 / {
diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts
index 15c611b3ebbf..dd7d0ac8952c 100644
--- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts
@@ -18,7 +18,7 @@
 /dts-v1/;
 
 #include "mesonsm1.dtsi"
-#include "partition_mbox_normal.dtsi"
+#include "partition_mbox_dynamic_deadpool.dtsi"
 #include "mesonsm1_skt-panel.dtsi"
 
 / {
diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts
index 906f7a9cce9c..01d06314d7f8 100644
--- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts
@@ -19,7 +19,7 @@
 /dts-v1/;
 
 #include "mesonsm1.dtsi"
-#include "partition_mbox_normal.dtsi"
+#include "partition_mbox_dynamic_deadpool.dtsi"
 #include "mesonsm1_skt-panel.dtsi"
 
 / {
diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905d3_skt.dts b/arch/arm64/boot/dts/amlogic/sm1_s905d3_skt.dts
index 2521742521b3..b952f157e57e 100644
--- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_skt.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_skt.dts
@@ -18,7 +18,7 @@
 /dts-v1/;
 
 #include "mesonsm1.dtsi"
-#include "partition_mbox_normal.dtsi"
+#include "partition_mbox_dynamic_deadpool.dtsi"
 #include "mesonsm1_skt-panel.dtsi"
 
 / {
diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac212.dts b/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac212.dts
index 0e76fbb7f233..c0cdbe080ba4 100644
--- a/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac212.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac212.dts
@@ -18,7 +18,7 @@
 /dts-v1/;
 
 #include "mesonsm1.dtsi"
-#include "partition_mbox_normal_dynamic.dtsi"
+#include "partition_mbox_dynamic_deadpool.dtsi"
 #include "mesonsm1_skt-panel.dtsi"
 
 / {
diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213.dts b/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213.dts
index 7456d1333e62..ed3a3bd538fc 100644
--- a/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac213.dts
@@ -18,7 +18,7 @@
 /dts-v1/;
 
 #include "mesonsm1.dtsi"
-#include "partition_mbox_normal_dynamic.dtsi"
+#include "partition_mbox_dynamic_deadpool.dtsi"
 #include "mesonsm1_skt-panel.dtsi"
 
 / {
diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac214.dts b/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac214.dts
index 6f48f0180538..051d67f220bc 100644
--- a/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac214.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac214.dts
@@ -18,7 +18,7 @@
 /dts-v1/;
 
 #include "mesonsm1.dtsi"
-#include "partition_mbox_normal_dynamic.dtsi"
+#include "partition_mbox_dynamic_deadpool.dtsi"
 #include "mesonsm1_skt-panel.dtsi"
 
 / {
diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac215.dts b/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac215.dts
index afc527b73504..afa05c8169b0 100644
--- a/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac215.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_s905x3_ac215.dts
@@ -18,7 +18,7 @@
 /dts-v1/;
 
 #include "mesonsm1.dtsi"
-#include "partition_mbox_normal_dynamic.dtsi"
+#include "partition_mbox_dynamic_deadpool.dtsi"
 #include "mesonsm1_skt-panel.dtsi"
 
 / {
diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905y3_ac223.dts b/arch/arm64/boot/dts/amlogic/sm1_s905y3_ac223.dts
index 0bb64b6c9efe..d39f98f561f5 100644
--- a/arch/arm64/boot/dts/amlogic/sm1_s905y3_ac223.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_s905y3_ac223.dts
@@ -18,7 +18,7 @@
 /dts-v1/;
 
 #include "mesonsm1.dtsi"
-#include "partition_mbox_normal.dtsi"
+#include "partition_mbox_dynamic_deadpool.dtsi"
 #include "mesonsm1_skt-panel.dtsi"
 
 / {