From: 张晴 <zhangqing@rock-chips.com>
Date: Wed, 20 Aug 2014 01:22:11 +0000 (+0800)
Subject: rk312x:clk:modify pvtm clk name to g_clk_pvtm
X-Git-Tag: firefly_0821_release~4855
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=762b88e28ddbbcb8b52de8d09de2f270fd426215;p=firefly-linux-kernel-4.4.55.git

rk312x:clk:modify pvtm clk name to g_clk_pvtm
---

diff --git a/arch/arm/boot/dts/rk312x-clocks.dtsi b/arch/arm/boot/dts/rk312x-clocks.dtsi
index 9fa75d796fed..89949477da55 100755
--- a/arch/arm/boot/dts/rk312x-clocks.dtsi
+++ b/arch/arm/boot/dts/rk312x-clocks.dtsi
@@ -119,10 +119,10 @@
 				#clock-cells = <0>;
 			};
 
-			clk_pvtm_func: clk_pvtm_func {
+			g_clk_pvtm_func: g_clk_pvtm_func {
 				compatible = "rockchip,rk-fixed-factor-clock";
 				clocks = <&xin24m>;
-				clock-output-names = "clk_pvtm_func";
+				clock-output-names = "g_clk_pvtm_func";
 				clock-div = <1>;
 				clock-mult = <1>;
 				#clock-cells = <0>;
@@ -425,7 +425,7 @@
 					clk_pvtm_div: clk_pvtm_div {
 						compatible = "rockchip,rk3188-mux-con";
 						rockchip,bits = <0 7>;
-						clocks = <&clk_pvtm_func>;
+						clocks = <&g_clk_pvtm_func>;
 						clock-output-names = "clk_pvtm";
 						rockchip,div-type = <CLK_DIVIDER_PLUS_ONE>;
 						#clock-cells = <0>;
@@ -1867,8 +1867,8 @@
 						<&hclk_peri_pre>,		<&clk_nandc>;
 
 					clock-output-names =
-						"clk_pvtm_core",		"clk_pvtm_gpu",
-						"clk_pvtm_func",		"clk_timer0",
+						"g_clk_pvtm_core",		"g_clk_pvtm_gpu",
+						"g_clk_pvtm_func",		"clk_timer0",
 
 						"clk_timer1",		"clk_timer2",
 						"clk_timer3",		"clk_timer4",