From cb58dac5a2f67c6cb5941800c09ea133bb566149 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E5=BC=A0=E6=99=B4?= Date: Thu, 4 Sep 2014 15:34:29 +0800 Subject: [PATCH] rk312x:clk:modify the vio clk dependencies --- arch/arm/boot/dts/rk312x-clocks.dtsi | 43 ++++++++++++++++++++++------ arch/arm/boot/dts/rk312x.dtsi | 6 ++-- 2 files changed, 38 insertions(+), 11 deletions(-) diff --git a/arch/arm/boot/dts/rk312x-clocks.dtsi b/arch/arm/boot/dts/rk312x-clocks.dtsi index d895b135adda..20ea35fc5f2a 100755 --- a/arch/arm/boot/dts/rk312x-clocks.dtsi +++ b/arch/arm/boot/dts/rk312x-clocks.dtsi @@ -155,6 +155,33 @@ #clock-cells = <0>; }; + hclk_vio_niu: hclk_vio_niu { + compatible = "rockchip,rk-fixed-factor-clock"; + clocks = <&hclk_vio_pre>; + clock-output-names = "hclk_vio_niu"; + clock-div = <1>; + clock-mult = <1>; + #clock-cells = <0>; + }; + + aclk_vio0_niu: aclk_vio0_niu { + compatible = "rockchip,rk-fixed-factor-clock"; + clocks = <&aclk_vio0_pre>; + clock-output-names = "aclk_vio0_niu"; + clock-div = <1>; + clock-mult = <1>; + #clock-cells = <0>; + }; + + aclk_vio1_niu: aclk_vio1_niu { + compatible = "rockchip,rk-fixed-factor-clock"; + clocks = <&aclk_vio1_pre>; + clock-output-names = "aclk_vio1_niu"; + clock-div = <1>; + clock-mult = <1>; + #clock-cells = <0>; + }; + }; pd_cons { @@ -1719,14 +1746,14 @@ compatible = "rockchip,rk3188-gate-clk"; reg = <0x00e8 0x4>; clocks = - <&aclk_vio0_pre>, <&hclk_vio_pre>, + <&aclk_vio0_niu>, <&hclk_vio_niu>, <&dummy>, <&dummy>, - <&hclk_vio_pre>, <&aclk_vio0_pre>, + <&hclk_vio_niu>, <&aclk_vio0_niu>, <&dummy>, <&dummy>, <&dummy>, <&dummy>, - <&hclk_vio_pre>, <&aclk_vio0_pre>, + <&hclk_vio_niu>, <&aclk_vio0_niu>, <&hclk_vio_pre>, <&aclk_vio0_pre>, <&dummy>, <&dummy>; @@ -1741,7 +1768,7 @@ "reserved", "reserved", "g_hclk_rga", "g_aclk_rga", - "g_hclk_vio_bus", "g_aclk_vio", + "hclk_vio_niu", "aclk_vio0_niu", "reserved", "reserved"; rockchip,suspend-clkgating-setting = <0x0000 0x0000>; @@ -1823,10 +1850,10 @@ <&dummy>, <&dummy>, <&pclk_pmu_pre>, <&pclk_pmu_pre>, - <&dummy>, <&hclk_vio_pre>, - <&hclk_vio_pre>, <&hclk_vio_pre>, + <&dummy>, <&hclk_vio_niu>, + <&hclk_vio_niu>, <&hclk_vio_niu>, - <&aclk_vio1_pre>, <&hclk_vio_pre>, + <&aclk_vio1_niu>, <&hclk_vio_niu>, <&aclk_vio1_pre>, <&dummy>, <&pclk_peri_pre>, <&hclk_peri_pre>, @@ -1840,7 +1867,7 @@ "g_pclk_mipi", "g_hclk_iep", "g_aclk_iep", "g_hclk_ebc", - "g_aclk_vio1_niu", "reserved", + "aclk_vio1_niu", "reserved", "g_pclk_sim_card", "g_hclk_usb_peri", "g_hclk_pe_arbi", "g_aclk_peri_niu"; diff --git a/arch/arm/boot/dts/rk312x.dtsi b/arch/arm/boot/dts/rk312x.dtsi index abcf99ec2e41..3a6102bdac27 100755 --- a/arch/arm/boot/dts/rk312x.dtsi +++ b/arch/arm/boot/dts/rk312x.dtsi @@ -386,15 +386,15 @@ <&clk_gates4 1>,/*pclk_peri_axi_matrix*/ /*hclk_vio_pre*/ - <&clk_gates6 12>,/*hclk_vio_niu*/ + //<&clk_gates6 12>,/*hclk_vio_niu*/ //<&clk_gates6 1>,/*hclk_lcdc*/ /*aclk_vio0_pre*/ - <&clk_gates6 13>,/*aclk_vio*/ + //<&clk_gates6 13>,/*aclk_vio*/ //<&clk_gates6 0>,/*aclk_lcdc*/ /*aclk_vio1_pre*/ - <&clk_gates9 10>,/*aclk_vio1_niu*/ + //<&clk_gates9 10>,/*aclk_vio1_niu*/ /*UART*/ <&clk_gates1 12>, -- 2.34.1