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 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
usb_a9263.dts
diff --git
a/arch/arm/boot/dts/usb_a9263.dts
b/arch/arm/boot/dts/usb_a9263.dts
index 7b1125be99c467221f442122073afb1b15ac34e8..0a753b4c74e7f96cecdf5c1bd13bd69f97d9264a 100644
(file)
--- a/
arch/arm/boot/dts/usb_a9263.dts
+++ b/
arch/arm/boot/dts/usb_a9263.dts
@@
-36,6
+36,18
@@
status = "okay";
};
+ tcb0: timer@fff7c000 {
+ timer@0 {
+ compatible = "atmel,tcb-timer";
+ reg = <0>, <1>;
+ };
+
+ timer@2 {
+ compatible = "atmel,tcb-timer";
+ reg = <2>;
+ };
+ };
+
macb0: ethernet@fffbc000 {
phy-mode = "rmii";
status = "okay";