summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2014-07-07 05:05:42 -0700
committerTony Lindgren <tony@atomide.com>2014-07-07 05:05:42 -0700
commite9360979fea7eb1f3abdabb6a24a103c66aaa013 (patch)
treef924572bb2b61321dffa8f654820ad1571fded28
parent24faebd641ba75ccbbbb6d8f9131a32881e3dcd2 (diff)
parentdd94324b983afe114ba9e7ee3649313b451f63ce (diff)
downloadop-kernel-dev-e9360979fea7eb1f3abdabb6a24a103c66aaa013.zip
op-kernel-dev-e9360979fea7eb1f3abdabb6a24a103c66aaa013.tar.gz
Merge branch 'for-v3.16-rc/clk-dt-fixes' of https://github.com/t-kristo/linux-pm into fixes-rc4
-rw-r--r--arch/arm/boot/dts/dra7xx-clocks.dtsi10
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/dra7xx-clocks.dtsi b/arch/arm/boot/dts/dra7xx-clocks.dtsi
index c90c76d..dc7a292 100644
--- a/arch/arm/boot/dts/dra7xx-clocks.dtsi
+++ b/arch/arm/boot/dts/dra7xx-clocks.dtsi
@@ -673,10 +673,12 @@
l3_iclk_div: l3_iclk_div {
#clock-cells = <0>;
- compatible = "fixed-factor-clock";
+ compatible = "ti,divider-clock";
+ ti,max-div = <2>;
+ ti,bit-shift = <4>;
+ reg = <0x0100>;
clocks = <&dpll_core_h12x2_ck>;
- clock-mult = <1>;
- clock-div = <1>;
+ ti,index-power-of-two;
};
l4_root_clk_div: l4_root_clk_div {
@@ -684,7 +686,7 @@
compatible = "fixed-factor-clock";
clocks = <&l3_iclk_div>;
clock-mult = <1>;
- clock-div = <1>;
+ clock-div = <2>;
};
video1_clk2_div: video1_clk2_div {
OpenPOWER on IntegriCloud