[PATCH 1/2] dt-bindings: gpio: loongson: Add new loongson gpio chip compatible

[PATCH 1/2] dt-bindings: gpio: loongson: Add new loongson gpio chip compatible

[Binbin Zhou]

Add the devicetree compatibles for Loongson-7A2000 and Loongson-3A6000
gpio chip.

Signed-off-by: Binbin Zhou <zhoubinbin@loongson.cn>
---
 Documentation/devicetree/bindings/gpio/loongson,ls-gpio.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Documentation/devicetree/bindings/gpio/loongson,ls-gpio.yaml b/Documentation/devicetree/bindings/gpio/loongson,ls-gpio.yaml
index cf3b1b270aa8..b68159600e2b 100644
--- a/Documentation/devicetree/bindings/gpio/loongson,ls-gpio.yaml
+++ b/Documentation/devicetree/bindings/gpio/loongson,ls-gpio.yaml
@@ -20,7 +20,10 @@ properties:
           - loongson,ls2k2000-gpio1
           - loongson,ls2k2000-gpio2
           - loongson,ls3a5000-gpio
+          - loongson,ls3a6000-gpio  # Loongson-3A6000 node GPIO
           - loongson,ls7a-gpio
+          - loongson,ls7a2000-gpio1 # LS7A2000 chipset GPIO
+          - loongson,ls7a2000-gpio2 # LS7A2000 ACPI GPIO
       - items:
           - const: loongson,ls2k1000-gpio
           - const: loongson,ls2k-gpio

base-commit: 8a5680bffb2f681688b5788751c767fc380ff9b7
-- 
2.47.1

[PATCH 2/2] gpio: loongson-64bit: Add more gpio chip support

[Binbin Zhou]

The Loongson-7A2000 and Loongson-3A6000 share the same gpio chip model.
Just add them through driver_data.

Signed-off-by: Binbin Zhou <zhoubinbin@loongson.cn>
---
 drivers/gpio/gpio-loongson-64bit.c | 51 ++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/drivers/gpio/gpio-loongson-64bit.c b/drivers/gpio/gpio-loongson-64bit.c
index f000cc0356c7..a9a93036f08f 100644
--- a/drivers/gpio/gpio-loongson-64bit.c
+++ b/drivers/gpio/gpio-loongson-64bit.c
@@ -254,6 +254,33 @@ static const struct loongson_gpio_chip_data loongson_gpio_ls7a_data = {
 	.out_offset = 0x900,
 };
 
+/* LS7A2000 chipset GPIO */
+static const struct loongson_gpio_chip_data loongson_gpio_ls7a2000_data0 = {
+	.label = "ls7a2000_gpio",
+	.mode = BYTE_CTRL_MODE,
+	.conf_offset = 0x800,
+	.in_offset = 0xa00,
+	.out_offset = 0x900,
+};
+
+/* LS7A2000 ACPI GPIO */
+static const struct loongson_gpio_chip_data loongson_gpio_ls7a2000_data1 = {
+	.label = "ls7a2000_gpio",
+	.mode = BYTE_CTRL_MODE,
+	.conf_offset = 0x4,
+	.in_offset = 0x8,
+	.out_offset = 0x0,
+};
+
+/* Loongson-3A6000 node GPIO */
+static const struct loongson_gpio_chip_data loongson_gpio_ls3a6000_data = {
+	.label = "ls3a6000_gpio",
+	.mode = BIT_CTRL_MODE,
+	.conf_offset = 0x0,
+	.in_offset = 0xc,
+	.out_offset = 0x8,
+};
+
 static const struct of_device_id loongson_gpio_of_match[] = {
 	{
 		.compatible = "loongson,ls2k-gpio",
@@ -287,6 +314,18 @@ static const struct of_device_id loongson_gpio_of_match[] = {
 		.compatible = "loongson,ls7a-gpio",
 		.data = &loongson_gpio_ls7a_data,
 	},
+	{
+		.compatible = "loongson,ls7a2000-gpio1",
+		.data = &loongson_gpio_ls7a2000_data0,
+	},
+	{
+		.compatible = "loongson,ls7a2000-gpio2",
+		.data = &loongson_gpio_ls7a2000_data1,
+	},
+	{
+		.compatible = "loongson,ls3a6000-gpio",
+		.data = &loongson_gpio_ls3a6000_data,
+	},
 	{}
 };
 MODULE_DEVICE_TABLE(of, loongson_gpio_of_match);
@@ -312,6 +351,18 @@ static const struct acpi_device_id loongson_gpio_acpi_match[] = {
 		.id = "LOON000C",
 		.driver_data = (kernel_ulong_t)&loongson_gpio_ls2k2000_data2,
 	},
+	{
+		.id = "LOON000D",
+		.driver_data = (kernel_ulong_t)&loongson_gpio_ls7a2000_data0,
+	},
+	{
+		.id = "LOON000E",
+		.driver_data = (kernel_ulong_t)&loongson_gpio_ls7a2000_data1,
+	},
+	{
+		.id = "LOON000F",
+		.driver_data = (kernel_ulong_t)&loongson_gpio_ls3a6000_data,
+	},
 	{}
 };
 MODULE_DEVICE_TABLE(acpi, loongson_gpio_acpi_match);
-- 
2.47.1

Re: [PATCH 1/2] dt-bindings: gpio: loongson: Add new loongson gpio chip compatible

[Linus Walleij]

On Mon, Mar 3, 2025 at 8:46 AM Binbin Zhou <zhoubinbin@loongson.cn> wrote:

> Add the devicetree compatibles for Loongson-7A2000 and Loongson-3A6000
> gpio chip.
>
> Signed-off-by: Binbin Zhou <zhoubinbin@loongson.cn>

Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij

Re: [PATCH 2/2] gpio: loongson-64bit: Add more gpio chip support

[Linus Walleij]

On Mon, Mar 3, 2025 at 8:46 AM Binbin Zhou <zhoubinbin@loongson.cn> wrote:

> The Loongson-7A2000 and Loongson-3A6000 share the same gpio chip model.
> Just add them through driver_data.
>
> Signed-off-by: Binbin Zhou <zhoubinbin@loongson.cn>

Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij

Re: [PATCH 1/2] dt-bindings: gpio: loongson: Add new loongson gpio chip compatible

[Huacai Chen]

On Tue, Mar 4, 2025 at 4:36 PM Linus Walleij <linus.walleij@linaro.org> wrote:
>
> On Mon, Mar 3, 2025 at 8:46 AM Binbin Zhou <zhoubinbin@loongson.cn> wrote:
>
> > Add the devicetree compatibles for Loongson-7A2000 and Loongson-3A6000
> > gpio chip.
> >
> > Signed-off-by: Binbin Zhou <zhoubinbin@loongson.cn>
>
> Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Huacai Chen <chenhuacai@loongson.cn>

>
> Yours,
> Linus Walleij

Re: [PATCH 2/2] gpio: loongson-64bit: Add more gpio chip support

[Huacai Chen]

On Tue, Mar 4, 2025 at 4:36 PM Linus Walleij <linus.walleij@linaro.org> wrote:
>
> On Mon, Mar 3, 2025 at 8:46 AM Binbin Zhou <zhoubinbin@loongson.cn> wrote:
>
> > The Loongson-7A2000 and Loongson-3A6000 share the same gpio chip model.
> > Just add them through driver_data.
> >
> > Signed-off-by: Binbin Zhou <zhoubinbin@loongson.cn>
>
> Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Huacai Chen <chenhuacai@loongson.cn>

>
> Yours,
> Linus Walleij

Re: [PATCH 2/2] gpio: loongson-64bit: Add more gpio chip support

[Bartosz Golaszewski]

On Mon, Mar 3, 2025 at 8:46 AM Binbin Zhou <zhoubinbin@loongson.cn> wrote:
>
> The Loongson-7A2000 and Loongson-3A6000 share the same gpio chip model.
> Just add them through driver_data.
>
> Signed-off-by: Binbin Zhou <zhoubinbin@loongson.cn>
> ---
>  drivers/gpio/gpio-loongson-64bit.c | 51 ++++++++++++++++++++++++++++++
>  1 file changed, 51 insertions(+)
>
> diff --git a/drivers/gpio/gpio-loongson-64bit.c b/drivers/gpio/gpio-loongson-64bit.c
> index f000cc0356c7..a9a93036f08f 100644
> --- a/drivers/gpio/gpio-loongson-64bit.c
> +++ b/drivers/gpio/gpio-loongson-64bit.c
> @@ -254,6 +254,33 @@ static const struct loongson_gpio_chip_data loongson_gpio_ls7a_data = {
>         .out_offset = 0x900,
>  };
>
> +/* LS7A2000 chipset GPIO */
> +static const struct loongson_gpio_chip_data loongson_gpio_ls7a2000_data0 = {
> +       .label = "ls7a2000_gpio",
> +       .mode = BYTE_CTRL_MODE,
> +       .conf_offset = 0x800,
> +       .in_offset = 0xa00,
> +       .out_offset = 0x900,
> +};
> +
> +/* LS7A2000 ACPI GPIO */
> +static const struct loongson_gpio_chip_data loongson_gpio_ls7a2000_data1 = {
> +       .label = "ls7a2000_gpio",
> +       .mode = BYTE_CTRL_MODE,
> +       .conf_offset = 0x4,
> +       .in_offset = 0x8,
> +       .out_offset = 0x0,
> +};

The naming convention here is a bit confusing, can't we have the
naming of variables reflect the compatibles they refer to?

Bart

> +
> +/* Loongson-3A6000 node GPIO */
> +static const struct loongson_gpio_chip_data loongson_gpio_ls3a6000_data = {
> +       .label = "ls3a6000_gpio",
> +       .mode = BIT_CTRL_MODE,
> +       .conf_offset = 0x0,
> +       .in_offset = 0xc,
> +       .out_offset = 0x8,
> +};
> +
>  static const struct of_device_id loongson_gpio_of_match[] = {
>         {
>                 .compatible = "loongson,ls2k-gpio",
> @@ -287,6 +314,18 @@ static const struct of_device_id loongson_gpio_of_match[] = {
>                 .compatible = "loongson,ls7a-gpio",
>                 .data = &loongson_gpio_ls7a_data,
>         },
> +       {
> +               .compatible = "loongson,ls7a2000-gpio1",
> +               .data = &loongson_gpio_ls7a2000_data0,
> +       },
> +       {
> +               .compatible = "loongson,ls7a2000-gpio2",
> +               .data = &loongson_gpio_ls7a2000_data1,
> +       },
> +       {
> +               .compatible = "loongson,ls3a6000-gpio",
> +               .data = &loongson_gpio_ls3a6000_data,
> +       },
>         {}
>  };
>  MODULE_DEVICE_TABLE(of, loongson_gpio_of_match);
> @@ -312,6 +351,18 @@ static const struct acpi_device_id loongson_gpio_acpi_match[] = {
>                 .id = "LOON000C",
>                 .driver_data = (kernel_ulong_t)&loongson_gpio_ls2k2000_data2,
>         },
> +       {
> +               .id = "LOON000D",
> +               .driver_data = (kernel_ulong_t)&loongson_gpio_ls7a2000_data0,
> +       },
> +       {
> +               .id = "LOON000E",
> +               .driver_data = (kernel_ulong_t)&loongson_gpio_ls7a2000_data1,
> +       },
> +       {
> +               .id = "LOON000F",
> +               .driver_data = (kernel_ulong_t)&loongson_gpio_ls3a6000_data,
> +       },
>         {}
>  };
>  MODULE_DEVICE_TABLE(acpi, loongson_gpio_acpi_match);
> --
> 2.47.1
>

Re: [PATCH 2/2] gpio: loongson-64bit: Add more gpio chip support

[Binbin Zhou]

Hi Bartosz:

Thanks for your reply.

On Tue, Mar 4, 2025 at 6:36 PM Bartosz Golaszewski <brgl@bgdev.pl> wrote:
>
> On Mon, Mar 3, 2025 at 8:46 AM Binbin Zhou <zhoubinbin@loongson.cn> wrote:
> >
> > The Loongson-7A2000 and Loongson-3A6000 share the same gpio chip model.
> > Just add them through driver_data.
> >
> > Signed-off-by: Binbin Zhou <zhoubinbin@loongson.cn>
> > ---
> >  drivers/gpio/gpio-loongson-64bit.c | 51 ++++++++++++++++++++++++++++++
> >  1 file changed, 51 insertions(+)
> >
> > diff --git a/drivers/gpio/gpio-loongson-64bit.c b/drivers/gpio/gpio-loongson-64bit.c
> > index f000cc0356c7..a9a93036f08f 100644
> > --- a/drivers/gpio/gpio-loongson-64bit.c
> > +++ b/drivers/gpio/gpio-loongson-64bit.c
> > @@ -254,6 +254,33 @@ static const struct loongson_gpio_chip_data loongson_gpio_ls7a_data = {
> >         .out_offset = 0x900,
> >  };
> >
> > +/* LS7A2000 chipset GPIO */
> > +static const struct loongson_gpio_chip_data loongson_gpio_ls7a2000_data0 = {
> > +       .label = "ls7a2000_gpio",
> > +       .mode = BYTE_CTRL_MODE,
> > +       .conf_offset = 0x800,
> > +       .in_offset = 0xa00,
> > +       .out_offset = 0x900,
> > +};
> > +
> > +/* LS7A2000 ACPI GPIO */
> > +static const struct loongson_gpio_chip_data loongson_gpio_ls7a2000_data1 = {
> > +       .label = "ls7a2000_gpio",
> > +       .mode = BYTE_CTRL_MODE,
> > +       .conf_offset = 0x4,
> > +       .in_offset = 0x8,
> > +       .out_offset = 0x0,
> > +};
>
> The naming convention here is a bit confusing, can't we have the
> naming of variables reflect the compatibles they refer to?
>
Emm...

I named them that way to be consistent with the previous naming.
Of course, we could name them something like
“ls7a2000_acpi_gpio_data”, which might be better understood.
Also, do we need to rename all instances of “loongson_gpio_chip_data”?

For example:
ls2k1000_cpu_gpio_data
ls2k0500_cpu_gpio0_data
ls2k0500_cpu_gpio1_data
ls2k2000_cpu_gpio_data
ls2k2000_bridge_gpio_data
ls2k2000_acpi_gpio_data
ls3a5000_cpu_gpio_data
ls3a6000_cpu_gpio_data
ls7a1000_bridge_gpio_data
ls7a2000_bridge_gpio_data
ls7a2000_gpio_gpio_data

> Bart
>
> > +
> > +/* Loongson-3A6000 node GPIO */
> > +static const struct loongson_gpio_chip_data loongson_gpio_ls3a6000_data = {
> > +       .label = "ls3a6000_gpio",
> > +       .mode = BIT_CTRL_MODE,
> > +       .conf_offset = 0x0,
> > +       .in_offset = 0xc,
> > +       .out_offset = 0x8,
> > +};
> > +
> >  static const struct of_device_id loongson_gpio_of_match[] = {
> >         {
> >                 .compatible = "loongson,ls2k-gpio",
> > @@ -287,6 +314,18 @@ static const struct of_device_id loongson_gpio_of_match[] = {
> >                 .compatible = "loongson,ls7a-gpio",
> >                 .data = &loongson_gpio_ls7a_data,
> >         },
> > +       {
> > +               .compatible = "loongson,ls7a2000-gpio1",
> > +               .data = &loongson_gpio_ls7a2000_data0,
> > +       },
> > +       {
> > +               .compatible = "loongson,ls7a2000-gpio2",
> > +               .data = &loongson_gpio_ls7a2000_data1,
> > +       },
> > +       {
> > +               .compatible = "loongson,ls3a6000-gpio",
> > +               .data = &loongson_gpio_ls3a6000_data,
> > +       },
> >         {}
> >  };
> >  MODULE_DEVICE_TABLE(of, loongson_gpio_of_match);
> > @@ -312,6 +351,18 @@ static const struct acpi_device_id loongson_gpio_acpi_match[] = {
> >                 .id = "LOON000C",
> >                 .driver_data = (kernel_ulong_t)&loongson_gpio_ls2k2000_data2,
> >         },
> > +       {
> > +               .id = "LOON000D",
> > +               .driver_data = (kernel_ulong_t)&loongson_gpio_ls7a2000_data0,
> > +       },
> > +       {
> > +               .id = "LOON000E",
> > +               .driver_data = (kernel_ulong_t)&loongson_gpio_ls7a2000_data1,
> > +       },
> > +       {
> > +               .id = "LOON000F",
> > +               .driver_data = (kernel_ulong_t)&loongson_gpio_ls3a6000_data,
> > +       },
> >         {}
> >  };
> >  MODULE_DEVICE_TABLE(acpi, loongson_gpio_acpi_match);
> > --
> > 2.47.1
> >



-- 
Thanks.
Binbin

Re: [PATCH 1/2] dt-bindings: gpio: loongson: Add new loongson gpio chip compatible

[Rob Herring (Arm)]

On Mon, 03 Mar 2025 15:45:51 +0800, Binbin Zhou wrote:
> Add the devicetree compatibles for Loongson-7A2000 and Loongson-3A6000
> gpio chip.
> 
> Signed-off-by: Binbin Zhou <zhoubinbin@loongson.cn>
> ---
>  Documentation/devicetree/bindings/gpio/loongson,ls-gpio.yaml | 3 +++
>  1 file changed, 3 insertions(+)
> 

Acked-by: Rob Herring (Arm) <robh@kernel.org>

Re: [PATCH 2/2] gpio: loongson-64bit: Add more gpio chip support

[Bartosz Golaszewski]

On Tue, Mar 4, 2025 at 12:55 PM Binbin Zhou <zhoubb.aaron@gmail.com> wrote:
>
> >
> > The naming convention here is a bit confusing, can't we have the
> > naming of variables reflect the compatibles they refer to?
> >
> Emm...
>
> I named them that way to be consistent with the previous naming.
> Of course, we could name them something like
> “ls7a2000_acpi_gpio_data”, which might be better understood.
> Also, do we need to rename all instances of “loongson_gpio_chip_data”?
>

Ah, nevermind then. I will apply it as is but yeah, we could consider
something better in the future.

Bart

Re: [PATCH 1/2] dt-bindings: gpio: loongson: Add new loongson gpio chip compatible

[Bartosz Golaszewski]

From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>


On Mon, 03 Mar 2025 15:45:51 +0800, Binbin Zhou wrote:
> Add the devicetree compatibles for Loongson-7A2000 and Loongson-3A6000
> gpio chip.
> 
> 

Applied, thanks!

[1/2] dt-bindings: gpio: loongson: Add new loongson gpio chip compatible
      commit: e4a345c55e1b9b5ab5212a93b081f666f71b303b
[2/2] gpio: loongson-64bit: Add more gpio chip support
      commit: 44fe79020b91a1a8620e44d4f361b389e8fc552f

Best regards,
-- 
Bartosz Golaszewski <bartosz.golaszewski@linaro.org>