| From a0fed110964f7f05148f04c0af71efb0c54fc1de Mon Sep 17 00:00:00 2001 |
| From: Simon Horman <horms+renesas@verge.net.au> |
| Date: Fri, 13 Oct 2017 14:33:06 +0200 |
| Subject: [PATCH 0374/1795] ARM: dts: r8a7791: 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 r8a7791 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 7140383d59fc590b9f52e4133e8454603c76bb78) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| --- |
| arch/arm/boot/dts/r8a7791.dtsi | 16 ++++++++-------- |
| 1 file changed, 8 insertions(+), 8 deletions(-) |
| |
| diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi |
| index 97bed8253bc3..3c7b919efa48 100644 |
| --- a/arch/arm/boot/dts/r8a7791.dtsi |
| +++ b/arch/arm/boot/dts/r8a7791.dtsi |
| @@ -124,7 +124,7 @@ |
| }; |
| |
| gpio0: gpio@e6050000 { |
| - compatible = "renesas,gpio-r8a7791", "renesas,gpio-rcar"; |
| + compatible = "renesas,gpio-r8a7791", "renesas,rcar-gen2-gpio"; |
| reg = <0 0xe6050000 0 0x50>; |
| interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>; |
| #gpio-cells = <2>; |
| @@ -138,7 +138,7 @@ |
| }; |
| |
| gpio1: gpio@e6051000 { |
| - compatible = "renesas,gpio-r8a7791", "renesas,gpio-rcar"; |
| + compatible = "renesas,gpio-r8a7791", "renesas,rcar-gen2-gpio"; |
| reg = <0 0xe6051000 0 0x50>; |
| interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>; |
| #gpio-cells = <2>; |
| @@ -152,7 +152,7 @@ |
| }; |
| |
| gpio2: gpio@e6052000 { |
| - compatible = "renesas,gpio-r8a7791", "renesas,gpio-rcar"; |
| + compatible = "renesas,gpio-r8a7791", "renesas,rcar-gen2-gpio"; |
| reg = <0 0xe6052000 0 0x50>; |
| interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>; |
| #gpio-cells = <2>; |
| @@ -166,7 +166,7 @@ |
| }; |
| |
| gpio3: gpio@e6053000 { |
| - compatible = "renesas,gpio-r8a7791", "renesas,gpio-rcar"; |
| + compatible = "renesas,gpio-r8a7791", "renesas,rcar-gen2-gpio"; |
| reg = <0 0xe6053000 0 0x50>; |
| interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; |
| #gpio-cells = <2>; |
| @@ -180,7 +180,7 @@ |
| }; |
| |
| gpio4: gpio@e6054000 { |
| - compatible = "renesas,gpio-r8a7791", "renesas,gpio-rcar"; |
| + compatible = "renesas,gpio-r8a7791", "renesas,rcar-gen2-gpio"; |
| reg = <0 0xe6054000 0 0x50>; |
| interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>; |
| #gpio-cells = <2>; |
| @@ -194,7 +194,7 @@ |
| }; |
| |
| gpio5: gpio@e6055000 { |
| - compatible = "renesas,gpio-r8a7791", "renesas,gpio-rcar"; |
| + compatible = "renesas,gpio-r8a7791", "renesas,rcar-gen2-gpio"; |
| reg = <0 0xe6055000 0 0x50>; |
| interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>; |
| #gpio-cells = <2>; |
| @@ -208,7 +208,7 @@ |
| }; |
| |
| gpio6: gpio@e6055400 { |
| - compatible = "renesas,gpio-r8a7791", "renesas,gpio-rcar"; |
| + compatible = "renesas,gpio-r8a7791", "renesas,rcar-gen2-gpio"; |
| reg = <0 0xe6055400 0 0x50>; |
| interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>; |
| #gpio-cells = <2>; |
| @@ -222,7 +222,7 @@ |
| }; |
| |
| gpio7: gpio@e6055800 { |
| - compatible = "renesas,gpio-r8a7791", "renesas,gpio-rcar"; |
| + compatible = "renesas,gpio-r8a7791", "renesas,rcar-gen2-gpio"; |
| reg = <0 0xe6055800 0 0x50>; |
| interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>; |
| #gpio-cells = <2>; |
| -- |
| 2.19.0 |
| |