pinctrl: meson-axg-pmx: fix gpio request
Subsystems (2)
PATCH 1/2 pinctrl: meson-axg-pmx: fix gpio request
The AXG pmx driver gpio request offset needs the pin base to have the correct pin number.
--- drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c +4 -1
@@ -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 = {
Signature · 1 line
2.25.1
PATCH 1/2 pinctrl: meson-axg-pmx: fix gpio request
Quoted 15 lines · Neil Armstrong
The AXG pmx driver gpio request offset needs the pin base to have the correct pin number.
Signed-off-by Neil Armstrong <[email protected]>--- drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c +0
-0@@ -165,7 +165,10 @@ const struct pinctrl_ops meson_axg_pinctrl_ops = { static int meson_axg_gpio_request(struct udevice *dev,
drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c const struct pinctrl_ops meson_axg_pinctrl_ops = { · line 174
Quoted 10 lines
drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c +4
-1unsigned 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
PATCH 1/2 pinctrl: meson-axg-pmx: fix gpio request
In reply to Neil ArmstrongQuoted 10 lines
From: Neil Armstrong <[email protected]>
Date: Fri, 2 Oct 2020 11:05:39 +0200The AXG pmx driver gpio request offset needs the pin base to have the correct pin number.
Signed-off-by Neil Armstrong <[email protected]>--- 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.
Quoted 20 lines
drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c +4
-1@@ -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 = {Signature · 1 line
2.25.1
PATCH 2/2 pinctrl: meson-axg: add missing GPIOA_18
In reply to Neil ArmstrongAdd the missing GPIOA_18 from the missing EE gpio list.
--- drivers/pinctrl/meson/pinctrl-meson-axg.c | 1 + 1 file changed, 1 insertion(+)
drivers/pinctrl/meson/pinctrl-meson-axg.c +1 -0
@@ -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),
Signature · 1 line
2.25.1