From: Kever Yang Date: Mon, 22 Jul 2019 12:01:59 +0000 (+0800) Subject: rockchip: convert to use ROCKCHIP_BOOT_MODE_REG for fastboot tag X-Git-Tag: v2019.10-rc1~6^2~22 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=283e61a6615b66f2539ebecafe274d9608911be1;p=oweals%2Fu-boot.git rockchip: convert to use ROCKCHIP_BOOT_MODE_REG for fastboot tag The fastboot_set_reboot_flag() update a TAG into a register for next boot, use the common macro for the register so that we can re-use the function for different SoCs. Signed-off-by: Kever Yang --- diff --git a/arch/arm/mach-rockchip/rk3128-board.c b/arch/arm/mach-rockchip/rk3128-board.c index 0945829d0e..636ee65fee 100644 --- a/arch/arm/mach-rockchip/rk3128-board.c +++ b/arch/arm/mach-rockchip/rk3128-board.c @@ -111,12 +111,9 @@ int board_usb_cleanup(int index, enum usb_init_type init) #if CONFIG_IS_ENABLED(FASTBOOT) int fastboot_set_reboot_flag(void) { - struct rk3128_grf *grf; - printf("Setting reboot to fastboot flag ...\n"); - grf = syscon_get_first_range(ROCKCHIP_SYSCON_GRF); /* Set boot mode to fastboot */ - writel(BOOT_FASTBOOT, &grf->os_reg[0]); + writel(BOOT_FASTBOOT, CONFIG_ROCKCHIP_BOOT_MODE_REG); return 0; } diff --git a/arch/arm/mach-rockchip/rk322x-board.c b/arch/arm/mach-rockchip/rk322x-board.c index e7a1e54874..c0a537616c 100644 --- a/arch/arm/mach-rockchip/rk322x-board.c +++ b/arch/arm/mach-rockchip/rk322x-board.c @@ -115,12 +115,9 @@ int board_usb_cleanup(int index, enum usb_init_type init) #if CONFIG_IS_ENABLED(FASTBOOT) int fastboot_set_reboot_flag(void) { - struct rk322x_grf *grf; - printf("Setting reboot to fastboot flag ...\n"); - grf = syscon_get_first_range(ROCKCHIP_SYSCON_GRF); /* Set boot mode to fastboot */ - writel(BOOT_FASTBOOT, &grf->os_reg[0]); + writel(BOOT_FASTBOOT, CONFIG_ROCKCHIP_BOOT_MODE_REG); return 0; }