All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] pinctrl: meson-axg-pmx: fix gpio request
@ 2020-10-02  9:05 ` Neil Armstrong
  0 siblings, 0 replies; 7+ messages in thread
From: Neil Armstrong @ 2020-10-02  9:05 UTC (permalink / raw)
  To: u-boot

The AXG pmx driver gpio request offset needs the pin base to have the
correct pin number.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
 drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c b/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c
index c6cb941d0a..cfe94cf9e1 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c
@@ -165,7 +165,10 @@ const struct pinctrl_ops meson_axg_pinctrl_ops = {
 static int meson_axg_gpio_request(struct udevice *dev,
 				  unsigned int offset, const char *label)
 {
-	return meson_axg_pmx_update_function(dev->parent, offset, 0);
+	struct meson_pinctrl *priv = dev_get_priv(dev->parent);
+
+	return meson_axg_pmx_update_function(dev->parent,
+					     offset + priv->data->pin_base, 0);
 }
 
 static const struct dm_gpio_ops meson_axg_gpio_ops = {
-- 
2.25.1

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH 1/2] pinctrl: meson-axg-pmx: fix gpio request
@ 2020-10-02  9:05 ` Neil Armstrong
  0 siblings, 0 replies; 7+ messages in thread
From: Neil Armstrong @ 2020-10-02  9:05 UTC (permalink / raw)
  To: u-boot; +Cc: u-boot-amlogic, Neil Armstrong

The AXG pmx driver gpio request offset needs the pin base to have the
correct pin number.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
 drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c b/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c
index c6cb941d0a..cfe94cf9e1 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c
@@ -165,7 +165,10 @@ const struct pinctrl_ops meson_axg_pinctrl_ops = {
 static int meson_axg_gpio_request(struct udevice *dev,
 				  unsigned int offset, const char *label)
 {
-	return meson_axg_pmx_update_function(dev->parent, offset, 0);
+	struct meson_pinctrl *priv = dev_get_priv(dev->parent);
+
+	return meson_axg_pmx_update_function(dev->parent,
+					     offset + priv->data->pin_base, 0);
 }
 
 static const struct dm_gpio_ops meson_axg_gpio_ops = {
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH 2/2] pinctrl: meson-axg: add missing GPIOA_18
  2020-10-02  9:05 ` Neil Armstrong
@ 2020-10-02  9:05   ` Neil Armstrong
  -1 siblings, 0 replies; 7+ messages in thread
From: Neil Armstrong @ 2020-10-02  9:05 UTC (permalink / raw)
  To: u-boot

Add the missing GPIOA_18 from the missing EE gpio list.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
 drivers/pinctrl/meson/pinctrl-meson-axg.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/pinctrl/meson/pinctrl-meson-axg.c b/drivers/pinctrl/meson/pinctrl-meson-axg.c
index 8f23c8cef1..11809b29f3 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-axg.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-axg.c
@@ -298,6 +298,7 @@ static struct meson_pmx_group meson_axg_periphs_groups[] = {
 	GPIO_GROUP(GPIOA_15, EE_OFF),
 	GPIO_GROUP(GPIOA_16, EE_OFF),
 	GPIO_GROUP(GPIOA_17, EE_OFF),
+	GPIO_GROUP(GPIOA_18, EE_OFF),
 	GPIO_GROUP(GPIOA_19, EE_OFF),
 	GPIO_GROUP(GPIOA_20, EE_OFF),
 
-- 
2.25.1

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH 2/2] pinctrl: meson-axg: add missing GPIOA_18
@ 2020-10-02  9:05   ` Neil Armstrong
  0 siblings, 0 replies; 7+ messages in thread
From: Neil Armstrong @ 2020-10-02  9:05 UTC (permalink / raw)
  To: u-boot; +Cc: u-boot-amlogic, Neil Armstrong

Add the missing GPIOA_18 from the missing EE gpio list.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
 drivers/pinctrl/meson/pinctrl-meson-axg.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/pinctrl/meson/pinctrl-meson-axg.c b/drivers/pinctrl/meson/pinctrl-meson-axg.c
index 8f23c8cef1..11809b29f3 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-axg.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-axg.c
@@ -298,6 +298,7 @@ static struct meson_pmx_group meson_axg_periphs_groups[] = {
 	GPIO_GROUP(GPIOA_15, EE_OFF),
 	GPIO_GROUP(GPIOA_16, EE_OFF),
 	GPIO_GROUP(GPIOA_17, EE_OFF),
+	GPIO_GROUP(GPIOA_18, EE_OFF),
 	GPIO_GROUP(GPIOA_19, EE_OFF),
 	GPIO_GROUP(GPIOA_20, EE_OFF),
 
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH 1/2] pinctrl: meson-axg-pmx: fix gpio request
  2020-10-02  9:05 ` Neil Armstrong
  (?)
  (?)
@ 2020-10-02  9:29 ` Mark Kettenis
  -1 siblings, 0 replies; 7+ messages in thread
From: Mark Kettenis @ 2020-10-02  9:29 UTC (permalink / raw)
  To: u-boot

> From: Neil Armstrong <narmstrong@baylibre.com>
> Date: Fri,  2 Oct 2020 11:05:39 +0200
> 
> The AXG pmx driver gpio request offset needs the pin base to have the
> correct pin number.
> 
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
> ---
>  drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)

I had a very similar diff in one of my u-boot trees.

Reviewed-by: Mark Kettenis <kettenis@openbsd.org>


> diff --git a/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c b/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c
> index c6cb941d0a..cfe94cf9e1 100644
> --- a/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c
> +++ b/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c
> @@ -165,7 +165,10 @@ const struct pinctrl_ops meson_axg_pinctrl_ops = {
>  static int meson_axg_gpio_request(struct udevice *dev,
>  				  unsigned int offset, const char *label)
>  {
> -	return meson_axg_pmx_update_function(dev->parent, offset, 0);
> +	struct meson_pinctrl *priv = dev_get_priv(dev->parent);
> +
> +	return meson_axg_pmx_update_function(dev->parent,
> +					     offset + priv->data->pin_base, 0);
>  }
>  
>  static const struct dm_gpio_ops meson_axg_gpio_ops = {
> -- 
> 2.25.1
> 
> 

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 1/2] pinctrl: meson-axg-pmx: fix gpio request
  2020-10-02  9:05 ` Neil Armstrong
@ 2020-10-05 16:01   ` Neil Armstrong
  -1 siblings, 0 replies; 7+ messages in thread
From: Neil Armstrong @ 2020-10-05 16:01 UTC (permalink / raw)
  To: u-boot

On 02/10/2020 11:05, Neil Armstrong wrote:
> The AXG pmx driver gpio request offset needs the pin base to have the
> correct pin number.
> 
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
> ---
>  drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c b/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c
> index c6cb941d0a..cfe94cf9e1 100644
> --- a/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c
> +++ b/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c
> @@ -165,7 +165,10 @@ const struct pinctrl_ops meson_axg_pinctrl_ops = {
>  static int meson_axg_gpio_request(struct udevice *dev,
>  				  unsigned int offset, const char *label)
>  {
> -	return meson_axg_pmx_update_function(dev->parent, offset, 0);
> +	struct meson_pinctrl *priv = dev_get_priv(dev->parent);
> +
> +	return meson_axg_pmx_update_function(dev->parent,
> +					     offset + priv->data->pin_base, 0);
>  }
>  
>  static const struct dm_gpio_ops meson_axg_gpio_ops = {
> 

Applied both to u-boot-amlogic

Neil

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 1/2] pinctrl: meson-axg-pmx: fix gpio request
@ 2020-10-05 16:01   ` Neil Armstrong
  0 siblings, 0 replies; 7+ messages in thread
From: Neil Armstrong @ 2020-10-05 16:01 UTC (permalink / raw)
  To: u-boot; +Cc: u-boot-amlogic

On 02/10/2020 11:05, Neil Armstrong wrote:
> The AXG pmx driver gpio request offset needs the pin base to have the
> correct pin number.
> 
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
> ---
>  drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c b/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c
> index c6cb941d0a..cfe94cf9e1 100644
> --- a/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c
> +++ b/drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c
> @@ -165,7 +165,10 @@ const struct pinctrl_ops meson_axg_pinctrl_ops = {
>  static int meson_axg_gpio_request(struct udevice *dev,
>  				  unsigned int offset, const char *label)
>  {
> -	return meson_axg_pmx_update_function(dev->parent, offset, 0);
> +	struct meson_pinctrl *priv = dev_get_priv(dev->parent);
> +
> +	return meson_axg_pmx_update_function(dev->parent,
> +					     offset + priv->data->pin_base, 0);
>  }
>  
>  static const struct dm_gpio_ops meson_axg_gpio_ops = {
> 

Applied both to u-boot-amlogic

Neil

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2020-10-05 16:02 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-02  9:05 [PATCH 1/2] pinctrl: meson-axg-pmx: fix gpio request Neil Armstrong
2020-10-02  9:05 ` Neil Armstrong
2020-10-02  9:05 ` [PATCH 2/2] pinctrl: meson-axg: add missing GPIOA_18 Neil Armstrong
2020-10-02  9:05   ` Neil Armstrong
2020-10-02  9:29 ` [PATCH 1/2] pinctrl: meson-axg-pmx: fix gpio request Mark Kettenis
2020-10-05 16:01 ` Neil Armstrong
2020-10-05 16:01   ` Neil Armstrong

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.