diff options
| author | Tony Lindgren <tony@atomide.com> | 2015-08-12 01:38:08 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2015-08-12 01:38:08 -0700 |
| commit | aced04843278662c9058a8ff72619af9a4d84065 (patch) | |
| tree | 60e4a32779e873d0d51428717c0725115e713a69 /arch/arm/boot/dts | |
| parent | ed05637c30e6d13e5793aab64d6a6e57e30228af (diff) | |
| parent | dff8a207815a605872dfc5bffc1bae1cad29d87c (diff) | |
| download | op-kernel-dev-aced04843278662c9058a8ff72619af9a4d84065.zip op-kernel-dev-aced04843278662c9058a8ff72619af9a4d84065.tar.gz | |
Merge branch 'for-4.3/ti-clk-dt' of https://github.com/t-kristo/linux-pm into omap-for-v4.3/dt-v2
Diffstat (limited to 'arch/arm/boot/dts')
| -rw-r--r-- | arch/arm/boot/dts/am4372.dtsi | 7 | ||||
| -rw-r--r-- | arch/arm/boot/dts/am43xx-clocks.dtsi | 9 |
2 files changed, 14 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi index 65c4334..15fbc56 100644 --- a/arch/arm/boot/dts/am4372.dtsi +++ b/arch/arm/boot/dts/am4372.dtsi @@ -549,8 +549,11 @@ #address-cells = <1>; #size-cells = <1>; ti,hwmods = "cpgmac0"; - clocks = <&cpsw_125mhz_gclk>, <&cpsw_cpts_rft_clk>; - clock-names = "fck", "cpts"; + clocks = <&cpsw_125mhz_gclk>, <&cpsw_cpts_rft_clk>, + <&dpll_clksel_mac_clk>; + clock-names = "fck", "cpts", "50mclk"; + assigned-clocks = <&dpll_clksel_mac_clk>; + assigned-clock-rates = <50000000>; status = "disabled"; cpdma_channels = <8>; ale_entries = <1024>; diff --git a/arch/arm/boot/dts/am43xx-clocks.dtsi b/arch/arm/boot/dts/am43xx-clocks.dtsi index d0c0dfa..cc88728 100644 --- a/arch/arm/boot/dts/am43xx-clocks.dtsi +++ b/arch/arm/boot/dts/am43xx-clocks.dtsi @@ -486,6 +486,15 @@ reg = <0x4238>; }; + dpll_clksel_mac_clk: dpll_clksel_mac_clk { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&dpll_core_m5_ck>; + reg = <0x4234>; + ti,bit-shift = <2>; + ti,dividers = <2>, <5>; + }; + clk_32k_mosc_ck: clk_32k_mosc_ck { #clock-cells = <0>; compatible = "fixed-clock"; |
