From b208f116185a74218f523012d78cda5fe33d7a82 Mon Sep 17 00:00:00 2001 From: "Huang, Tao" Date: Thu, 22 Dec 2016 11:56:40 +0800 Subject: [PATCH] soc: rockchip: reboot-mode: rename BOOT_LOADER to BOOT_BL_DOWNLOAD Same as upstream. Change-Id: Id9042d288bdbac2fede7da4aee13cc7a32609d6d Signed-off-by: Huang, Tao --- arch/arm/boot/dts/rk3036.dtsi | 2 +- arch/arm/boot/dts/rk3288.dtsi | 2 +- arch/arm/boot/dts/rk3xxx.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3328.dtsi | 4 ++-- arch/arm64/boot/dts/rockchip/rk3366.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3368.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 4 ++-- include/dt-bindings/soc/rockchip,boot-mode.h | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi index b5e2a1757da1..b62836406e0a 100644 --- a/arch/arm/boot/dts/rk3036.dtsi +++ b/arch/arm/boot/dts/rk3036.dtsi @@ -380,7 +380,7 @@ mode-normal = ; mode-recovery = ; mode-bootloader = ; - mode-loader = ; + mode-loader = ; mode-ums = ; }; }; diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi index 09c67c9f5d5e..1782db41b42f 100644 --- a/arch/arm/boot/dts/rk3288.dtsi +++ b/arch/arm/boot/dts/rk3288.dtsi @@ -887,7 +887,7 @@ mode-normal = ; mode-recovery = ; mode-bootloader = ; - mode-loader = ; + mode-loader = ; mode-ums = ; }; }; diff --git a/arch/arm/boot/dts/rk3xxx.dtsi b/arch/arm/boot/dts/rk3xxx.dtsi index 860d1a31df57..f9d2025b43e4 100644 --- a/arch/arm/boot/dts/rk3xxx.dtsi +++ b/arch/arm/boot/dts/rk3xxx.dtsi @@ -255,7 +255,7 @@ mode-normal = ; mode-recovery = ; mode-bootloader = ; - mode-loader = ; + mode-loader = ; mode-ums = ; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi index 77c39308aa26..7f83b5ea3404 100644 --- 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 = ; + mode-bootloader = ; mode-charge = ; mode-fastboot = ; - mode-loader = ; + mode-loader = ; mode-normal = ; mode-recovery = ; mode-ums = ; diff --git a/arch/arm64/boot/dts/rockchip/rk3366.dtsi b/arch/arm64/boot/dts/rockchip/rk3366.dtsi index d1672ac6db75..91c6d6c1b60e 100644 --- a/arch/arm64/boot/dts/rockchip/rk3366.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3366.dtsi @@ -717,7 +717,7 @@ mode-normal = ; mode-recovery = ; mode-fastboot = ; - mode-loader = ; + mode-loader = ; }; pmu_pvtm: pmu-pvtm { diff --git a/arch/arm64/boot/dts/rockchip/rk3368.dtsi b/arch/arm64/boot/dts/rockchip/rk3368.dtsi index 2925233fd105..2fc473e93a01 100644 --- a/arch/arm64/boot/dts/rockchip/rk3368.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3368.dtsi @@ -749,7 +749,7 @@ mode-normal = ; mode-recovery = ; mode-bootloader = ; - mode-loader = ; + mode-loader = ; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi index 4c56705547bc..29f92788cd8e 100644 --- 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 = ; + mode-bootloader = ; mode-charge = ; mode-fastboot = ; - mode-loader = ; + mode-loader = ; mode-normal = ; mode-recovery = ; mode-ums = ; diff --git a/include/dt-bindings/soc/rockchip,boot-mode.h b/include/dt-bindings/soc/rockchip,boot-mode.h index 816a83b085ad..1dfc4f4fa759 100644 --- 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 */ -- 2.34.1