From: chenxing <chenxing@rock-chips.com>
Date: Mon, 21 Jan 2013 02:35:29 +0000 (+0800)
Subject: rk3188: rename cpu_div parent name, remove while(1)
X-Git-Tag: firefly_0821_release~7885
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a582c42c62cabf2726c250b31a6525dd3b6e0bcf;p=firefly-linux-kernel-4.4.55.git

rk3188: rename cpu_div parent name, remove while(1)
---

diff --git a/arch/arm/mach-rk3188/clock_data.c b/arch/arm/mach-rk3188/clock_data.c
index 7295827c5c90..e20f93e69b01 100644
--- a/arch/arm/mach-rk3188/clock_data.c
+++ b/arch/arm/mach-rk3188/clock_data.c
@@ -1226,7 +1226,7 @@ static struct clk aclk_core = {
 	CRU_DIV_SET(0x7, 3, 8),
 };
 
-static struct clk *clk_cpu_div_parents[2] = {&arm_pll_clk, &clk_core_gpll_path};
+static struct clk *clk_cpu_div_parents[2] = {&arm_pll_clk, &general_pll_clk};
 static struct clk clk_cpu_div = {
 	.name		= "cpu_div",
 	.parent		= &arm_pll_clk,
@@ -3167,7 +3167,6 @@ void __init _rk30_clock_data_init(unsigned long gpll, unsigned long cpll, int fl
 	rk30_clk_dump_regs();
 
 	CLKDATA_DBG("%s clks register dbg end\n", __func__);
-	while(1);
 #endif
 	/*
 	 * Disable any unused clocks left on by the bootloader