[PATCH 0/3] pinctrl: renesas: trivial fixes and enhancements

classic Classic list List threaded Threaded
5 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH 0/3] pinctrl: renesas: trivial fixes and enhancements

Lad Prabhakar
Hi All,

This patch series includes trivial fixes and enhancements to
renesas pfc driver.

Cheers,
Prabhakar

Lad Prabhakar (3):
  pinctrl: renesas: Drop unused members from struct sh_pfc_pinctrl
  pinctrl: renesas: Make sure the pin type is updated after setting the
    MUX
  pinctrl: renesas: Implement get_pin_muxing() callback

 drivers/pinctrl/renesas/pfc.c | 54 ++++++++++++++++++++++++++++++-----
 1 file changed, 47 insertions(+), 7 deletions(-)

--
2.17.1

Reply | Threaded
Open this post in threaded view
|

[PATCH 1/3] pinctrl: renesas: Drop unused members from struct sh_pfc_pinctrl

Lad Prabhakar
Drop unused members from struct sh_pfc_pinctrl.

Signed-off-by: Lad Prabhakar <[hidden email]>
Reviewed-by: Biju Das <[hidden email]>
---
 drivers/pinctrl/renesas/pfc.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/pinctrl/renesas/pfc.c b/drivers/pinctrl/renesas/pfc.c
index f79dc411d8..6cccd33c40 100644
--- a/drivers/pinctrl/renesas/pfc.c
+++ b/drivers/pinctrl/renesas/pfc.c
@@ -51,10 +51,6 @@ struct sh_pfc_pinctrl {
  struct sh_pfc *pfc;
 
  struct sh_pfc_pin_config *configs;
-
- const char *func_prop_name;
- const char *groups_prop_name;
- const char *pins_prop_name;
 };
 
 struct sh_pfc_pin_range {
--
2.17.1

Reply | Threaded
Open this post in threaded view
|

[PATCH 2/3] pinctrl: renesas: Make sure the pin type is updated after setting the MUX

Lad Prabhakar
In reply to this post by Lad Prabhakar
Update pin type after every successful call to sh_pfc_config_mux().

This fixes pin functionality from being overwritten.

Signed-off-by: Lad Prabhakar <[hidden email]>
Reviewed-by: Biju Das <[hidden email]>
---
 drivers/pinctrl/renesas/pfc.c | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/drivers/pinctrl/renesas/pfc.c b/drivers/pinctrl/renesas/pfc.c
index 6cccd33c40..1ca1334775 100644
--- a/drivers/pinctrl/renesas/pfc.c
+++ b/drivers/pinctrl/renesas/pfc.c
@@ -538,11 +538,18 @@ static int sh_pfc_pinctrl_pin_set(struct udevice *dev, unsigned pin_selector,
  const struct sh_pfc_pin *pin = &priv->pfc.info->pins[pin_selector];
  int idx = sh_pfc_get_pin_index(pfc, pin->pin);
  struct sh_pfc_pin_config *cfg = &pmx->configs[idx];
+ int ret;
 
  if (cfg->type != PINMUX_TYPE_NONE)
  return -EBUSY;
 
- return sh_pfc_config_mux(pfc, pin->enum_id, PINMUX_TYPE_FUNCTION);
+ ret = sh_pfc_config_mux(pfc, pin->enum_id, PINMUX_TYPE_FUNCTION);
+ if (ret)
+ return ret;
+
+ cfg->type = PINMUX_TYPE_FUNCTION;
+
+ return 0;
 }
 
 static int sh_pfc_pinctrl_group_set(struct udevice *dev, unsigned group_selector,
@@ -552,12 +559,14 @@ static int sh_pfc_pinctrl_group_set(struct udevice *dev, unsigned group_selector
  struct sh_pfc_pinctrl *pmx = &priv->pmx;
  struct sh_pfc *pfc = &priv->pfc;
  const struct sh_pfc_pin_group *grp = &priv->pfc.info->groups[group_selector];
+ struct sh_pfc_pin_config *cfg;
  unsigned int i;
  int ret = 0;
+ int idx;
 
  for (i = 0; i < grp->nr_pins; ++i) {
- int idx = sh_pfc_get_pin_index(pfc, grp->pins[i]);
- struct sh_pfc_pin_config *cfg = &pmx->configs[idx];
+ idx = sh_pfc_get_pin_index(pfc, grp->pins[i]);
+ cfg = &pmx->configs[idx];
 
  if (cfg->type != PINMUX_TYPE_NONE) {
  ret = -EBUSY;
@@ -569,6 +578,10 @@ static int sh_pfc_pinctrl_group_set(struct udevice *dev, unsigned group_selector
  ret = sh_pfc_config_mux(pfc, grp->mux[i], PINMUX_TYPE_FUNCTION);
  if (ret < 0)
  break;
+
+ idx = sh_pfc_get_pin_index(pfc, grp->pins[i]);
+ cfg = &pmx->configs[idx];
+ cfg->type = PINMUX_TYPE_FUNCTION;
  }
 
 done:
--
2.17.1

Reply | Threaded
Open this post in threaded view
|

[PATCH 3/3] pinctrl: renesas: Implement get_pin_muxing() callback

Lad Prabhakar
In reply to this post by Lad Prabhakar
Implement get_pin_muxing() callback so that pinmux status
command can be used on Renesas platforms.

Signed-off-by: Lad Prabhakar <[hidden email]>
Reviewed-by: Biju Das <[hidden email]>
---
 drivers/pinctrl/renesas/pfc.c | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/drivers/pinctrl/renesas/pfc.c b/drivers/pinctrl/renesas/pfc.c
index 1ca1334775..57ad1d116b 100644
--- a/drivers/pinctrl/renesas/pfc.c
+++ b/drivers/pinctrl/renesas/pfc.c
@@ -45,6 +45,7 @@ enum sh_pfc_model {
 
 struct sh_pfc_pin_config {
  u32 type;
+ const char *function_name;
 };
 
 struct sh_pfc_pinctrl {
@@ -449,6 +450,30 @@ static const char *sh_pfc_pinctrl_get_group_name(struct udevice *dev,
  return priv->pfc.info->groups[selector].name;
 }
 
+static int sh_pfc_pinctrl_get_pin_muxing(struct udevice *dev,
+ unsigned int selector,
+ char *buf, int size)
+{
+ struct sh_pfc_pinctrl_priv *priv = dev_get_priv(dev);
+ struct sh_pfc_pinctrl *pmx = &priv->pmx;
+ struct sh_pfc *pfc = &priv->pfc;
+ struct sh_pfc_pin_config *cfg;
+ const struct sh_pfc_pin *pin;
+ int idx;
+
+ pin = &priv->pfc.info->pins[selector];
+ if (!pin) {
+ snprintf(buf, size, "Unknown");
+ return -EINVAL;
+ }
+
+ idx = sh_pfc_get_pin_index(pfc, pin->pin);
+ cfg = &pmx->configs[idx];
+ snprintf(buf, size, "%s", cfg->function_name);
+
+ return 0;
+}
+
 static int sh_pfc_pinctrl_get_functions_count(struct udevice *dev)
 {
  struct sh_pfc_pinctrl_priv *priv = dev_get_priv(dev);
@@ -496,6 +521,7 @@ static int sh_pfc_gpio_request_enable(struct udevice *dev,
  return ret;
 
  cfg->type = PINMUX_TYPE_GPIO;
+ cfg->function_name = "gpio";
 
  return 0;
 }
@@ -525,6 +551,7 @@ static int sh_pfc_gpio_disable_free(struct udevice *dev,
  cfg = &pmx->configs[idx];
 
  cfg->type = PINMUX_TYPE_NONE;
+ cfg->function_name = "none";
 
  return 0;
 }
@@ -548,6 +575,7 @@ static int sh_pfc_pinctrl_pin_set(struct udevice *dev, unsigned pin_selector,
  return ret;
 
  cfg->type = PINMUX_TYPE_FUNCTION;
+ cfg->function_name = "function";
 
  return 0;
 }
@@ -582,6 +610,7 @@ static int sh_pfc_pinctrl_group_set(struct udevice *dev, unsigned group_selector
  idx = sh_pfc_get_pin_index(pfc, grp->pins[i]);
  cfg = &pmx->configs[idx];
  cfg->type = PINMUX_TYPE_FUNCTION;
+ cfg->function_name = priv->pfc.info->groups[group_selector].name;
  }
 
 done:
@@ -788,6 +817,7 @@ static struct pinctrl_ops sh_pfc_pinctrl_ops = {
  .get_pin_name = sh_pfc_pinctrl_get_pin_name,
  .get_groups_count = sh_pfc_pinctrl_get_groups_count,
  .get_group_name = sh_pfc_pinctrl_get_group_name,
+ .get_pin_muxing = sh_pfc_pinctrl_get_pin_muxing,
  .get_functions_count = sh_pfc_pinctrl_get_functions_count,
  .get_function_name = sh_pfc_pinctrl_get_function_name,
 
@@ -818,6 +848,7 @@ static int sh_pfc_map_pins(struct sh_pfc *pfc, struct sh_pfc_pinctrl *pmx)
  for (i = 0; i < pfc->info->nr_pins; ++i) {
  struct sh_pfc_pin_config *cfg = &pmx->configs[i];
  cfg->type = PINMUX_TYPE_NONE;
+ cfg->function_name = "none";
  }
 
  return 0;
--
2.17.1

Reply | Threaded
Open this post in threaded view
|

Re: [PATCH 0/3] pinctrl: renesas: trivial fixes and enhancements

prabhakarlad
In reply to this post by Lad Prabhakar
On Wed, Sep 23, 2020 at 11:27 AM Lad Prabhakar
<[hidden email]> wrote:

>
> Hi All,
>
> This patch series includes trivial fixes and enhancements to
> renesas pfc driver.
>
> Cheers,
> Prabhakar
>
> Lad Prabhakar (3):
>   pinctrl: renesas: Drop unused members from struct sh_pfc_pinctrl
>   pinctrl: renesas: Make sure the pin type is updated after setting the
>     MUX
>   pinctrl: renesas: Implement get_pin_muxing() callback
>
>  drivers/pinctrl/renesas/pfc.c | 54 ++++++++++++++++++++++++++++++-----
>  1 file changed, 47 insertions(+), 7 deletions(-)
>
Gentle ping.

Cheers,
Prabhakar