Message ID | 20171013123311.15278-2-horms+renesas@verge.net.au (mailing list archive) |
---|---|
State | Accepted |
Commit | 9b43ba66f145127025cf82a35f47f228ea936935 |
Delegated to: | Simon Horman |
Headers | show |
On Fri, Oct 13, 2017 at 2:33 PM, Simon Horman <horms+renesas@verge.net.au> wrote: > 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> > --- > v3 > * Consistently use gen1 rather than gen2 binding in patch and refer to it > in changelog. > > v2 > * Note run-time considerations in changelog as pointed out by > Geert Uytterhoeven > > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
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>;