| From 7e83b4c2ad382fde41d8dbec7507c2f4360ec6a2 Mon Sep 17 00:00:00 2001 |
| From: Simon Horman <horms+renesas@verge.net.au> |
| Date: Fri, 13 Oct 2017 14:33:05 +0200 |
| Subject: [PATCH 0373/1795] ARM: dts: r8a7790: Use R-Car GPIO Gen2 fallback |
| compat string |
| |
| Use newly added R-Car GPIO Gen2 fallback compat string |
| in place of now deprecated non-generation specific |
| R-Car GPIO fallback compat string in the DT of the r8a7790 SoC. |
| |
| This should have no run-time effect as the driver matches against |
| the per-SoC compat string before considering the fallback compat string. |
| |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| (cherry picked from commit 26742a192c82cc28723c80dbecc5976db0508461) |
| 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 | 12 ++++++------ |
| 1 file changed, 6 insertions(+), 6 deletions(-) |
| |
| diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi |
| index 92b7f3bd8b69..f247beb3863f 100644 |
| --- a/arch/arm/boot/dts/r8a7790.dtsi |
| +++ b/arch/arm/boot/dts/r8a7790.dtsi |
| @@ -200,7 +200,7 @@ |
| }; |
| |
| gpio0: gpio@e6050000 { |
| - compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar"; |
| + compatible = "renesas,gpio-r8a7790", "renesas,rcar-gen2-gpio"; |
| reg = <0 0xe6050000 0 0x50>; |
| interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>; |
| #gpio-cells = <2>; |
| @@ -214,7 +214,7 @@ |
| }; |
| |
| gpio1: gpio@e6051000 { |
| - compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar"; |
| + compatible = "renesas,gpio-r8a7790", "renesas,rcar-gen2-gpio"; |
| reg = <0 0xe6051000 0 0x50>; |
| interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>; |
| #gpio-cells = <2>; |
| @@ -228,7 +228,7 @@ |
| }; |
| |
| gpio2: gpio@e6052000 { |
| - compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar"; |
| + compatible = "renesas,gpio-r8a7790", "renesas,rcar-gen2-gpio"; |
| reg = <0 0xe6052000 0 0x50>; |
| interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>; |
| #gpio-cells = <2>; |
| @@ -242,7 +242,7 @@ |
| }; |
| |
| gpio3: gpio@e6053000 { |
| - compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar"; |
| + compatible = "renesas,gpio-r8a7790", "renesas,rcar-gen2-gpio"; |
| reg = <0 0xe6053000 0 0x50>; |
| interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; |
| #gpio-cells = <2>; |
| @@ -256,7 +256,7 @@ |
| }; |
| |
| gpio4: gpio@e6054000 { |
| - compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar"; |
| + compatible = "renesas,gpio-r8a7790", "renesas,rcar-gen2-gpio"; |
| reg = <0 0xe6054000 0 0x50>; |
| interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>; |
| #gpio-cells = <2>; |
| @@ -270,7 +270,7 @@ |
| }; |
| |
| gpio5: gpio@e6055000 { |
| - compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar"; |
| + compatible = "renesas,gpio-r8a7790", "renesas,rcar-gen2-gpio"; |
| reg = <0 0xe6055000 0 0x50>; |
| interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>; |
| #gpio-cells = <2>; |
| -- |
| 2.19.0 |
| |