projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'cris-for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper...
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
dra7xx-clocks.dtsi
diff --git
a/arch/arm/boot/dts/dra7xx-clocks.dtsi
b/arch/arm/boot/dts/dra7xx-clocks.dtsi
index
8378b44
..
3330738
100644
(file)
--- a/
arch/arm/boot/dts/dra7xx-clocks.dtsi
+++ b/
arch/arm/boot/dts/dra7xx-clocks.dtsi
@@
-1003,6
+1003,14
@@
ti,index-power-of-two;
};
ti,index-power-of-two;
};
+ gmac_main_clk: gmac_main_clk {
+ #clock-cells = <0>;
+ compatible = "fixed-factor-clock";
+ clocks = <&gmac_250m_dclk_div>;
+ clock-mult = <1>;
+ clock-div = <2>;
+ };
+
l3init_480m_dclk_div: l3init_480m_dclk_div@1ac {
#clock-cells = <0>;
compatible = "ti,divider-clock";
l3init_480m_dclk_div: l3init_480m_dclk_div@1ac {
#clock-cells = <0>;
compatible = "ti,divider-clock";
@@
-1718,13
+1726,12
@@
reg = <0x0c00>;
};
reg = <0x0c00>;
};
-
gmac_gmii_ref_clk_div: gmac_gmii_ref_clk_div
@13d0 {
+
rmii_50mhz_clk_mux: rmii_50mhz_clk_mux
@13d0 {
#clock-cells = <0>;
#clock-cells = <0>;
- compatible = "ti,
divider
-clock";
- clocks = <&dpll_gmac_
m2
_ck>;
+ compatible = "ti,
mux
-clock";
+ clocks = <&dpll_gmac_
h11x2_ck>, <&rmii_clk
_ck>;
ti,bit-shift = <24>;
reg = <0x13d0>;
ti,bit-shift = <24>;
reg = <0x13d0>;
- ti,dividers = <2>;
};
gmac_rft_clk_mux: gmac_rft_clk_mux@13d0 {
};
gmac_rft_clk_mux: gmac_rft_clk_mux@13d0 {