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/am4372.dtsi | |
| parent | ed05637c30e6d13e5793aab64d6a6e57e30228af (diff) | |
| parent | dff8a207815a605872dfc5bffc1bae1cad29d87c (diff) | |
| download | blackbird-obmc-linux-aced04843278662c9058a8ff72619af9a4d84065.tar.gz blackbird-obmc-linux-aced04843278662c9058a8ff72619af9a4d84065.zip | |
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/am4372.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/am4372.dtsi | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi index 65c43346f20b..15fbc56596cc 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>; |
