projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6-microblaze.git]
/
arch
/
arm
/
boot
/
dts
/
sun7i-a20.dtsi
diff --git
a/arch/arm/boot/dts/sun7i-a20.dtsi
b/arch/arm/boot/dts/sun7i-a20.dtsi
index
6f25cf5
..
dddc8ac
100644
(file)
--- a/
arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/
arch/arm/boot/dts/sun7i-a20.dtsi
@@
-435,7
+435,7
@@
};
timer@01c20c00 {
};
timer@01c20c00 {
- compatible = "allwinner,sun4i-timer";
+ compatible = "allwinner,sun4i-
a10-
timer";
reg = <0x01c20c00 0x90>;
interrupts = <0 22 4>,
<0 23 4>,
reg = <0x01c20c00 0x90>;
interrupts = <0 22 4>,
<0 23 4>,