From: 黄涛 <huangtao@rock-chips.com>
Date: Thu, 13 Sep 2012 01:28:12 +0000 (+0800)
Subject: rk2928: timer: fix timer clk parent name
X-Git-Tag: firefly_0821_release~8636
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c9842f0488964fbe48cf30cc627c9585b97a6950;p=firefly-linux-kernel-4.4.55.git

rk2928: timer: fix timer clk parent name
---

diff --git a/arch/arm/mach-rk2928/timer.c b/arch/arm/mach-rk2928/timer.c
index 1969681c8285..d0a8241e7faf 100644
--- a/arch/arm/mach-rk2928/timer.c
+++ b/arch/arm/mach-rk2928/timer.c
@@ -125,9 +125,9 @@ static __init int rk2928_timer_init_clockevent(void)
 	struct clock_event_device *ce = &rk2928_timer_clockevent;
 	struct clk *clk = clk_get(NULL, TIMER_CLKEVT_NAME);
 	struct clk *pclk = clk_get(NULL, "pclk_" TIMER_CLKEVT_NAME);
-	struct clk *pclk_periph = clk_get(NULL, "pclk_periph");
+	struct clk *peri_pclk = clk_get(NULL, "peri_pclk");
 
-	clk_set_parent(clk, pclk_periph);
+	clk_set_parent(clk, peri_pclk);
 	clk_enable(pclk);
 	clk_enable(clk);
 
@@ -163,9 +163,9 @@ static void __init rk2928_timer_init_clocksource(void)
 	struct clocksource *cs = &rk2928_timer_clocksource;
 	struct clk *clk = clk_get(NULL, TIMER_CLKSRC_NAME);
 	struct clk *pclk = clk_get(NULL, "pclk_" TIMER_CLKSRC_NAME);
-	struct clk *pclk_periph = clk_get(NULL, "pclk_periph");
+	struct clk *peri_pclk = clk_get(NULL, "peri_pclk");
 
-	clk_set_parent(clk, pclk_periph);
+	clk_set_parent(clk, peri_pclk);
 	clk_enable(pclk);
 	clk_enable(clk);