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 tag 'drm-for-v4.16-part2-fixes' of git://people.freedesktop.org/~airlied/linux
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
at91-sam9_l9260.dts
diff --git
a/arch/arm/boot/dts/at91-sam9_l9260.dts
b/arch/arm/boot/dts/at91-sam9_l9260.dts
index 171243ca4f2f446b0f924d60a029dcd606959c7f..70cb36f7a9d7e026c19fa66c914f0b5eb9724cc4 100644
(file)
--- a/
arch/arm/boot/dts/at91-sam9_l9260.dts
+++ b/
arch/arm/boot/dts/at91-sam9_l9260.dts
@@
-32,6
+32,18
@@
ahb {
apb {
+ tcb0: timer@fffa0000 {
+ timer@0 {
+ compatible = "atmel,tcb-timer";
+ reg = <0>, <1>;
+ };
+
+ timer@2 {
+ compatible = "atmel,tcb-timer";
+ reg = <2>;
+ };
+ };
+
mmc0: mmc@fffa8000 {
pinctrl-0 = <
&pinctrl_board_mmc0