projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
65dcf72
)
rk3188: rename cpu_div parent name, remove while(1)
author
chenxing
<chenxing@rock-chips.com>
Mon, 21 Jan 2013 02:35:29 +0000
(10:35 +0800)
committer
chenxing
<chenxing@rock-chips.com>
Mon, 21 Jan 2013 02:35:39 +0000
(10:35 +0800)
arch/arm/mach-rk3188/clock_data.c
patch
|
blob
|
history
diff --git
a/arch/arm/mach-rk3188/clock_data.c
b/arch/arm/mach-rk3188/clock_data.c
index 7295827c5c9059981dff14fd5acfd56c8b52640c..e20f93e69b0181ee64c1020c31ae3b9b1db999f0 100644
(file)
--- 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