| Message ID | 20230718161639.431910-1-fabrizio.castro.jz@renesas.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Pavel Machek |
| Headers | show |
| Series | [5.10.y-cip] pinctrl: renesas: rzv2m: Handle non-unique subnode names | expand |
HI all, > -----Original Message----- > From: Fabrizio Castro <fabrizio.castro.jz@renesas.com> > Sent: Wednesday, July 19, 2023 1:17 AM > To: cip-dev@lists.cip-project.org; iwamatsu nobuhiro(岩松 信洋 ○ＤＩＴＣ□ > ＤＩＴ○ＯＳＴ) <nobuhiro1.iwamatsu@toshiba.co.jp>; Pavel Machek > <pavel@denx.de> > Cc: Biju Das <biju.das@bp.renesas.com>; Lad Prabhakar > <prabhakar.mahadev-lad.rj@bp.renesas.com>; Fabrizio Castro > <fabrizio.castro.jz@renesas.com> > Subject: [PATCH 5.10.y-cip] pinctrl: renesas: rzv2m: Handle non-unique > subnode names > > From: Geert Uytterhoeven <geert+renesas@glider.be> > > Commit f46a0b47cc0829acd050213194c5a77351e619b2 upstream. > > The eMMC and SDHI pin control configuration nodes in DT have subnodes > with the same names ("data" and "ctrl"). As the RZ/V2M pin control driver > considers only the names of the subnodes, this leads to > conflicts: > > pinctrl-rzv2m b6250000.pinctrl: pin P8_2 already requested by > 85000000.mmc; cannot claim for 85020000.mmc > pinctrl-rzv2m b6250000.pinctrl: pin-130 (85020000.mmc) status -22 > renesas_sdhi_internal_dmac 85020000.mmc: Error applying setting, > reverse things back > > Fix this by constructing unique names from the node names of both the pin > control configuration node and its child node, where appropriate. > > Reported by: Fabrizio Castro <fabrizio.castro.jz@renesas.com> > > Fixes: 92a9b825257614af ("pinctrl: renesas: Add RZ/V2M pin and gpio > controller driver") > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > Tested-by: Fabrizio Castro <fabrizio.castro.jz@renesas.com> > Link: > https://lore.kernel.org/r/607bd6ab4905b0b1b119a06ef953fa1184505777.1688 > 396717.git.geert+renesas@glider.be > Signed-off-by: Fabrizio Castro <fabrizio.castro.jz@renesas.com> Looks good to me. I can apply if there are no comments. Reviewed-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp> Best regards, Nobuhiro
Hi! > > Reported by: Fabrizio Castro <fabrizio.castro.jz@renesas.com> > > > > Fixes: 92a9b825257614af ("pinctrl: renesas: Add RZ/V2M pin and gpio > > controller driver") > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > > Tested-by: Fabrizio Castro <fabrizio.castro.jz@renesas.com> > > Link: > > https://lore.kernel.org/r/607bd6ab4905b0b1b119a06ef953fa1184505777.1688 > > 396717.git.geert+renesas@glider.be > > Signed-off-by: Fabrizio Castro <fabrizio.castro.jz@renesas.com> > > Looks good to me. I can apply if there are no comments. > Reviewed-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp> Thank you, it looks okay to me, too, and passed testing, so I applied it with your Reviewed-by: tag. Best regards, Pavel
diff --git a/drivers/pinctrl/renesas/pinctrl-rzv2m.c b/drivers/pinctrl/renesas/pinctrl-rzv2m.c index e8c18198bebd..35f382b055e8 100644 --- a/drivers/pinctrl/renesas/pinctrl-rzv2m.c +++ b/drivers/pinctrl/renesas/pinctrl-rzv2m.c @@ -207,6 +207,7 @@ static int rzv2m_map_add_config(struct pinctrl_map *map, static int rzv2m_dt_subnode_to_map(struct pinctrl_dev *pctldev, struct device_node *np, + struct device_node *parent, struct pinctrl_map **map, unsigned int *num_maps, unsigned int *index) @@ -224,6 +225,7 @@ static int rzv2m_dt_subnode_to_map(struct pinctrl_dev *pctldev, struct property *prop; int ret, gsel, fsel; const char **pin_fn; + const char *name; const char *pin; pinmux = of_find_property(np, "pinmux", NULL); @@ -307,8 +309,19 @@ static int rzv2m_dt_subnode_to_map(struct pinctrl_dev *pctldev, psel_val[i] = MUX_FUNC(value); } + if (parent) { + name = devm_kasprintf(pctrl->dev, GFP_KERNEL, "%pOFn.%pOFn", + parent, np); + if (!name) { + ret = -ENOMEM; + goto done; + } + } else { + name = np->name; + } + /* Register a single pin group listing all the pins we read from DT */ - gsel = pinctrl_generic_add_group(pctldev, np->name, pins, num_pinmux, NULL); + gsel = pinctrl_generic_add_group(pctldev, name, pins, num_pinmux, NULL); if (gsel < 0) { ret = gsel; goto done; @@ -318,17 +331,16 @@ static int rzv2m_dt_subnode_to_map(struct pinctrl_dev *pctldev, * Register a single group function where the 'data' is an array PSEL * register values read from DT. */ - pin_fn[0] = np->name; - fsel = pinmux_generic_add_function(pctldev, np->name, pin_fn, 1, - psel_val); + pin_fn[0] = name; + fsel = pinmux_generic_add_function(pctldev, name, pin_fn, 1, psel_val); if (fsel < 0) { ret = fsel; goto remove_group; } maps[idx].type = PIN_MAP_TYPE_MUX_GROUP; - maps[idx].data.mux.group = np->name; - maps[idx].data.mux.function = np->name; + maps[idx].data.mux.group = name; + maps[idx].data.mux.function = name; idx++; dev_dbg(pctrl->dev, "Parsed %pOF with %d pins\n", np, num_pinmux); @@ -375,7 +387,7 @@ static int rzv2m_dt_node_to_map(struct pinctrl_dev *pctldev, index = 0; for_each_child_of_node(np, child) { - ret = rzv2m_dt_subnode_to_map(pctldev, child, map, + ret = rzv2m_dt_subnode_to_map(pctldev, child, np, map, num_maps, &index); if (ret < 0) { of_node_put(child); @@ -384,7 +396,7 @@ static int rzv2m_dt_node_to_map(struct pinctrl_dev *pctldev, } if (*num_maps == 0) { - ret = rzv2m_dt_subnode_to_map(pctldev, np, map, + ret = rzv2m_dt_subnode_to_map(pctldev, np, NULL, map, num_maps, &index); if (ret < 0) goto done;