From: Andy Shevchenko <andriy.shevchenko@linux.intel.com> To: "Linus Walleij" <linus.walleij@linaro.org>, "Bartosz Golaszewski" <bartosz.golaszewski@linaro.org>, "Andy Shevchenko" <andriy.shevchenko@linux.intel.com>, "Rasmus Villemoes" <linux@rasmusvillemoes.dk>, "Jonathan Neuschäfer" <j.neuschaefer@gmx.net>, "Krzysztof Kozlowski" <krzysztof.kozlowski@linaro.org>, "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>, "Geert Uytterhoeven" <geert+renesas@glider.be>, "Biju Das" <biju.das.jz@bp.renesas.com>, "Claudiu Beznea" <claudiu.beznea.uj@bp.renesas.com>, "Jianlong Huang" <jianlong.huang@starfivetech.com>, linux-arm-kernel@lists.infradead.org, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, openbmc@lists.ozlabs.org, linux-mips@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-renesas-soc@vger.kernel.org Cc: Ray Jui <rjui@broadcom.com>, Scott Branden <sbranden@broadcom.com>, Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>, Dong Aisheng <aisheng.dong@nxp.com>, Fabio Estevam <festevam@gmail.com>, Shawn Guo <shawnguo@kernel.org>, Jacky Bai <ping.bai@nxp.com>, Pengutronix Kernel Team <kernel@pengutronix.de>, Sascha Hauer <s.hauer@pengutronix.de>, NXP Linux Team <linux-imx@nxp.com>, Sean Wang <sean.wang@kernel.org>, Paul Cercueil <paul@crapouillou.net>, Lakshmi Sowjanya D <lakshmi.sowjanya.d@intel.com>, Andy Gross <agross@kernel.org>, Bjorn Andersson <andersson@kernel.org>, Konrad Dybcio <konrad.dybcio@linaro.org>, Emil Renner Berthing <kernel@esmil.dk>, Hal Feng <hal.feng@starfivetech.com> Subject: [PATCH v3 13/22] pinctrl: core: Embed struct pingroup into struct group_desc Date: Tue, 28 Nov 2023 21:57:02 +0200 [thread overview] Message-ID: <20231128200155.438722-14-andriy.shevchenko@linux.intel.com> (raw) In-Reply-To: <20231128200155.438722-1-andriy.shevchenko@linux.intel.com> 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. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/pinctrl/core.c | 15 ++++++++++++--- drivers/pinctrl/core.h | 5 +++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c index 3f1fd50fbb10..e08d4b3b0a56 100644 --- a/drivers/pinctrl/core.c +++ b/drivers/pinctrl/core.c @@ -559,7 +559,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); @@ -585,8 +588,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 276a631fd49c..863b4956a41e 100644 --- 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 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, \ -- 2.43.0.rc1.1.gbec44491f096
WARNING: multiple messages have this Message-ID (diff)
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com> To: "Linus Walleij" <linus.walleij@linaro.org>, "Bartosz Golaszewski" <bartosz.golaszewski@linaro.org>, "Andy Shevchenko" <andriy.shevchenko@linux.intel.com>, "Rasmus Villemoes" <linux@rasmusvillemoes.dk>, "Jonathan Neuschäfer" <j.neuschaefer@gmx.net>, "Krzysztof Kozlowski" <krzysztof.kozlowski@linaro.org>, "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>, "Geert Uytterhoeven" <geert+renesas@glider.be>, "Biju Das" <biju.das.jz@bp.renesas.com>, "Claudiu Beznea" <claudiu.beznea.uj@bp.renesas.com>, "Jianlong Huang" <jianlong.huang@starfivetech.com>, linux-arm-kernel@lists.infradead.org, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, openbmc@lists.ozlabs.org, linux-mips@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-renesas-soc@vger.kernel.org Cc: Ray Jui <rjui@broadcom.com>, Scott Branden <sbranden@broadcom.com>, Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>, Dong Aisheng <aisheng.dong@nxp.com>, Fabio Estevam <festevam@gmail.com>, Shawn Guo <shawnguo@kernel.org>, Jacky Bai <ping.bai@nxp.com>, Pengutronix Kernel Team <kernel@pengutronix.de>, Sascha Hauer <s.hauer@pengutronix.de>, NXP Linux Team <linux-imx@nxp.com>, Sean Wang <sean.wang@kernel.org>, Paul Cercueil <paul@crapouillou.net>, Lakshmi Sowjanya D <lakshmi.sowjanya.d@intel.com>, Andy Gross <agross@kernel.org>, Bjorn Andersson <andersson@kernel.org>, Konrad Dybcio <konrad.dybcio@linaro.org>, Emil Renner Berthing <kernel@esmil.dk>, Hal Feng <hal.feng@starfivetech.com> Subject: [PATCH v3 13/22] pinctrl: core: Embed struct pingroup into struct group_desc Date: Tue, 28 Nov 2023 21:57:02 +0200 [thread overview] Message-ID: <20231128200155.438722-14-andriy.shevchenko@linux.intel.com> (raw) In-Reply-To: <20231128200155.438722-1-andriy.shevchenko@linux.intel.com> 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. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/pinctrl/core.c | 15 ++++++++++++--- drivers/pinctrl/core.h | 5 +++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c index 3f1fd50fbb10..e08d4b3b0a56 100644 --- a/drivers/pinctrl/core.c +++ b/drivers/pinctrl/core.c @@ -559,7 +559,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); @@ -585,8 +588,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 276a631fd49c..863b4956a41e 100644 --- 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 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, \ -- 2.43.0.rc1.1.gbec44491f096 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2023-11-28 20:05 UTC|newest] Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-11-28 19:56 [PATCH v3 00/22] pinctrl: Convert struct group_desc to use struct pingroup Andy Shevchenko 2023-11-28 19:56 ` Andy Shevchenko 2023-11-28 19:56 ` [PATCH v3 01/22] pinctrl: qcom: lpass-lpi: Replace kernel.h with what is being used Andy Shevchenko 2023-11-28 19:56 ` Andy Shevchenko 2023-11-28 19:56 ` [PATCH v3 02/22] pinctrl: qcom: lpass-lpi: Remove unused member in struct lpi_pingroup Andy Shevchenko 2023-11-28 19:56 ` Andy Shevchenko 2023-11-28 19:56 ` [PATCH v3 03/22] pinctrl: equilibrium: Unshadow error code of of_property_count_u32_elems() Andy Shevchenko 2023-11-28 19:56 ` Andy Shevchenko 2023-11-28 19:56 ` [PATCH v3 04/22] pinctrl: equilibrium: Use temporary variable to hold pins Andy Shevchenko 2023-11-28 19:56 ` Andy Shevchenko 2023-11-28 19:56 ` [PATCH v3 05/22] pinctrl: imx: " Andy Shevchenko 2023-11-28 19:56 ` Andy Shevchenko 2023-11-28 19:56 ` [PATCH v3 06/22] pinctrl: core: Make pins const in struct group_desc Andy Shevchenko 2023-11-28 19:56 ` Andy Shevchenko 2023-11-29 11:21 ` Geert Uytterhoeven 2023-11-29 11:21 ` Geert Uytterhoeven 2023-11-29 13:41 ` Andy Shevchenko 2023-11-29 13:41 ` Andy Shevchenko 2023-11-29 14:23 ` Andy Shevchenko 2023-11-29 14:23 ` Andy Shevchenko 2023-11-29 15:34 ` Geert Uytterhoeven 2023-11-29 15:34 ` Geert Uytterhoeven 2023-11-28 19:56 ` [PATCH v3 07/22] pinctrl: equilibrium: Convert to use struct pingroup Andy Shevchenko 2023-11-28 19:56 ` Andy Shevchenko 2023-11-28 19:56 ` [PATCH v3 08/22] pinctrl: keembay: " Andy Shevchenko 2023-11-28 19:56 ` Andy Shevchenko 2023-11-28 19:56 ` [PATCH v3 09/22] pinctrl: nuvoton: Convert to use struct pingroup and PINCTRL_PINGROUP() Andy Shevchenko 2023-11-28 19:56 ` Andy Shevchenko 2023-11-28 19:56 ` [PATCH v3 10/22] pinctrl: core: Add a convenient define PINCTRL_GROUP_DESC() Andy Shevchenko 2023-11-28 19:56 ` Andy Shevchenko 2023-11-29 11:12 ` Geert Uytterhoeven 2023-11-29 11:12 ` Geert Uytterhoeven 2023-11-28 19:57 ` [PATCH v3 11/22] pinctrl: ingenic: Make use of PINCTRL_GROUP_DESC() Andy Shevchenko 2023-11-28 19:57 ` Andy Shevchenko 2023-11-29 12:40 ` Paul Cercueil 2023-11-29 12:40 ` Paul Cercueil 2023-11-28 19:57 ` [PATCH v3 12/22] pinctrl: mediatek: " Andy Shevchenko 2023-11-28 19:57 ` Andy Shevchenko 2023-11-28 19:57 ` Andy Shevchenko [this message] 2023-11-28 19:57 ` [PATCH v3 13/22] pinctrl: core: Embed struct pingroup into struct group_desc Andy Shevchenko 2023-11-29 11:14 ` Geert Uytterhoeven 2023-11-29 11:14 ` Geert Uytterhoeven 2023-11-28 19:57 ` [PATCH v3 14/22] pinctrl: bcm: Convert to use grp member Andy Shevchenko 2023-11-28 19:57 ` Andy Shevchenko 2023-11-28 19:57 ` [PATCH v3 15/22] pinctrl: equilibrium: " Andy Shevchenko 2023-11-28 19:57 ` Andy Shevchenko 2023-11-28 19:57 ` [PATCH v3 16/22] pinctrl: imx: " Andy Shevchenko 2023-11-28 19:57 ` Andy Shevchenko 2023-11-28 19:57 ` [PATCH v3 17/22] pinctrl: ingenic: " Andy Shevchenko 2023-11-28 19:57 ` Andy Shevchenko 2023-11-28 19:57 ` [PATCH v3 18/22] pinctrl: keembay: " Andy Shevchenko 2023-11-28 19:57 ` Andy Shevchenko 2023-11-28 19:57 ` [PATCH v3 19/22] pinctrl: mediatek: " Andy Shevchenko 2023-11-28 19:57 ` Andy Shevchenko 2023-11-28 19:57 ` [PATCH v3 20/22] pinctrl: renesas: " Andy Shevchenko 2023-11-28 19:57 ` Andy Shevchenko 2023-11-29 11:10 ` Geert Uytterhoeven 2023-11-29 11:10 ` Geert Uytterhoeven 2023-11-28 19:57 ` [PATCH v3 21/22] pinctrl: starfive: " Andy Shevchenko 2023-11-28 19:57 ` Andy Shevchenko 2023-11-28 19:57 ` [PATCH v3 22/22] pinctrl: core: Remove unused members from struct group_desc Andy Shevchenko 2023-11-28 19:57 ` Andy Shevchenko 2023-11-29 11:14 ` Geert Uytterhoeven 2023-11-29 11:14 ` Geert Uytterhoeven
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20231128200155.438722-14-andriy.shevchenko@linux.intel.com \ --to=andriy.shevchenko@linux.intel.com \ --cc=agross@kernel.org \ --cc=aisheng.dong@nxp.com \ --cc=andersson@kernel.org \ --cc=bartosz.golaszewski@linaro.org \ --cc=bcm-kernel-feedback-list@broadcom.com \ --cc=biju.das.jz@bp.renesas.com \ --cc=claudiu.beznea.uj@bp.renesas.com \ --cc=festevam@gmail.com \ --cc=geert+renesas@glider.be \ --cc=hal.feng@starfivetech.com \ --cc=j.neuschaefer@gmx.net \ --cc=jianlong.huang@starfivetech.com \ --cc=kernel@esmil.dk \ --cc=kernel@pengutronix.de \ --cc=konrad.dybcio@linaro.org \ --cc=krzysztof.kozlowski@linaro.org \ --cc=lakshmi.sowjanya.d@intel.com \ --cc=linus.walleij@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-arm-msm@vger.kernel.org \ --cc=linux-gpio@vger.kernel.org \ --cc=linux-imx@nxp.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mediatek@lists.infradead.org \ --cc=linux-mips@vger.kernel.org \ --cc=linux-renesas-soc@vger.kernel.org \ --cc=linux@rasmusvillemoes.dk \ --cc=openbmc@lists.ozlabs.org \ --cc=paul@crapouillou.net \ --cc=ping.bai@nxp.com \ --cc=rjui@broadcom.com \ --cc=s.hauer@pengutronix.de \ --cc=sbranden@broadcom.com \ --cc=sean.wang@kernel.org \ --cc=shawnguo@kernel.org \ --cc=u.kleine-koenig@pengutronix.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.