[PATCH 1/2] dt-bindings: tegra186-gpio: Add Tegra234 ports

[PATCH 1/2] dt-bindings: tegra186-gpio: Add Tegra234 ports

[Prathamesh Shete]

Add Tegra234 GPIO ports in dt-bindings.

Signed-off-by: Prathamesh Shete <pshete@nvidia.com>
---
 include/dt-bindings/gpio/tegra234-gpio.h | 59 ++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 include/dt-bindings/gpio/tegra234-gpio.h

diff --git a/include/dt-bindings/gpio/tegra234-gpio.h b/include/dt-bindings/gpio/tegra234-gpio.h
new file mode 100644
index 000000000000..0f59afabfe80
--- /dev/null
+++ b/include/dt-bindings/gpio/tegra234-gpio.h
@@ -0,0 +1,59 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright (c) 2020, NVIDIA CORPORATION. All rights reserved. */
+
+/*
+ * This header provides constants for binding nvidia,tegra234-gpio*.
+ *
+ * The first cell in Tegra's GPIO specifier is the GPIO ID. The macros below
+ * provide names for this.
+ *
+ * The second cell contains standard flag values specified in gpio.h.
+ */
+
+#ifndef _DT_BINDINGS_GPIO_TEGRA234_GPIO_H
+#define _DT_BINDINGS_GPIO_TEGRA234_GPIO_H
+
+#include <dt-bindings/gpio/gpio.h>
+
+/* GPIOs implemented by main GPIO controller */
+#define TEGRA234_MAIN_GPIO_PORT_A 0
+#define TEGRA234_MAIN_GPIO_PORT_B 1
+#define TEGRA234_MAIN_GPIO_PORT_C 2
+#define TEGRA234_MAIN_GPIO_PORT_D 3
+#define TEGRA234_MAIN_GPIO_PORT_E 4
+#define TEGRA234_MAIN_GPIO_PORT_F 5
+#define TEGRA234_MAIN_GPIO_PORT_G 6
+#define TEGRA234_MAIN_GPIO_PORT_H 7
+#define TEGRA234_MAIN_GPIO_PORT_I 8
+#define TEGRA234_MAIN_GPIO_PORT_J 9
+#define TEGRA234_MAIN_GPIO_PORT_K 10
+#define TEGRA234_MAIN_GPIO_PORT_L 11
+#define TEGRA234_MAIN_GPIO_PORT_M 12
+#define TEGRA234_MAIN_GPIO_PORT_N 13
+#define TEGRA234_MAIN_GPIO_PORT_P 14
+#define TEGRA234_MAIN_GPIO_PORT_Q 15
+#define TEGRA234_MAIN_GPIO_PORT_R 16
+#define TEGRA234_MAIN_GPIO_PORT_X 17
+#define TEGRA234_MAIN_GPIO_PORT_Y 18
+#define TEGRA234_MAIN_GPIO_PORT_Z 19
+#define TEGRA234_MAIN_GPIO_PORT_AC 20
+#define TEGRA234_MAIN_GPIO_PORT_AD 21
+#define TEGRA234_MAIN_GPIO_PORT_AE 22
+#define TEGRA234_MAIN_GPIO_PORT_AF 23
+#define TEGRA234_MAIN_GPIO_PORT_AG 24
+
+#define TEGRA234_MAIN_GPIO(port, offset) \
+	((TEGRA234_MAIN_GPIO_PORT_##port * 8) + offset)
+
+/* GPIOs implemented by AON GPIO controller */
+#define TEGRA234_AON_GPIO_PORT_AA 0
+#define TEGRA234_AON_GPIO_PORT_BB 1
+#define TEGRA234_AON_GPIO_PORT_CC 2
+#define TEGRA234_AON_GPIO_PORT_DD 3
+#define TEGRA234_AON_GPIO_PORT_EE 4
+#define TEGRA234_AON_GPIO_PORT_GG 5
+
+#define TEGRA234_AON_GPIO(port, offset) \
+	((TEGRA234_AON_GPIO_PORT_##port * 8) + offset)
+
+#endif
-- 
2.17.1

[PATCH 2/2] gpio: tegra186: Add support for Tegra234 gpio

[Prathamesh Shete]

Add support for the Tegra234 GPIO bank configuration.

Signed-off-by: Prathamesh Shete <pshete@nvidia.com>
---
 drivers/gpio/gpio-tegra186.c | 74 ++++++++++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)

diff --git a/drivers/gpio/gpio-tegra186.c b/drivers/gpio/gpio-tegra186.c
index d38980b9923a..edcc91b35e1e 100644
--- a/drivers/gpio/gpio-tegra186.c
+++ b/drivers/gpio/gpio-tegra186.c
@@ -14,6 +14,7 @@
 
 #include <dt-bindings/gpio/tegra186-gpio.h>
 #include <dt-bindings/gpio/tegra194-gpio.h>
+#include <dt-bindings/gpio/tegra234-gpio.h>
 
 /* security registers */
 #define TEGRA186_GPIO_CTL_SCR 0x0c
@@ -877,6 +878,73 @@ static const struct tegra_gpio_soc tegra194_aon_soc = {
 	.instance = 1,
 };
 
+#define TEGRA234_MAIN_GPIO_PORT(_name, _bank, _port, _pins)	\
+	[TEGRA234_MAIN_GPIO_PORT_##_name] = {			\
+		.name = #_name,					\
+		.bank = _bank,					\
+		.port = _port,					\
+		.pins = _pins,					\
+	}
+
+static const struct tegra_gpio_port tegra234_main_ports[] = {
+	TEGRA234_MAIN_GPIO_PORT(A, 0, 0, 8),
+	TEGRA234_MAIN_GPIO_PORT(B, 0, 3, 1),
+	TEGRA234_MAIN_GPIO_PORT(C, 5, 1, 8),
+	TEGRA234_MAIN_GPIO_PORT(D, 5, 2, 4),
+	TEGRA234_MAIN_GPIO_PORT(E, 5, 3, 8),
+	TEGRA234_MAIN_GPIO_PORT(F, 5, 4, 6),
+	TEGRA234_MAIN_GPIO_PORT(G, 4, 0, 8),
+	TEGRA234_MAIN_GPIO_PORT(H, 4, 1, 8),
+	TEGRA234_MAIN_GPIO_PORT(I, 4, 2, 7),
+	TEGRA234_MAIN_GPIO_PORT(J, 5, 0, 6),
+	TEGRA234_MAIN_GPIO_PORT(K, 3, 0, 8),
+	TEGRA234_MAIN_GPIO_PORT(L, 3, 1, 4),
+	TEGRA234_MAIN_GPIO_PORT(M, 2, 0, 8),
+	TEGRA234_MAIN_GPIO_PORT(N, 2, 1, 8),
+	TEGRA234_MAIN_GPIO_PORT(P, 2, 2, 8),
+	TEGRA234_MAIN_GPIO_PORT(Q, 2, 3, 8),
+	TEGRA234_MAIN_GPIO_PORT(R, 2, 4, 6),
+	TEGRA234_MAIN_GPIO_PORT(X, 1, 0, 8),
+	TEGRA234_MAIN_GPIO_PORT(Y, 1, 1, 8),
+	TEGRA234_MAIN_GPIO_PORT(Z, 1, 2, 8),
+	TEGRA234_MAIN_GPIO_PORT(AC, 0, 1, 8),
+	TEGRA234_MAIN_GPIO_PORT(AD, 0, 2, 4),
+	TEGRA234_MAIN_GPIO_PORT(AE, 3, 3, 2),
+	TEGRA234_MAIN_GPIO_PORT(AF, 3, 4, 4),
+	TEGRA234_MAIN_GPIO_PORT(AG, 3, 2, 8)
+};
+
+static const struct tegra_gpio_soc tegra234_main_soc = {
+	.num_ports = ARRAY_SIZE(tegra234_main_ports),
+	.ports = tegra234_main_ports,
+	.name = "tegra234-gpio",
+	.instance = 0,
+};
+
+#define TEGRA234_AON_GPIO_PORT(_name, _bank, _port, _pins)	\
+	[TEGRA234_AON_GPIO_PORT_##_name] = {			\
+		.name = #_name,					\
+		.bank = _bank,					\
+		.port = _port,					\
+		.pins = _pins,					\
+	}
+
+static const struct tegra_gpio_port tegra234_aon_ports[] = {
+	TEGRA234_AON_GPIO_PORT(AA, 0, 4, 8),
+	TEGRA234_AON_GPIO_PORT(BB, 0, 5, 4),
+	TEGRA234_AON_GPIO_PORT(CC, 0, 2, 8),
+	TEGRA234_AON_GPIO_PORT(DD, 0, 3, 3),
+	TEGRA234_AON_GPIO_PORT(EE, 0, 0, 8),
+	TEGRA234_AON_GPIO_PORT(GG, 0, 1, 1)
+};
+
+static const struct tegra_gpio_soc tegra234_aon_soc = {
+	.num_ports = ARRAY_SIZE(tegra234_aon_ports),
+	.ports = tegra234_aon_ports,
+	.name = "tegra234-gpio-aon",
+	.instance = 1,
+};
+
 static const struct of_device_id tegra186_gpio_of_match[] = {
 	{
 		.compatible = "nvidia,tegra186-gpio",
@@ -890,6 +958,12 @@ static const struct of_device_id tegra186_gpio_of_match[] = {
 	}, {
 		.compatible = "nvidia,tegra194-gpio-aon",
 		.data = &tegra194_aon_soc
+	}, {
+		.compatible = "nvidia,tegra234-gpio",
+		.data = &tegra234_main_soc
+	}, {
+		.compatible = "nvidia,tegra234-gpio-aon",
+		.data = &tegra234_aon_soc
 	}, {
 		/* sentinel */
 	}
-- 
2.17.1

Re: [PATCH 2/2] gpio: tegra186: Add support for Tegra234 gpio

[Thierry Reding]

[-- Attachment #1: Type: text/plain, Size: 2125 bytes --]

On Thu, Oct 21, 2021 at 06:00:21PM +0530, Prathamesh Shete wrote:
> Add support for the Tegra234 GPIO bank configuration.
> 
> Signed-off-by: Prathamesh Shete <pshete@nvidia.com>
> ---
>  drivers/gpio/gpio-tegra186.c | 74 ++++++++++++++++++++++++++++++++++++
>  1 file changed, 74 insertions(+)
> 
> diff --git a/drivers/gpio/gpio-tegra186.c b/drivers/gpio/gpio-tegra186.c
> index d38980b9923a..edcc91b35e1e 100644
> --- a/drivers/gpio/gpio-tegra186.c
> +++ b/drivers/gpio/gpio-tegra186.c
> @@ -14,6 +14,7 @@
>  
>  #include <dt-bindings/gpio/tegra186-gpio.h>
>  #include <dt-bindings/gpio/tegra194-gpio.h>
> +#include <dt-bindings/gpio/tegra234-gpio.h>
>  
>  /* security registers */
>  #define TEGRA186_GPIO_CTL_SCR 0x0c
> @@ -877,6 +878,73 @@ static const struct tegra_gpio_soc tegra194_aon_soc = {
>  	.instance = 1,
>  };
>  
> +#define TEGRA234_MAIN_GPIO_PORT(_name, _bank, _port, _pins)	\
> +	[TEGRA234_MAIN_GPIO_PORT_##_name] = {			\
> +		.name = #_name,					\
> +		.bank = _bank,					\
> +		.port = _port,					\
> +		.pins = _pins,					\
> +	}
> +
> +static const struct tegra_gpio_port tegra234_main_ports[] = {
> +	TEGRA234_MAIN_GPIO_PORT(A, 0, 0, 8),
> +	TEGRA234_MAIN_GPIO_PORT(B, 0, 3, 1),
> +	TEGRA234_MAIN_GPIO_PORT(C, 5, 1, 8),
> +	TEGRA234_MAIN_GPIO_PORT(D, 5, 2, 4),
> +	TEGRA234_MAIN_GPIO_PORT(E, 5, 3, 8),
> +	TEGRA234_MAIN_GPIO_PORT(F, 5, 4, 6),
> +	TEGRA234_MAIN_GPIO_PORT(G, 4, 0, 8),
> +	TEGRA234_MAIN_GPIO_PORT(H, 4, 1, 8),
> +	TEGRA234_MAIN_GPIO_PORT(I, 4, 2, 7),
> +	TEGRA234_MAIN_GPIO_PORT(J, 5, 0, 6),
> +	TEGRA234_MAIN_GPIO_PORT(K, 3, 0, 8),
> +	TEGRA234_MAIN_GPIO_PORT(L, 3, 1, 4),
> +	TEGRA234_MAIN_GPIO_PORT(M, 2, 0, 8),
> +	TEGRA234_MAIN_GPIO_PORT(N, 2, 1, 8),
> +	TEGRA234_MAIN_GPIO_PORT(P, 2, 2, 8),
> +	TEGRA234_MAIN_GPIO_PORT(Q, 2, 3, 8),
> +	TEGRA234_MAIN_GPIO_PORT(R, 2, 4, 6),

I stumbled across an old patch I had created a couple of months ago that
is very similar to this one. However, at the time I had added a couple
more ports here, namely S, T, U and V. Is there a reason why you're not
including those here?

Thierry

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH 2/2] gpio: tegra186: Add support for Tegra234 gpio

[Thierry Reding]

[-- Attachment #1: Type: text/plain, Size: 2802 bytes --]

On Thu, Oct 28, 2021 at 04:47:27PM +0200, Thierry Reding wrote:
> On Thu, Oct 21, 2021 at 06:00:21PM +0530, Prathamesh Shete wrote:
> > Add support for the Tegra234 GPIO bank configuration.
> > 
> > Signed-off-by: Prathamesh Shete <pshete@nvidia.com>
> > ---
> >  drivers/gpio/gpio-tegra186.c | 74 ++++++++++++++++++++++++++++++++++++
> >  1 file changed, 74 insertions(+)
> > 
> > diff --git a/drivers/gpio/gpio-tegra186.c b/drivers/gpio/gpio-tegra186.c
> > index d38980b9923a..edcc91b35e1e 100644
> > --- a/drivers/gpio/gpio-tegra186.c
> > +++ b/drivers/gpio/gpio-tegra186.c
> > @@ -14,6 +14,7 @@
> >  
> >  #include <dt-bindings/gpio/tegra186-gpio.h>
> >  #include <dt-bindings/gpio/tegra194-gpio.h>
> > +#include <dt-bindings/gpio/tegra234-gpio.h>
> >  
> >  /* security registers */
> >  #define TEGRA186_GPIO_CTL_SCR 0x0c
> > @@ -877,6 +878,73 @@ static const struct tegra_gpio_soc tegra194_aon_soc = {
> >  	.instance = 1,
> >  };
> >  
> > +#define TEGRA234_MAIN_GPIO_PORT(_name, _bank, _port, _pins)	\
> > +	[TEGRA234_MAIN_GPIO_PORT_##_name] = {			\
> > +		.name = #_name,					\
> > +		.bank = _bank,					\
> > +		.port = _port,					\
> > +		.pins = _pins,					\
> > +	}
> > +
> > +static const struct tegra_gpio_port tegra234_main_ports[] = {
> > +	TEGRA234_MAIN_GPIO_PORT(A, 0, 0, 8),
> > +	TEGRA234_MAIN_GPIO_PORT(B, 0, 3, 1),
> > +	TEGRA234_MAIN_GPIO_PORT(C, 5, 1, 8),
> > +	TEGRA234_MAIN_GPIO_PORT(D, 5, 2, 4),
> > +	TEGRA234_MAIN_GPIO_PORT(E, 5, 3, 8),
> > +	TEGRA234_MAIN_GPIO_PORT(F, 5, 4, 6),
> > +	TEGRA234_MAIN_GPIO_PORT(G, 4, 0, 8),
> > +	TEGRA234_MAIN_GPIO_PORT(H, 4, 1, 8),
> > +	TEGRA234_MAIN_GPIO_PORT(I, 4, 2, 7),
> > +	TEGRA234_MAIN_GPIO_PORT(J, 5, 0, 6),
> > +	TEGRA234_MAIN_GPIO_PORT(K, 3, 0, 8),
> > +	TEGRA234_MAIN_GPIO_PORT(L, 3, 1, 4),
> > +	TEGRA234_MAIN_GPIO_PORT(M, 2, 0, 8),
> > +	TEGRA234_MAIN_GPIO_PORT(N, 2, 1, 8),
> > +	TEGRA234_MAIN_GPIO_PORT(P, 2, 2, 8),
> > +	TEGRA234_MAIN_GPIO_PORT(Q, 2, 3, 8),
> > +	TEGRA234_MAIN_GPIO_PORT(R, 2, 4, 6),
> 
> I stumbled across an old patch I had created a couple of months ago that
> is very similar to this one. However, at the time I had added a couple
> more ports here, namely S, T, U and V. Is there a reason why you're not
> including those here?

Nevermind, looks like my patch had been based on out-of-date
documentation, so the table here is correct.

That said, I noticed that you didn't include an update to the device
tree bindings documentation. I do have that, in addition to a conversion
to the new json-schema format. Do you mind if I resend your two patches
here along with the DT documentatino update that I have? I've also got
the DTS changes for Tegra234 to expose these, which I would also like to
include for completeness.

Thierry

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

RE: [PATCH 2/2] gpio: tegra186: Add support for Tegra234 gpio

[Prathamesh Shete]

Hi Thierry,

>>That said, I noticed that you didn't include an update to the device tree bindings documentation. I do have that, in addition to a conversion to the new json-schema format. Do you mind if I resend your two patches here along with the DT >>documentatino update that I have? I've also got the DTS changes for Tegra234 to expose these, which I would also like to include for completeness.

It would be helpful if you share the update to the device tree bindings documentation patch with me I will push all the changes together.
OR 
Can you please resend these patches along with device tree binding document patch that you have.
Anything is fine for me.

Thanks
Prathamesh.

-----Original Message-----
From: Thierry Reding <thierry.reding@gmail.com> 
Sent: Tuesday, November 2, 2021 6:52 PM
To: Prathamesh Shete <pshete@nvidia.com>
Cc: linus.walleij@linaro.org; bgolaszewski@baylibre.com; Jonathan Hunter <jonathanh@nvidia.com>; linux-gpio@vger.kernel.org; linux-tegra@vger.kernel.org; linux-kernel@vger.kernel.org; Suresh Mangipudi <smangipudi@nvidia.com>
Subject: Re: [PATCH 2/2] gpio: tegra186: Add support for Tegra234 gpio

On Thu, Oct 28, 2021 at 04:47:27PM +0200, Thierry Reding wrote:
> On Thu, Oct 21, 2021 at 06:00:21PM +0530, Prathamesh Shete wrote:
> > Add support for the Tegra234 GPIO bank configuration.
> > 
> > Signed-off-by: Prathamesh Shete <pshete@nvidia.com>
> > ---
> >  drivers/gpio/gpio-tegra186.c | 74 
> > ++++++++++++++++++++++++++++++++++++
> >  1 file changed, 74 insertions(+)
> > 
> > diff --git a/drivers/gpio/gpio-tegra186.c 
> > b/drivers/gpio/gpio-tegra186.c index d38980b9923a..edcc91b35e1e 
> > 100644
> > --- a/drivers/gpio/gpio-tegra186.c
> > +++ b/drivers/gpio/gpio-tegra186.c
> > @@ -14,6 +14,7 @@
> >  
> >  #include <dt-bindings/gpio/tegra186-gpio.h>
> >  #include <dt-bindings/gpio/tegra194-gpio.h>
> > +#include <dt-bindings/gpio/tegra234-gpio.h>
> >  
> >  /* security registers */
> >  #define TEGRA186_GPIO_CTL_SCR 0x0c
> > @@ -877,6 +878,73 @@ static const struct tegra_gpio_soc tegra194_aon_soc = {
> >  	.instance = 1,
> >  };
> >  
> > +#define TEGRA234_MAIN_GPIO_PORT(_name, _bank, _port, _pins)	\
> > +	[TEGRA234_MAIN_GPIO_PORT_##_name] = {			\
> > +		.name = #_name,					\
> > +		.bank = _bank,					\
> > +		.port = _port,					\
> > +		.pins = _pins,					\
> > +	}
> > +
> > +static const struct tegra_gpio_port tegra234_main_ports[] = {
> > +	TEGRA234_MAIN_GPIO_PORT(A, 0, 0, 8),
> > +	TEGRA234_MAIN_GPIO_PORT(B, 0, 3, 1),
> > +	TEGRA234_MAIN_GPIO_PORT(C, 5, 1, 8),
> > +	TEGRA234_MAIN_GPIO_PORT(D, 5, 2, 4),
> > +	TEGRA234_MAIN_GPIO_PORT(E, 5, 3, 8),
> > +	TEGRA234_MAIN_GPIO_PORT(F, 5, 4, 6),
> > +	TEGRA234_MAIN_GPIO_PORT(G, 4, 0, 8),
> > +	TEGRA234_MAIN_GPIO_PORT(H, 4, 1, 8),
> > +	TEGRA234_MAIN_GPIO_PORT(I, 4, 2, 7),
> > +	TEGRA234_MAIN_GPIO_PORT(J, 5, 0, 6),
> > +	TEGRA234_MAIN_GPIO_PORT(K, 3, 0, 8),
> > +	TEGRA234_MAIN_GPIO_PORT(L, 3, 1, 4),
> > +	TEGRA234_MAIN_GPIO_PORT(M, 2, 0, 8),
> > +	TEGRA234_MAIN_GPIO_PORT(N, 2, 1, 8),
> > +	TEGRA234_MAIN_GPIO_PORT(P, 2, 2, 8),
> > +	TEGRA234_MAIN_GPIO_PORT(Q, 2, 3, 8),
> > +	TEGRA234_MAIN_GPIO_PORT(R, 2, 4, 6),
> 
> I stumbled across an old patch I had created a couple of months ago 
> that is very similar to this one. However, at the time I had added a 
> couple more ports here, namely S, T, U and V. Is there a reason why 
> you're not including those here?

Nevermind, looks like my patch had been based on out-of-date documentation, so the table here is correct.

That said, I noticed that you didn't include an update to the device tree bindings documentation. I do have that, in addition to a conversion to the new json-schema format. Do you mind if I resend your two patches here along with the DT documentatino update that I have? I've also got the DTS changes for Tegra234 to expose these, which I would also like to include for completeness.

Thierry

Re: [PATCH 2/2] gpio: tegra186: Add support for Tegra234 gpio

[Linus Walleij]

On Wed, Nov 3, 2021 at 12:01 PM Prathamesh Shete <pshete@nvidia.com> wrote:

> It would be helpful if you share the update to the device tree bindings documentation patch with me I will push all the changes together.
> OR
> Can you please resend these patches along with device tree binding document patch that you have.

I'm just gonna assume that you guys sort this out and I can see the
combined tegra234 support in v2 :)

Yours,
Linus Walleij

Re: [PATCH 2/2] gpio: tegra186: Add support for Tegra234 gpio

[Thierry Reding]

[-- Attachment #1: Type: text/plain, Size: 743 bytes --]

On Tue, Nov 09, 2021 at 01:30:38AM +0100, Linus Walleij wrote:
> On Wed, Nov 3, 2021 at 12:01 PM Prathamesh Shete <pshete@nvidia.com> wrote:
> 
> > It would be helpful if you share the update to the device tree bindings documentation patch with me I will push all the changes together.
> > OR
> > Can you please resend these patches along with device tree binding document patch that you have.
> 
> I'm just gonna assume that you guys sort this out and I can see the
> combined tegra234 support in v2 :)

Yeah, I was working on some other Tegra234 related stuff and I'm about
ready to send out the whole set, though I will likely split it up a bit
because it's quite a few patches and not all are relevant to everyone.

Thierry

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]