projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[linux-2.6-block.git]
/
arch
/
arm
/
boot
/
dts
/
am33xx.dtsi
diff --git
a/arch/arm/boot/dts/am33xx.dtsi
b/arch/arm/boot/dts/am33xx.dtsi
index 7ad75b4e066358f5229d93d0d017c754a711ca32..f1eea4af40eda05916dfa73ad8ffc48627d490a2 100644
(file)
--- a/
arch/arm/boot/dts/am33xx.dtsi
+++ b/
arch/arm/boot/dts/am33xx.dtsi
@@
-665,6
+665,8
@@
mac: ethernet@4a100000 {
compatible = "ti,cpsw";
ti,hwmods = "cpgmac0";
+ clocks = <&cpsw_125mhz_gclk>, <&cpsw_cpts_rft_clk>;
+ clock-names = "fck", "cpts";
cpdma_channels = <8>;
ale_entries = <1024>;
bd_ram_size = <0x2000>;