pinctrl: core: Embed struct pingroup into struct group_desc

struct group_desc is a particular version of the struct pingroup
with associated opaque data. Start switching pin control core and
drivers to use it explicitly.

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20231211190321.307330-5-andriy.shevchenko@linux.intel.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
index 540221d..8a457b5 100644 (file)
--- a/drivers/pinctrl/core.c
+++ b/drivers/pinctrl/core.c
@@ -557,7 +557,10 @@ const char *pinctrl_generic_get_group_name(struct pinctrl_dev *pctldev,
        if (!group)
                return NULL;
 
-       return group->name;
+       if (group->name)
+               return group->name;
+
+       return group->grp.name;
 }
 EXPORT_SYMBOL_GPL(pinctrl_generic_get_group_name);
 
@@ -583,8 +586,14 @@ int pinctrl_generic_get_group_pins(struct pinctrl_dev *pctldev,
                return -EINVAL;
        }
 
-       *pins = group->pins;
-       *num_pins = group->num_pins;
+       if (group->pins) {
+               *pins = group->pins;
+               *num_pins = group->num_pins;
+               return 0;
+       }
+
+       *pins = group->grp.pins;
+       *num_pins = group->grp.npins;
 
        return 0;
 }

diff --git a/drivers/pinctrl/core.h b/drivers/pinctrl/core.h
index bf971e6..a3b75ec 100644 (file)
--- a/drivers/pinctrl/core.h
+++ b/drivers/pinctrl/core.h
@@ -194,14 +194,18 @@ struct pinctrl_maps {
 
 #ifdef CONFIG_GENERIC_PINCTRL_GROUPS
 
+#include <linux/pinctrl/pinctrl.h>
+
 /**
  * struct group_desc - generic pin group descriptor
+ * @grp: generic data of the pin group (name and pins)
  * @name: name of the pin group
  * @pins: array of pins that belong to the group
  * @num_pins: number of pins in the group
  * @data: pin controller driver specific data
  */
 struct group_desc {
+       struct pingroup grp;
        const char *name;
        const unsigned int *pins;
        int num_pins;
@@ -211,6 +215,7 @@ struct group_desc {
 /* Convenience macro to define a generic pin group descriptor */
 #define PINCTRL_GROUP_DESC(_name, _pins, _num_pins, _data)     \
 (struct group_desc) {                                          \
+       .grp = PINCTRL_PINGROUP(_name, _pins, _num_pins),       \
        .name = _name,                                          \
        .pins = _pins,                                          \
        .num_pins = _num_pins,                                  \