pinctrl: mediatek: Convert to use grp member

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>

diff --git a/drivers/pinctrl/mediatek/pinctrl-moore.c b/drivers/pinctrl/mediatek/pinctrl-moore.c
index c3d59eddd994aa2e00f125875bb7530ff89c1a1e..d972584c0519b7324cc560b85b81b2e4c9e6f60d 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-moore.c
+++ b/drivers/pinctrl/mediatek/pinctrl-moore.c
@@ -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;
                }
        }

diff --git a/drivers/pinctrl/mediatek/pinctrl-moore.h b/drivers/pinctrl/mediatek/pinctrl-moore.h
index 36ee0021cf7edd0c73e5327842db9911a4347e49..e0313e7a1fe00e48e36289804de91ba34fc5811d 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-moore.h
+++ b/drivers/pinctrl/mediatek/pinctrl-moore.h
@@ -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,                                                     \
        }
 

diff --git a/drivers/pinctrl/mediatek/pinctrl-paris.h b/drivers/pinctrl/mediatek/pinctrl-paris.h
index 5c4e5b74e43e2e832cf727413fbe8b80aadd6ab4..948ce126aa0cb1dab87e5c8b258cd89ce3f2ed73 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-paris.h
+++ b/drivers/pinctrl/mediatek/pinctrl-paris.h
@@ -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,                                                     \
        }