projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3a4c5d6
)
ARM: dts: r8a7794: Update CMT compat strings
author
Magnus Damm
<damm+renesas@opensource.se>
Tue, 28 Nov 2017 13:47:29 +0000
(14:47 +0100)
committer
Simon Horman
<horms+renesas@verge.net.au>
Wed, 29 Nov 2017 10:42:35 +0000
(11:42 +0100)
Use recently updated R-Car Gen2 CMT0 and CMT1 compat strings.
With this change in place we can keep device-specific configuration in
the driver and the driver can be able to support CMT1 specific features.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
arch/arm/boot/dts/r8a7794.dtsi
patch
|
blob
|
history
diff --git
a/arch/arm/boot/dts/r8a7794.dtsi
b/arch/arm/boot/dts/r8a7794.dtsi
index 90050565114cec310a69b3b6a6a6438b5f295f1b..67aa409b32bffca6d774498cc37ebaf863482429 100644
(file)
--- a/
arch/arm/boot/dts/r8a7794.dtsi
+++ b/
arch/arm/boot/dts/r8a7794.dtsi
@@
-188,7
+188,7
@@
};
cmt0: timer@ffca0000 {
- compatible = "renesas,
cmt-48-gen2
";
+ compatible = "renesas,
r8a7794-cmt0", "renesas,rcar-gen2-cmt0
";
reg = <0 0xffca0000 0 0x1004>;
interrupts = <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;
@@
-203,7
+203,7
@@
};
cmt1: timer@e6130000 {
- compatible = "renesas,
cmt-48-gen2
";
+ compatible = "renesas,
r8a7794-cmt1", "renesas,rcar-gen2-cmt1
";
reg = <0 0xe6130000 0 0x1004>;
interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>,