| From 265433338c117cfe3b48d1ab9639316b82e1759e Mon Sep 17 00:00:00 2001 |
| From: Simon Horman <horms+renesas@verge.net.au> |
| Date: Fri, 13 Oct 2017 14:33:02 +0200 |
| Subject: [PATCH 0370/1795] ARM: dts: r8a7778: Use R-Car GPIO Gen1 fallback |
| compat string |
| |
| Use newly added R-Car GPIO Gen1 fallback compat string |
| in place of now deprecated non-generation specific |
| R-Car GPIO fallback compat string in DT of r8a7778 SoC. |
| |
| As the driver does not match on "renesas,gpio-r8a7778" there |
| are some run-time considerations for this patch: |
| |
| * When a resulting DTB is used with kernels newer than v4.14 this should |
| not have any run-time effect as renesas,rcar-gen1-gpio is matched by the |
| driver since commit dbd1dad2ab8f ("gpio: rcar: add gen[123] fallback |
| compatibility strings") |
| |
| * However, when used with older kernels GPIO will be disabled as |
| no compat string match will be made by the driver. |
| |
| The regression documented above for the new DTB with old kernel case |
| is acceptable in my opinion. |
| |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| (cherry picked from commit 9b43ba66f145127025cf82a35f47f228ea936935) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| --- |
| arch/arm/boot/dts/r8a7778.dtsi | 10 +++++----- |
| 1 file changed, 5 insertions(+), 5 deletions(-) |
| |
| diff --git a/arch/arm/boot/dts/r8a7778.dtsi b/arch/arm/boot/dts/r8a7778.dtsi |
| index 8f3156c0e575..a31817b2dda7 100644 |
| --- a/arch/arm/boot/dts/r8a7778.dtsi |
| +++ b/arch/arm/boot/dts/r8a7778.dtsi |
| @@ -88,7 +88,7 @@ |
| }; |
| |
| gpio0: gpio@ffc40000 { |
| - compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar"; |
| + compatible = "renesas,gpio-r8a7778", "renesas,rcar-gen1-gpio"; |
| reg = <0xffc40000 0x2c>; |
| interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>; |
| #gpio-cells = <2>; |
| @@ -99,7 +99,7 @@ |
| }; |
| |
| gpio1: gpio@ffc41000 { |
| - compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar"; |
| + compatible = "renesas,gpio-r8a7778", "renesas,rcar-gen1-gpio"; |
| reg = <0xffc41000 0x2c>; |
| interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>; |
| #gpio-cells = <2>; |
| @@ -110,7 +110,7 @@ |
| }; |
| |
| gpio2: gpio@ffc42000 { |
| - compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar"; |
| + compatible = "renesas,gpio-r8a7778", "renesas,rcar-gen1-gpio"; |
| reg = <0xffc42000 0x2c>; |
| interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>; |
| #gpio-cells = <2>; |
| @@ -121,7 +121,7 @@ |
| }; |
| |
| gpio3: gpio@ffc43000 { |
| - compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar"; |
| + compatible = "renesas,gpio-r8a7778", "renesas,rcar-gen1-gpio"; |
| reg = <0xffc43000 0x2c>; |
| interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>; |
| #gpio-cells = <2>; |
| @@ -132,7 +132,7 @@ |
| }; |
| |
| gpio4: gpio@ffc44000 { |
| - compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar"; |
| + compatible = "renesas,gpio-r8a7778", "renesas,rcar-gen1-gpio"; |
| reg = <0xffc44000 0x2c>; |
| interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>; |
| #gpio-cells = <2>; |
| -- |
| 2.19.0 |
| |