diff options
author | Tony Lindgren <tony@atomide.com> | 2016-04-08 09:18:00 -0700 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2016-04-08 09:18:00 -0700 |
commit | 19e831b272e6db5884be085be66e44da975c73a9 (patch) | |
tree | 8812543bc66dc531e4720f5119107e7de3447a46 /arch/arm/boot/dts | |
parent | 6f40fed1c911f218e1e189a404b26ef19effabb5 (diff) | |
parent | 571afb4c8a4bbe88541364e7f6827340562f2736 (diff) | |
download | op-kernel-dev-19e831b272e6db5884be085be66e44da975c73a9.zip op-kernel-dev-19e831b272e6db5884be085be66e44da975c73a9.tar.gz |
Merge branch 'fixes-rc2' into omap-for-v4.6/fixes
Diffstat (limited to 'arch/arm/boot/dts')
-rw-r--r-- | arch/arm/boot/dts/dra7xx-clocks.dtsi | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/dra7xx-clocks.dtsi b/arch/arm/boot/dts/dra7xx-clocks.dtsi index d0bae06..ef2164a 100644 --- a/arch/arm/boot/dts/dra7xx-clocks.dtsi +++ b/arch/arm/boot/dts/dra7xx-clocks.dtsi @@ -98,12 +98,20 @@ clock-frequency = <32768>; }; - sys_32k_ck: sys_32k_ck { + sys_clk32_crystal_ck: sys_clk32_crystal_ck { #clock-cells = <0>; compatible = "fixed-clock"; clock-frequency = <32768>; }; + sys_clk32_pseudo_ck: sys_clk32_pseudo_ck { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&sys_clkin1>; + clock-mult = <1>; + clock-div = <610>; + }; + virt_12000000_ck: virt_12000000_ck { #clock-cells = <0>; compatible = "fixed-clock"; @@ -2170,4 +2178,12 @@ ti,bit-shift = <22>; reg = <0x0558>; }; + + sys_32k_ck: sys_32k_ck { + #clock-cells = <0>; + compatible = "ti,mux-clock"; + clocks = <&sys_clk32_crystal_ck>, <&sys_clk32_pseudo_ck>, <&sys_clk32_pseudo_ck>, <&sys_clk32_pseudo_ck>; + ti,bit-shift = <8>; + reg = <0x6c4>; + }; }; |