dtsi: dtbo: change dto partition name to dtbo [1/2]

PD#173146

Problem:
All devices launching with Android 9 must use dtbo partition

Solution:
Android P request device tree overlay partition name is dtbo

Verify:
verified by p212 board in Android P

Change-Id: If48b6eaf0a0ee2d76a5fb0b58353fb82381c71ee
Signed-off-by: Tellen Yu <tellen.yu@amlogic.com>
Signed-off-by: Xindong Xu <xindong.xu@amlogic.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index f0587b35d3c8e8d3881633951d040bfe2f3b44f3..a0ab2c324806103c5390dc1d240bd87dc1223b2f 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -14616,7 +14616,6 @@ M:      Xindong Xu  <xindong.xu@amlogic.com>
 F:     arch/arm64/boot/dts/amlogic/firmware_avb_system.dtsi
 F:      arch/arm64/boot/dts/amlogic/firmware_system.dtsi
 
-
 AMLOGIC SYSTEM AS ROOT
 M:     Renjun Xu  <renjun.xu@amlogic.com>
 F:     arch/arm64/boot/dts/amlogic/axg_s400_v03gva.dts
@@ -14636,3 +14635,8 @@ AMLOGIC TL1 CLOCK DRIVERS
 M:     Jian Hu <jian.hu@amlogic.com>
 F:     include/dt-bindings/clock/amlogic,tl1-clkc.h
 F:     drivers/amlogic/clk/tl1/*
+
+AMLOGIC DTBO PARTITION
+M:      Xindong Xu  <xindong.xu@amlogic.com>
+F:     arch/arm64/boot/dts/amlogic/common_overlay_dt.dts
+F:      arch/arm/boot/dts/amlogic/common_overlay_dt.dts

diff --git a/arch/arm/boot/dts/amlogic/common_overlay_dt.dts b/arch/arm/boot/dts/amlogic/common_overlay_dt.dts
new file mode 100644 (file)
index 0000000..842906d
--- /dev/null
+++ b/arch/arm/boot/dts/amlogic/common_overlay_dt.dts
@@ -0,0 +1,23 @@
+/*
+ * arch/arm64/boot/dts/amlogic/common_overlay_dt.dts
+ *
+ * Copyright (C) 2017 Amlogic, Inc. 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 as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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/;
+/plugin/;
+
+&amlogic_codec {
+       status = "okay";
+};

diff --git a/arch/arm/boot/dts/amlogic/partition_mbox_normal.dtsi b/arch/arm/boot/dts/amlogic/partition_mbox_normal.dtsi
index 6a968f8a331ce9955a1690c359f6b4c111060380..a556771ad83769b8d34a245678742ee8a5e4f2c0 100644 (file)
--- a/arch/arm/boot/dts/amlogic/partition_mbox_normal.dtsi
+++ b/arch/arm/boot/dts/amlogic/partition_mbox_normal.dtsi
@@ -12,7 +12,7 @@
                part-0 = <&logo>;
                part-1 = <&recovery>;
                part-2 = <&misc>;
-               part-3 = <&dto>;
+               part-3 = <&dtbo>;
                part-4 = <&cri_data>;
                part-5 = <&param>;
                part-6 = <&boot>;
@@ -39,8 +39,8 @@
                        size = <0x0 0x800000>;
                        mask = <1>;
                };
-               dto:dto{
-                       pname = "dto";
+               dtbo:dtbo{
+                       pname = "dtbo";
                        size = <0x0 0x800000>;
                        mask = <1>;
                };

diff --git a/arch/arm/boot/dts/amlogic/partition_mbox_normal_P_32.dtsi b/arch/arm/boot/dts/amlogic/partition_mbox_normal_P_32.dtsi
index 1f519c8b671054c69a10c18b131b4d4a06354797..f2c574203d535a61f7116c6cfb59084c3f50ec4e 100644 (file)
--- a/arch/arm/boot/dts/amlogic/partition_mbox_normal_P_32.dtsi
+++ b/arch/arm/boot/dts/amlogic/partition_mbox_normal_P_32.dtsi
@@ -15,7 +15,7 @@
                part-0 = <&logo>;
                part-1 = <&recovery>;
                part-2 = <&misc>;
-               part-3 = <&dto>;
+               part-3 = <&dtbo>;
                part-4 = <&cri_data>;
                part-5 = <&param>;
                part-6 = <&boot>;
@@ -45,8 +45,8 @@
                        size = <0x0 0x800000>;
                        mask = <1>;
                };
-               dto:dto{
-                       pname = "dto";
+               dtbo:dtbo{
+                       pname = "dtbo";
                        size = <0x0 0x800000>;
                        mask = <1>;
                };

diff --git a/arch/arm/boot/dts/amlogic/partition_mbox_normal_P_64.dtsi b/arch/arm/boot/dts/amlogic/partition_mbox_normal_P_64.dtsi
index f8f8bc593d08c7605dc62cef7ed2a6f74d130699..2b8e7304cac6cf9d3516f4ba70b672c31d00b059 100644 (file)
--- a/arch/arm/boot/dts/amlogic/partition_mbox_normal_P_64.dtsi
+++ b/arch/arm/boot/dts/amlogic/partition_mbox_normal_P_64.dtsi
@@ -15,7 +15,7 @@
                part-0 = <&logo>;
                part-1 = <&recovery>;
                part-2 = <&misc>;
-               part-3 = <&dto>;
+               part-3 = <&dtbo>;
                part-4 = <&cri_data>;
                part-5 = <&param>;
                part-6 = <&boot>;
@@ -45,8 +45,8 @@
                        size = <0x0 0x800000>;
                        mask = <1>;
                };
-               dto:dto{
-                       pname = "dto";
+               dtbo:dtbo{
+                       pname = "dtbo";
                        size = <0x0 0x800000>;
                        mask = <1>;
                };

diff --git a/arch/arm64/boot/dts/amlogic/common_overlay_dt.dts b/arch/arm64/boot/dts/amlogic/common_overlay_dt.dts
new file mode 100644 (file)
index 0000000..842906d
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/common_overlay_dt.dts
@@ -0,0 +1,23 @@
+/*
+ * arch/arm64/boot/dts/amlogic/common_overlay_dt.dts
+ *
+ * Copyright (C) 2017 Amlogic, Inc. 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 as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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/;
+/plugin/;
+
+&amlogic_codec {
+       status = "okay";
+};

diff --git a/arch/arm64/boot/dts/amlogic/partition_mbox_normal.dtsi b/arch/arm64/boot/dts/amlogic/partition_mbox_normal.dtsi
index 6a968f8a331ce9955a1690c359f6b4c111060380..a556771ad83769b8d34a245678742ee8a5e4f2c0 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/partition_mbox_normal.dtsi
+++ b/arch/arm64/boot/dts/amlogic/partition_mbox_normal.dtsi
@@ -12,7 +12,7 @@
                part-0 = <&logo>;
                part-1 = <&recovery>;
                part-2 = <&misc>;
-               part-3 = <&dto>;
+               part-3 = <&dtbo>;
                part-4 = <&cri_data>;
                part-5 = <&param>;
                part-6 = <&boot>;
@@ -39,8 +39,8 @@
                        size = <0x0 0x800000>;
                        mask = <1>;
                };
-               dto:dto{
-                       pname = "dto";
+               dtbo:dtbo{
+                       pname = "dtbo";
                        size = <0x0 0x800000>;
                        mask = <1>;
                };

diff --git a/arch/arm64/boot/dts/amlogic/partition_mbox_normal_P_32.dtsi b/arch/arm64/boot/dts/amlogic/partition_mbox_normal_P_32.dtsi
index 1f519c8b671054c69a10c18b131b4d4a06354797..f2c574203d535a61f7116c6cfb59084c3f50ec4e 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/partition_mbox_normal_P_32.dtsi
+++ b/arch/arm64/boot/dts/amlogic/partition_mbox_normal_P_32.dtsi
@@ -15,7 +15,7 @@
                part-0 = <&logo>;
                part-1 = <&recovery>;
                part-2 = <&misc>;
-               part-3 = <&dto>;
+               part-3 = <&dtbo>;
                part-4 = <&cri_data>;
                part-5 = <&param>;
                part-6 = <&boot>;
@@ -45,8 +45,8 @@
                        size = <0x0 0x800000>;
                        mask = <1>;
                };
-               dto:dto{
-                       pname = "dto";
+               dtbo:dtbo{
+                       pname = "dtbo";
                        size = <0x0 0x800000>;
                        mask = <1>;
                };

diff --git a/arch/arm64/boot/dts/amlogic/partition_mbox_normal_P_32_atom.dtsi b/arch/arm64/boot/dts/amlogic/partition_mbox_normal_P_32_atom.dtsi
index b1db28aa1f1a4b2af2cb62d774724b366b58cddd..8d1cf304299c84c10fadd95f12e12400fa7422bd 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/partition_mbox_normal_P_32_atom.dtsi
+++ b/arch/arm64/boot/dts/amlogic/partition_mbox_normal_P_32_atom.dtsi
@@ -15,7 +15,7 @@
                part-0 = <&logo>;
                part-1 = <&recovery>;
                part-2 = <&misc>;
-               part-3 = <&dto>;
+               part-3 = <&dtbo>;
                part-4 = <&cri_data>;
                part-5 = <&param>;
                part-6 = <&boot>;
@@ -45,8 +45,8 @@
                        size = <0x0 0x800000>;
                        mask = <1>;
                };
-               dto:dto{
-                       pname = "dto";
+               dtbo:dtbo{
+                       pname = "dtbo";
                        size = <0x0 0x800000>;
                        mask = <1>;
                };

diff --git a/arch/arm64/boot/dts/amlogic/partition_mbox_normal_P_32_sei.dtsi b/arch/arm64/boot/dts/amlogic/partition_mbox_normal_P_32_sei.dtsi
index dffdb42ff27c540adb3c41c03d340dd7fe405708..65dfed139ec381d44b00258d634dae899b1ae8cf 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/partition_mbox_normal_P_32_sei.dtsi
+++ b/arch/arm64/boot/dts/amlogic/partition_mbox_normal_P_32_sei.dtsi
@@ -15,7 +15,7 @@
                part-0 = <&logo>;
                part-1 = <&recovery>;
                part-2 = <&misc>;
-               part-3 = <&dto>;
+               part-3 = <&dtbo>;
                part-4 = <&cri_data>;
                part-5 = <&param>;
                part-6 = <&boot>;
@@ -45,8 +45,8 @@
                        size = <0x0 0x800000>;
                        mask = <1>;
                };
-               dto:dto{
-                       pname = "dto";
+               dtbo:dtbo{
+                       pname = "dtbo";
                        size = <0x0 0x800000>;
                        mask = <1>;
                };

diff --git a/arch/arm64/boot/dts/amlogic/partition_mbox_normal_P_64.dtsi b/arch/arm64/boot/dts/amlogic/partition_mbox_normal_P_64.dtsi
index f8f8bc593d08c7605dc62cef7ed2a6f74d130699..2b8e7304cac6cf9d3516f4ba70b672c31d00b059 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/partition_mbox_normal_P_64.dtsi
+++ b/arch/arm64/boot/dts/amlogic/partition_mbox_normal_P_64.dtsi
@@ -15,7 +15,7 @@
                part-0 = <&logo>;
                part-1 = <&recovery>;
                part-2 = <&misc>;
-               part-3 = <&dto>;
+               part-3 = <&dtbo>;
                part-4 = <&cri_data>;
                part-5 = <&param>;
                part-6 = <&boot>;
@@ -45,8 +45,8 @@
                        size = <0x0 0x800000>;
                        mask = <1>;
                };
-               dto:dto{
-                       pname = "dto";
+               dtbo:dtbo{
+                       pname = "dtbo";
                        size = <0x0 0x800000>;
                        mask = <1>;
                };

diff --git a/arch/arm64/boot/dts/amlogic/partition_mbox_normal_sei32bit.dtsi b/arch/arm64/boot/dts/amlogic/partition_mbox_normal_sei32bit.dtsi
index 75984be932872911776b72fb4e78aa530976e463..6ca9cb94166c3b2bfd2bd0d8e64406f59f9c0b8b 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/partition_mbox_normal_sei32bit.dtsi
+++ b/arch/arm64/boot/dts/amlogic/partition_mbox_normal_sei32bit.dtsi
@@ -12,7 +12,7 @@
                part-0 = <&logo>;
                part-1 = <&recovery>;
                part-2 = <&misc>;
-               part-3 = <&dto>;
+               part-3 = <&dtbo>;
                part-4 = <&cri_data>;
                part-5 = <&param>;
                part-6 = <&boot>;
@@ -39,8 +39,8 @@
                        size = <0x0 0x800000>;
                        mask = <1>;
                };
-               dto:dto{
-                       pname = "dto";
+               dtbo:dtbo{
+                       pname = "dtbo";
                        size = <0x0 0x800000>;
                        mask = <1>;
                };