2020-12-31 15:33:17

by Prabhakar Mahadev Lad

[permalink] [raw]
Subject: [PATCH] gpio: rcar: Remove redundant compatible values

The mandatory compatible values 'renesas,rcar-gen{1,2,3}-gpio' have been
already added to all the respective R-Car Gen{1,2,3} SoC DTSI files,
remove the redundant device specific values from the driver.

Signed-off-by: Lad Prabhakar <[email protected]>
---
drivers/gpio/gpio-rcar.c | 27 ---------------------------
1 file changed, 27 deletions(-)

diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
index 0b572dbc4a36..f3b8c4b44cab 100644
--- a/drivers/gpio/gpio-rcar.c
+++ b/drivers/gpio/gpio-rcar.c
@@ -392,33 +392,6 @@ static const struct gpio_rcar_info gpio_rcar_info_gen2 = {

static const struct of_device_id gpio_rcar_of_table[] = {
{
- .compatible = "renesas,gpio-r8a7743",
- /* RZ/G1 GPIO is identical to R-Car Gen2. */
- .data = &gpio_rcar_info_gen2,
- }, {
- .compatible = "renesas,gpio-r8a7790",
- .data = &gpio_rcar_info_gen2,
- }, {
- .compatible = "renesas,gpio-r8a7791",
- .data = &gpio_rcar_info_gen2,
- }, {
- .compatible = "renesas,gpio-r8a7792",
- .data = &gpio_rcar_info_gen2,
- }, {
- .compatible = "renesas,gpio-r8a7793",
- .data = &gpio_rcar_info_gen2,
- }, {
- .compatible = "renesas,gpio-r8a7794",
- .data = &gpio_rcar_info_gen2,
- }, {
- .compatible = "renesas,gpio-r8a7795",
- /* Gen3 GPIO is identical to Gen2. */
- .data = &gpio_rcar_info_gen2,
- }, {
- .compatible = "renesas,gpio-r8a7796",
- /* Gen3 GPIO is identical to Gen2. */
- .data = &gpio_rcar_info_gen2,
- }, {
.compatible = "renesas,rcar-gen1-gpio",
.data = &gpio_rcar_info_gen1,
}, {
--
2.17.1


2021-01-04 10:38:58

by Geert Uytterhoeven

[permalink] [raw]
Subject: Re: [PATCH] gpio: rcar: Remove redundant compatible values

Hi Prabhakar,

On Thu, Dec 31, 2020 at 4:31 PM Lad Prabhakar
<[email protected]> wrote:
> The mandatory compatible values 'renesas,rcar-gen{1,2,3}-gpio' have been
> already added to all the respective R-Car Gen{1,2,3} SoC DTSI files,
> remove the redundant device specific values from the driver.
>
> Signed-off-by: Lad Prabhakar <[email protected]>

Thanks for your patch!

> --- a/drivers/gpio/gpio-rcar.c
> +++ b/drivers/gpio/gpio-rcar.c
> @@ -392,33 +392,6 @@ static const struct gpio_rcar_info gpio_rcar_info_gen2 = {
>
> static const struct of_device_id gpio_rcar_of_table[] = {
> {
> - .compatible = "renesas,gpio-r8a7743",
> - /* RZ/G1 GPIO is identical to R-Car Gen2. */
> - .data = &gpio_rcar_info_gen2,
> - }, {
> - .compatible = "renesas,gpio-r8a7790",
> - .data = &gpio_rcar_info_gen2,
> - }, {
> - .compatible = "renesas,gpio-r8a7791",
> - .data = &gpio_rcar_info_gen2,
> - }, {
> - .compatible = "renesas,gpio-r8a7792",
> - .data = &gpio_rcar_info_gen2,
> - }, {
> - .compatible = "renesas,gpio-r8a7793",
> - .data = &gpio_rcar_info_gen2,
> - }, {
> - .compatible = "renesas,gpio-r8a7794",
> - .data = &gpio_rcar_info_gen2,
> - }, {
> - .compatible = "renesas,gpio-r8a7795",
> - /* Gen3 GPIO is identical to Gen2. */
> - .data = &gpio_rcar_info_gen2,
> - }, {
> - .compatible = "renesas,gpio-r8a7796",
> - /* Gen3 GPIO is identical to Gen2. */
> - .data = &gpio_rcar_info_gen2,
> - }, {
> .compatible = "renesas,rcar-gen1-gpio",
> .data = &gpio_rcar_info_gen1,
> }, {

The reason the driver matches on these SoC-specific compatible values is
that originally the family-specific compatible values did not exist, and
the device nodes in the initial DTS files thus did not use them. The
family-specific compatible values were added to the DTS files in v4.15.
However, as this was backported to all v4.14-based R-Car BSP releases
(3.6.0 and later), I think it is safe to apply this.

Reviewed-by: Geert Uytterhoeven <[email protected]>

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

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

2021-01-04 11:25:31

by Bartosz Golaszewski

[permalink] [raw]
Subject: Re: [PATCH] gpio: rcar: Remove redundant compatible values

On Mon, Jan 4, 2021 at 11:36 AM Geert Uytterhoeven <[email protected]> wrote:
>
> Hi Prabhakar,
>
> On Thu, Dec 31, 2020 at 4:31 PM Lad Prabhakar
> <[email protected]> wrote:
> > The mandatory compatible values 'renesas,rcar-gen{1,2,3}-gpio' have been
> > already added to all the respective R-Car Gen{1,2,3} SoC DTSI files,
> > remove the redundant device specific values from the driver.
> >
> > Signed-off-by: Lad Prabhakar <[email protected]>
>
> Thanks for your patch!
>
> > --- a/drivers/gpio/gpio-rcar.c
> > +++ b/drivers/gpio/gpio-rcar.c
> > @@ -392,33 +392,6 @@ static const struct gpio_rcar_info gpio_rcar_info_gen2 = {
> >
> > static const struct of_device_id gpio_rcar_of_table[] = {
> > {
> > - .compatible = "renesas,gpio-r8a7743",
> > - /* RZ/G1 GPIO is identical to R-Car Gen2. */
> > - .data = &gpio_rcar_info_gen2,
> > - }, {
> > - .compatible = "renesas,gpio-r8a7790",
> > - .data = &gpio_rcar_info_gen2,
> > - }, {
> > - .compatible = "renesas,gpio-r8a7791",
> > - .data = &gpio_rcar_info_gen2,
> > - }, {
> > - .compatible = "renesas,gpio-r8a7792",
> > - .data = &gpio_rcar_info_gen2,
> > - }, {
> > - .compatible = "renesas,gpio-r8a7793",
> > - .data = &gpio_rcar_info_gen2,
> > - }, {
> > - .compatible = "renesas,gpio-r8a7794",
> > - .data = &gpio_rcar_info_gen2,
> > - }, {
> > - .compatible = "renesas,gpio-r8a7795",
> > - /* Gen3 GPIO is identical to Gen2. */
> > - .data = &gpio_rcar_info_gen2,
> > - }, {
> > - .compatible = "renesas,gpio-r8a7796",
> > - /* Gen3 GPIO is identical to Gen2. */
> > - .data = &gpio_rcar_info_gen2,
> > - }, {
> > .compatible = "renesas,rcar-gen1-gpio",
> > .data = &gpio_rcar_info_gen1,
> > }, {
>
> The reason the driver matches on these SoC-specific compatible values is
> that originally the family-specific compatible values did not exist, and
> the device nodes in the initial DTS files thus did not use them. The
> family-specific compatible values were added to the DTS files in v4.15.
> However, as this was backported to all v4.14-based R-Car BSP releases
> (3.6.0 and later), I think it is safe to apply this.
>
> Reviewed-by: Geert Uytterhoeven <[email protected]>
>
> Gr{oetje,eeting}s,
>
> Geert
>
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
>
> 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

Patch applied, thanks!

Bartosz