iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pinctrl: mediatek: Convert to use grp member

Browse Source 
Convert drivers to use grp member embedded in struct group_desc,
because other members will be removed to avoid duplication and
desynchronisation of the generic pin group description.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20231211190321.307330-11-andriy.shevchenko@linux.intel.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Andy Shevchenko 2023-12-11 20:58:03 +02:00 committed by Linus Walleij
parent ffc1945e19
commit a1cf1a5f9b
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/pinctrl/mediatek/pinctrl-moore.c
View File

@ -56,12 +56,12 @@ static int mtk_pinmux_set_mux(struct pinctrl_dev *pctldev,
return -EINVAL;
dev_dbg(pctldev->dev, "enable function %s group %s\n",
func->name, grp->name);
func->name, grp->grp.name);
for (i = 0; i < grp->num_pins; i++) {
for (i = 0; i < grp->grp.npins; i++) {
const struct mtk_pin_desc *desc;
int *pin_modes = grp->data;
int pin = grp->pins[i];
int pin = grp->grp.pins[i];
desc = (const struct mtk_pin_desc *)&hw->soc->pins[pin];
if (!desc->name)
@ -602,13 +602,12 @@ static int mtk_build_groups(struct mtk_pinctrl *hw)
for (i = 0; i < hw->soc->ngrps; i++) {
const struct group_desc *group = hw->soc->grps + i;
const struct pingroup *grp = &group->grp;
err = pinctrl_generic_add_group(hw->pctrl, group->name,
group->pins, group->num_pins,
err = pinctrl_generic_add_group(hw->pctrl, grp->name, grp->pins, grp->npins,
group->data);
if (err < 0) {
dev_err(hw->dev, "Failed to register group %s\n",
group->name);
dev_err(hw->dev, "Failed to register group %s\n", grp->name);
return err;
}
}

4
drivers/pinctrl/mediatek/pinctrl-moore.h
View File

@ -39,9 +39,7 @@
#define PINCTRL_PIN_GROUP(_name_, id) \
{ \
.name = _name_, \
.pins = id##_pins, \
.num_pins = ARRAY_SIZE(id##_pins), \
.grp = PINCTRL_PINGROUP(_name_, id##_pins, ARRAY_SIZE(id##_pins)), \
.data = id##_funcs, \
}

4
drivers/pinctrl/mediatek/pinctrl-paris.h
View File

@ -51,9 +51,7 @@
#define PINCTRL_PIN_GROUP(_name_, id) \
{ \
.name = _name_, \
.pins = id##_pins, \
.num_pins = ARRAY_SIZE(id##_pins), \
.grp = PINCTRL_PINGROUP(_name_,id##_pins, ARRAY_SIZE(id##_pins)), \
.data = id##_funcs, \
}