projects
/
firefly-linux-kernel-4.4.55.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
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
boot
/
dts
/
am33xx.dtsi
diff --git
a/arch/arm/boot/dts/am33xx.dtsi
b/arch/arm/boot/dts/am33xx.dtsi
index 0957645b73afaca716348485193aa5060f06659c..91fe4f148f80cec2f74f55781dea2e1bf58115f9 100644
(file)
--- a/
arch/arm/boot/dts/am33xx.dtsi
+++ b/
arch/arm/boot/dts/am33xx.dtsi
@@
-349,7
+349,7
@@
rx_descs = <64>;
mac_control = <0x20>;
slaves = <2>;
-
cpts_
active_slave = <0>;
+ active_slave = <0>;
cpts_clock_mult = <0x80000000>;
cpts_clock_shift = <29>;
reg = <0x4a100000 0x800