From: 张晴 <zhangqing@rock-chips.com>
Date: Tue, 22 Jul 2014 01:32:37 +0000 (+0800)
Subject: rk3036:clk:modify mac clk init
X-Git-Tag: firefly_0821_release~4916^2~185
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a68a3b3bd2a18f801a3f60ef6fc8599c66e9d806;p=firefly-linux-kernel-4.4.55.git

rk3036:clk:modify mac clk init
---

diff --git a/arch/arm/boot/dts/rk3036-clocks.dtsi b/arch/arm/boot/dts/rk3036-clocks.dtsi
index 95e06abf3177..a65969c7b449 100755
--- a/arch/arm/boot/dts/rk3036-clocks.dtsi
+++ b/arch/arm/boot/dts/rk3036-clocks.dtsi
@@ -867,6 +867,7 @@
 						#clock-cells = <0>;
 						rockchip,clkops-idx =
 							<CLKOPS_RATE_MUX_DIV>;
+						#clock-init-cells = <1>;
 					};
 
 					clk_mac_ref_div: clk_mac_ref_div {
@@ -1243,7 +1244,7 @@
 						<&dummy>,		<&dummy>,
 						<&dclk_lcdc1>,		<&dummy>,
 
-						<&dummy>,			<&dummy>,
+						<&dummy>,			<&hclk_peri_pre>,
 						<&dummy>,		<&dummy>,
 
 						<&pclk_cpu_pre>,		<&dummy>,
@@ -1256,7 +1257,7 @@
 						"reserved",		"reserved",
 						"dclk_lcdc1",		"reserved",
 
-						"reserved",		"reserved",
+						"reserved",		"g_hclk_mac",
 						"reserved",		"reserved",
 
 						"g_pclk_hdmi",		"reserved",
diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi
index 33b47e4be7c6..535ee42a2929 100755
--- a/arch/arm/boot/dts/rk3036.dtsi
+++ b/arch/arm/boot/dts/rk3036.dtsi
@@ -249,7 +249,8 @@
 			<&hclk_peri_pre 75000000>, <&pclk_peri_pre 75000000>,
 			<&clk_gpu_pre 300000000>,	 <&aclk_vio_pre 300000000>,
 			<&hclk_vio_pre 150000000>, <&aclk_vcodec_pre 300000000>,
-			<&clk_hevc_core 200000000>, <&clk_mac_ref_div 50000000>;
+			<&clk_hevc_core 200000000>, <&clk_mac_pll_div 50000000>,
+			<&clk_mac_ref_div 50000000>;
 	/*	rockchip,clocks-uboot-has-init =
 			<&aclk_vio1>;*/
 	};