soc: rockchip: reboot-mode: rename BOOT_LOADER to BOOT_BL_DOWNLOAD

Same as upstream.

Change-Id: Id9042d288bdbac2fede7da4aee13cc7a32609d6d
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi
index b5e2a1757da1ab72fde5fdbed009c0ee3d5becf8..b62836406e0a359dba1c890ee5e2639b525df413 100644 (file)
--- a/arch/arm/boot/dts/rk3036.dtsi
+++ b/arch/arm/boot/dts/rk3036.dtsi
@@ -380,7 +380,7 @@
                        mode-normal = <BOOT_NORMAL>;
                        mode-recovery = <BOOT_RECOVERY>;
                        mode-bootloader = <BOOT_FASTBOOT>;
-                       mode-loader = <BOOT_LOADER>;
+                       mode-loader = <BOOT_BL_DOWNLOAD>;
                        mode-ums = <BOOT_UMS>;
                };
        };

diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index 09c67c9f5d5e73ebc43a3623c45334fdf37e5be2..1782db41b42fd951ea574260cfd581ac58d73cf8 100644 (file)
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -887,7 +887,7 @@
                        mode-normal = <BOOT_NORMAL>;
                        mode-recovery = <BOOT_RECOVERY>;
                        mode-bootloader = <BOOT_FASTBOOT>;
-                       mode-loader = <BOOT_LOADER>;
+                       mode-loader = <BOOT_BL_DOWNLOAD>;
                        mode-ums = <BOOT_UMS>;
                };
        };

diff --git a/arch/arm/boot/dts/rk3xxx.dtsi b/arch/arm/boot/dts/rk3xxx.dtsi
index 860d1a31df57c66fcb4d38d84800e527d451d518..f9d2025b43e4ab6893ee93b5236c50c2c328213f 100644 (file)
--- a/arch/arm/boot/dts/rk3xxx.dtsi
+++ b/arch/arm/boot/dts/rk3xxx.dtsi
@@ -255,7 +255,7 @@
                        mode-normal = <BOOT_NORMAL>;
                        mode-recovery = <BOOT_RECOVERY>;
                        mode-bootloader = <BOOT_FASTBOOT>;
-                       mode-loader = <BOOT_LOADER>;
+                       mode-loader = <BOOT_BL_DOWNLOAD>;
                        mode-ums = <BOOT_UMS>;
                };
        };

diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
index 77c39308aa2681042cfcb0431db77dc09c036bd6..7f83b5ea340494ef29a951e392d6daf65ac4f257 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
@@ -234,10 +234,10 @@
                reboot-mode {
                        compatible = "syscon-reboot-mode";
                        offset = <0x5c8>;
-                       mode-bootloader = <BOOT_LOADER>;
+                       mode-bootloader = <BOOT_BL_DOWNLOAD>;
                        mode-charge = <BOOT_CHARGING>;
                        mode-fastboot = <BOOT_FASTBOOT>;
-                       mode-loader = <BOOT_LOADER>;
+                       mode-loader = <BOOT_BL_DOWNLOAD>;
                        mode-normal = <BOOT_NORMAL>;
                        mode-recovery = <BOOT_RECOVERY>;
                        mode-ums = <BOOT_UMS>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3366.dtsi b/arch/arm64/boot/dts/rockchip/rk3366.dtsi
index d1672ac6db7569e3edddc6a1ec289ba9dded08a9..91c6d6c1b60e793a0ac0a9368cb54ffdb753524a 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3366.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3366.dtsi
@@ -717,7 +717,7 @@
                        mode-normal = <BOOT_NORMAL>;
                        mode-recovery = <BOOT_RECOVERY>;
                        mode-fastboot = <BOOT_FASTBOOT>;
-                       mode-loader = <BOOT_LOADER>;
+                       mode-loader = <BOOT_BL_DOWNLOAD>;
                };
 
                pmu_pvtm: pmu-pvtm {

diff --git a/arch/arm64/boot/dts/rockchip/rk3368.dtsi b/arch/arm64/boot/dts/rockchip/rk3368.dtsi
index 2925233fd10552c5774c7b6d1dde3f8ce4b87c29..2fc473e93a01046955f3e846c9078637d7163c45 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3368.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3368.dtsi
@@ -749,7 +749,7 @@
                        mode-normal = <BOOT_NORMAL>;
                        mode-recovery = <BOOT_RECOVERY>;
                        mode-bootloader = <BOOT_FASTBOOT>;
-                       mode-loader = <BOOT_LOADER>;
+                       mode-loader = <BOOT_BL_DOWNLOAD>;
 
                };
        };

diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
index 4c56705547bcb7c8c89aef97d069395c0e3401a7..29f92788cd8e428677c6dcb3e2678b94abac99b0 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -1106,10 +1106,10 @@
                reboot-mode {
                        compatible = "syscon-reboot-mode";
                        offset = <0x300>;
-                       mode-bootloader = <BOOT_LOADER>;
+                       mode-bootloader = <BOOT_BL_DOWNLOAD>;
                        mode-charge = <BOOT_CHARGING>;
                        mode-fastboot = <BOOT_FASTBOOT>;
-                       mode-loader = <BOOT_LOADER>;
+                       mode-loader = <BOOT_BL_DOWNLOAD>;
                        mode-normal = <BOOT_NORMAL>;
                        mode-recovery = <BOOT_RECOVERY>;
                        mode-ums = <BOOT_UMS>;

diff --git a/include/dt-bindings/soc/rockchip,boot-mode.h b/include/dt-bindings/soc/rockchip,boot-mode.h
index 816a83b085ad1e1d35baa6720547b7be5216d9a0..1dfc4f4fa759dedd143a3998f10ce30e4220f48e 100644 (file)
--- a/include/dt-bindings/soc/rockchip,boot-mode.h
+++ b/include/dt-bindings/soc/rockchip,boot-mode.h
@@ -5,8 +5,8 @@
 #define REBOOT_FLAG            0x5242C300
 /* normal boot */
 #define BOOT_NORMAL            (REBOOT_FLAG + 0)
-/* enter loader rockusb mode */
-#define BOOT_LOADER            (REBOOT_FLAG + 1)
+/* enter bootloader rockusb mode */
+#define BOOT_BL_DOWNLOAD       (REBOOT_FLAG + 1)
 /* enter recovery */
 #define BOOT_RECOVERY          (REBOOT_FLAG + 3)
 /* enter fastboot mode */