diff options
Diffstat (limited to 'patches/0702-ARM-dts-r8a7790-Update-CMT-compat-strings.patch')
| -rw-r--r-- | patches/0702-ARM-dts-r8a7790-Update-CMT-compat-strings.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/patches/0702-ARM-dts-r8a7790-Update-CMT-compat-strings.patch b/patches/0702-ARM-dts-r8a7790-Update-CMT-compat-strings.patch new file mode 100644 index 00000000000000..5c6b8bf757db54 --- /dev/null +++ b/patches/0702-ARM-dts-r8a7790-Update-CMT-compat-strings.patch @@ -0,0 +1,46 @@ +From 92651eb75fb1c362d814ad44e8d8fcd4b3433a87 Mon Sep 17 00:00:00 2001 +From: Magnus Damm <damm+renesas@opensource.se> +Date: Tue, 28 Nov 2017 14:47:26 +0100 +Subject: [PATCH 0702/1795] ARM: dts: r8a7790: Update CMT compat strings + +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> +(cherry picked from commit a7f7c96c6c5c7cc9b4e28467814068ad8b32cf9c) +Signed-off-by: Simon Horman <horms+renesas@verge.net.au> +Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> +--- + arch/arm/boot/dts/r8a7790.dtsi | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi +index 5477a62f4642..696522da2f99 100644 +--- a/arch/arm/boot/dts/r8a7790.dtsi ++++ b/arch/arm/boot/dts/r8a7790.dtsi +@@ -311,7 +311,7 @@ + }; + + cmt0: timer@ffca0000 { +- compatible = "renesas,cmt-48-r8a7790", "renesas,cmt-48-gen2"; ++ compatible = "renesas,r8a7790-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>; +@@ -326,7 +326,7 @@ + }; + + cmt1: timer@e6130000 { +- compatible = "renesas,cmt-48-r8a7790", "renesas,cmt-48-gen2"; ++ compatible = "renesas,r8a7790-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>, +-- +2.19.0 + |