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 833ff4e32caa8b9cd122b7643f4bd8f19309256e..62373a54af6667b99b18761c7c32bd1f2b6f753b 100644 (file)
--- 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 648bcac95951430ce53cedea9adc67d3af138754..e4a765c0a8cdca5b3cb1eee7b4dbea7a0bebb727 100644 (file)
--- 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 8c227464abe55f19004d650bffaf96ed13a94c26..ac5e8b4ddecc9a11211882216ded5db2b516467f 100644 (file)
--- 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 d779630ddc95f9867365e85349597db6a17de4fb..0dac6a15c333c36c2ddc7d4bb2997e2246c66f25 100644 (file)
--- 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 f120dd640245ba33d018a83096fdc9ef720df4e3..2478383294d561c5e1c3783c0281b544ec232e69 100644 (file)
--- 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 d28d80cb6d18c699a5b02d9cff97e0b95fa0562f..9a369d34193d4498bd2a6f8693ff04d348b6dc5b 100644 (file)
--- 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 a18c7aab1fb50c610f8e956f8559df7f2b69036c..9a45466e3bc1eb92eb588460e236a93c42e8abc2 100644 (file)
--- 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 4c3144681a8161015c05570fc91079acf9917c2f..e18e20c77a2a8661d1b7eaa2168820105841e114 100644 (file)
--- 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 2348bc323d780c05b0a3567f65561eca81659e47..f2d4462da2b0cf3ba918073abff460398416a3ea 100644 (file)
--- 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 57c7d0f674e099e2fcffbae667fdee44291c25e6..db0c154dbf41e785f14dc0204a228281798ebd99 100644 (file)
--- 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 397ccfcbb940abf7bfb4630727849a1f0ea9facc..5b06dd04049f9e1f39a6e01c406786291c619c57 100644 (file)
--- 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 c3767fecd1eb75429a605628ab95207040d09482..13fda95b624cf64ce2fbc32fed7b9a647b3d37e5 100644 (file)
--- 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 77ea13905fdb38cdbf6530cf656e73bca582febc..67b9c2513bb26ea74d4059aec15175dd1f9cc177 100644 (file)
--- 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 b90368cb13e9623bf4670f759d828fbe4d79c8cc..26d2f894a12bf30bb99a6223e8c097be8dcadd5c 100644 (file)
--- 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 091125d61b452010918880c46298c23d4a10930f..88185838e3ff8b2f414341aad11b710d8ad36811 100644 (file)
--- 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 58c0cda49eeefbdd2cbbbfceedfd48b8ab14ab39..2a2deb817298ffad11b728969696c7d4e9051e16 100644 (file)
--- 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 f82cc705fb41ad0bfda2e6134096859d528cc0b7..34c4399fe418787b6d137a0ab30ca3364f139ef7 100644 (file)
--- 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 ac2dd436f3847241a47f522d65ddbd24830dafc0..9f41a14a514c7f7b82f52f6566f6eced2fe6abc5 100644 (file)
--- 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 5beba1647b1796ea21ca9d0e7e30a91c8cefc936..4cc263c76eb3984268bcb21dba6f1a975f27e15a 100644 (file)
--- 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 7b48f204f2c305ea70b1d37b9ab736fac8b7df51..7a8bbef2c925e3080a23901ee084779e7a47a7a7 100644 (file)
--- 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 1db5a362bd4065b74136a86b3cf86f34a5285f16..bde2fec738ad1befd811f7c85710cf4bc1b90e82 100644 (file)
--- 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 d8da28e6cce0057d615c097fc3016e9ba341a9b9..b4a63a7118b87fa430948ec25e3761c8264e6a1f 100644 (file)
--- 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 a2529ce546709cf2d8ccf2aa4eb75ea9f1137355..ba872fe8e501fe66377eed33241d7669677351e7 100644 (file)
--- 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 9aae0e76c978c4ad76ce8bf7a48248bda9373545..7ff66c311c95890eb45738606b72786ffecde470 100644 (file)
--- 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 15c611b3ebbf05ef3bef259619739f5b4259dbca..dd7d0ac8952c930fecdfd4920d69f6a082daa5c7 100644 (file)
--- 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 906f7a9cce9cabce1bad48f0865cec532629ab2d..01d06314d7f8688a8470415ae3147e0e29c2156c 100644 (file)
--- 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 2521742521b337dd04f7aa10b4a0025318cc6b29..b952f157e57e442926fe26cf348dc72566708627 100644 (file)
--- 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 0e76fbb7f233b5c90b090bfe54a4df250d3d438b..c0cdbe080ba492161fc5580630831e75d8da7997 100644 (file)
--- 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 7456d1333e62877675476ac88c70d3def2adbf42..ed3a3bd538fcf569ab48badc136a6f2ccc39bfca 100644 (file)
--- 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 6f48f0180538f6e0011a4be40870c31f736679c3..051d67f220bc53e658045d98e251bc74ee7c8043 100644 (file)
--- 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 afc527b73504067b5a156414c23469e486388c62..afa05c8169b005072f4556a45e67a684e24df0e3 100644 (file)
--- 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 0bb64b6c9efe114a9f7bbb8a14aa70f7b6a99340..d39f98f561f595dc700b884fd18e328eec7b70ed 100644 (file)
--- 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"
 
 / {