projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v3.14.25' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
arch
/
arm
/
boot
/
dts
/
r7s72100.dtsi
diff --git
a/arch/arm/boot/dts/r7s72100.dtsi
b/arch/arm/boot/dts/r7s72100.dtsi
index
1d28d01
..
801a556
100644
(file)
--- a/
arch/arm/boot/dts/r7s72100.dtsi
+++ b/
arch/arm/boot/dts/r7s72100.dtsi
@@
-230,7
+230,7
@@
};
mtu2: timer@fcff0000 {
- compatible = "renesas,mtu2";
+ compatible = "renesas,mtu2
-r7s72100", "renesas,mtu2
";
reg = <0xfcff0000 0x400>;
interrupts = <0 107 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "tgi0a";