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-next
[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 9117c1a1a4e27b8aa8fd463ea82685ed8bc4ae0e..d23e2524d694e95512a0ab967c6ef4fd9c1b8314 100644
(file)
--- a/
arch/arm/boot/dts/am33xx.dtsi
+++ b/
arch/arm/boot/dts/am33xx.dtsi
@@
-717,7
+717,7
@@
};
mac: ethernet@4a100000 {
- compatible = "ti,cpsw";
+ compatible = "ti,
am335x-cpsw","ti,
cpsw";
ti,hwmods = "cpgmac0";
clocks = <&cpsw_125mhz_gclk>, <&cpsw_cpts_rft_clk>;
clock-names = "fck", "cpts";