From: 黄涛 <huangtao@rock-chips.com>
Date: Tue, 29 Apr 2014 10:24:47 +0000 (+0800)
Subject: ARM: rockchip: rk3288: pmu reset by second global soft reset
X-Git-Tag: firefly_0821_release~5406
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e17655ff42a69eaa348b7b0e8b39a2ff6ab95c47;p=firefly-linux-kernel-4.4.55.git

ARM: rockchip: rk3288: pmu reset by second global soft reset
---

diff --git a/arch/arm/mach-rockchip/rk3288.c b/arch/arm/mach-rockchip/rk3288.c
index c74793df4cf9..834b7850bd62 100644
--- a/arch/arm/mach-rockchip/rk3288.c
+++ b/arch/arm/mach-rockchip/rk3288.c
@@ -124,11 +124,19 @@ extern void secondary_startup(void);
 
 static void __init rk3288_dt_map_io(void)
 {
+	u32 v;
+
+	rockchip_soc_id = ROCKCHIP_SOC_RK3288;
+
 	iotable_init(rk3288_io_desc, ARRAY_SIZE(rk3288_io_desc));
 	debug_ll_io_init();
 	usb_uart_init();
 
-	rockchip_soc_id = ROCKCHIP_SOC_RK3288;
+	/* pmu reset by second global soft reset */
+	v = readl_relaxed(RK_CRU_VIRT + RK3288_CRU_GLB_RST_CON);
+	v &= ~(3 << 2);
+	v |= 1 << 2;
+	writel_relaxed(v, RK_CRU_VIRT + RK3288_CRU_GLB_RST_CON);
 
 	/* rkpwm is used instead of old pwm */
 	writel_relaxed(0x00010001, RK_GRF_VIRT + RK3288_GRF_SOC_CON2);