From: wdc <wdc@rock-chips.com>
Date: Mon, 14 Jul 2014 13:43:34 +0000 (+0800)
Subject: 3036: fix boot mode register
X-Git-Tag: firefly_0821_release~4916^2~239
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=71f77e9722a156121229e500c822da9cbc5399f5;p=firefly-linux-kernel-4.4.55.git

3036: fix boot mode register
---

diff --git a/arch/arm/mach-rockchip/rk3036.c b/arch/arm/mach-rockchip/rk3036.c
index b9e01522251c..a992fe03f6ca 100755
--- a/arch/arm/mach-rockchip/rk3036.c
+++ b/arch/arm/mach-rockchip/rk3036.c
@@ -72,8 +72,8 @@ static struct map_desc rk3036_io_desc[] __initdata = {
 
 static void __init rk3036_boot_mode_init(void)
 {
-	u32 flag = readl_relaxed(RK_GRF_VIRT + RK3036_GRF_OS_REG0);
-	u32 mode = readl_relaxed(RK_GRF_VIRT + RK3036_GRF_OS_REG1);
+	u32 flag = readl_relaxed(RK_GRF_VIRT + RK3036_GRF_OS_REG4);
+	u32 mode = readl_relaxed(RK_GRF_VIRT + RK3036_GRF_OS_REG5);
 	u32 rst_st = readl_relaxed(RK_CRU_VIRT + RK3036_CRU_RST_ST);
 
 	if (flag == (SYS_KERNRL_REBOOT_FLAG | BOOT_RECOVER))
@@ -189,8 +189,8 @@ static void rk3036_restart(char mode, const char *cmd)
 
 	rockchip_restart_get_boot_mode(cmd, &boot_flag, &boot_mode);
 
-	writel_relaxed(boot_flag, RK_GRF_VIRT + RK3036_GRF_OS_REG0);	// for loader
-	writel_relaxed(boot_mode, RK_GRF_VIRT + RK3036_GRF_OS_REG1);	// for linux
+	writel_relaxed(boot_flag, RK_GRF_VIRT + RK3036_GRF_OS_REG4);	// for loader
+	writel_relaxed(boot_mode, RK_GRF_VIRT + RK3036_GRF_OS_REG5);	// for linux
 	dsb();
 
 	/* pll enter slow mode */