git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
am4372.dtsi
diff --git
a/arch/arm/boot/dts/am4372.dtsi
b/arch/arm/boot/dts/am4372.dtsi
index db464d7eaca847217260319ed3b064f2834eac6d..49fa596222547d646c79a031b260097cf9a8bf8e 100644
(file)
--- a/
arch/arm/boot/dts/am4372.dtsi
+++ b/
arch/arm/boot/dts/am4372.dtsi
@@
-490,6
+490,8
@@
#address-cells = <1>;
#size-cells = <1>;
ti,hwmods = "cpgmac0";
+ clocks = <&cpsw_125mhz_gclk>, <&cpsw_cpts_rft_clk>;
+ clock-names = "fck", "cpts";
status = "disabled";
cpdma_channels = <8>;
ale_entries = <1024>;