pinctrl: pinconf-generic: Use only fwnode API in parse_dt_cfg()
Subsystems (2)
PATCH 1/1 pinctrl: pinconf-generic: Use only fwnode API in parse_dt_cfg()
The parse_dt_cfg() uses OF and fwnode APIs. Fix this inconsistency by fully switching it to use fwnode API and rename the function accordingly.
While at it, add missing linux/property.h inclusion.
--- drivers/pinctrl/pinconf-generic.c | 34 ++++++++++++++++--------------- 1 file changed, 18 insertions(+), 16 deletions(-)
drivers/pinctrl/pinconf-generic.c +18 -16
@@ -16,6 +16,7 @@#include <linux/init.h> #include <linux/module.h> #include <linux/of.h> +#include <linux/property.h> #include <linux/slab.h> #include <linux/seq_file.h>
@@ -205,19 +206,19 @@ static const struct pinconf_generic_params dt_params[] = { };/** -* parse_dt_cfg() - Parse DT pinconf parameters -* @np: DT node +* parse_fw_cfg() - Parse firmware pinconf parameters +* @fwnode: firmware node * @params: Array of describing generic parameters * @count: Number of entries in @params * @cfg: Array of parsed config options * @ncfg: Number of entries in @cfg * -* Parse the config options described in @params from @np and puts the result +* Parse the config options described in @params from @fwnode and puts the result * in @cfg. @cfg does not need to be empty, entries are added beginning at * @ncfg. @ncfg is updated to reflect the number of entries after parsing. @cfg * needs to have enough memory allocated to hold all possible entries. */ -static int parse_dt_cfg (struct device_node *np, +static int parse_fw_cfg (struct fwnode_handle *fwnode,const struct pinconf_generic_params *params,unsigned int count,unsigned long *cfg,unsigned int *ncfg)
@@ -233,7 +234,7 @@ static int parse_dt_cfg(struct device_node *np,const struct pinconf_generic_params *par = ¶ms[i];if (par->values && par->num_values) { - ret =fwnode_property_match_property_string (of_fwnode_handle (np), + ret =fwnode_property_match_property_string (fwnode, par->property, par->values, par->num_values);if (ret == -ENOENT )
@@ -243,7 +244,7 @@ static int parse_dt_cfg(struct device_node *np, ret =0 ; } }else { - ret =of_property_read_u32 (np, par->property, &val); + ret =fwnode_property_read_u32 (fwnode, par->property, &val); }/* property not found */
@@ -258,8 +259,8 @@ static int parse_dt_cfg(struct device_node *np,if (par->param <= count) { ret =test_and_set_bit (par->param, properties);if (ret) { -pr_err ("%s: conflicting setting detected for %s\n" , - np->name, par->property); +pr_err ("%pfw: conflicting setting detected for %s\n" , + fwnode, par->property);bitmap_free (properties);return -EINVAL ; }
@@ -272,8 +273,8 @@ static int parse_dt_cfg(struct device_node *np,if (test_bit (PIN_CONFIG_DRIVE_STRENGTH , properties) &&test_bit (PIN_CONFIG_DRIVE_STRENGTH_UA , properties)) -pr_err ("%s: cannot have multiple drive strength properties\n" , - np->name); +pr_err ("%pfw: cannot have multiple drive strength properties\n" , + fwnode); test =test_bit (PIN_CONFIG_BIAS_BUS_HOLD , properties) + test_bit(PIN_CONFIG_BIAS_DISABLE, properties) +
@@ -282,15 +283,15 @@ static int parse_dt_cfg(struct device_node *np,test_bit (PIN_CONFIG_BIAS_PULL_PIN_DEFAULT , properties) +test_bit (PIN_CONFIG_BIAS_PULL_DOWN , properties);if (test >1 ) -pr_err ("%s: cannot have multiple bias configurations\n" , - np->name); +pr_err ("%pfw: cannot have multiple bias configurations\n" , + fwnode); test =test_bit (PIN_CONFIG_DRIVE_OPEN_DRAIN , properties) +test_bit (PIN_CONFIG_DRIVE_OPEN_SOURCE , properties) +test_bit (PIN_CONFIG_DRIVE_PUSH_PULL , properties);if (test >1 ) -pr_err ("%s: cannot have multiple drive configurations\n" , - np->name); +pr_err ("%pfw: cannot have multiple drive configurations\n" , + fwnode);bitmap_free (properties);return 0 ;
@@ -371,6 +372,7 @@ int pinconf_generic_parse_dt_config(struct device_node *np,unsigned long **configs, unsigned int *nconfigs) { + struct fwnode_handle *fwnode = of_fwnode_handle(np);unsigned long *cfg;unsigned int max_cfg, ncfg =0 ;int ret;
@@ -386,12 +388,12 @@ int pinconf_generic_parse_dt_config(struct device_node *np,if (!cfg)return -ENOMEM ; - ret =parse_dt_cfg (np, dt_params,ARRAY_SIZE (dt_params), cfg, &ncfg); + ret =parse_fw_cfg (fwnode, dt_params,ARRAY_SIZE (dt_params), cfg, &ncfg);if (ret) goto out;if (pctldev && pctldev->desc->num_custom_params && pctldev->desc->custom_params) { - ret =parse_dt_cfg (np, pctldev->desc->custom_params, + ret =parse_fw_cfg (fwnode, pctldev->desc->custom_params, pctldev->desc->num_custom_params, cfg, &ncfg);if (ret) goto out;
Signature · 1 line
2.50.1
Linus Walleij
maintainerQuoted 6 lines · Andy Shevchenko
The
parse_dt_cfg()uses OF and fwnode APIs. Fix this inconsistency by fully switching it to use fwnode API and rename the function accordingly.While at it, add missing
linux/property.hinclusion.Signed-off-by Andy Shevchenko <[email protected]>
Patch applied, because obviously the kernel looks better after this patch than before it.
I had to rebase the last hunk of changes manually.
I think there is something more to do, but you probably already have a plan:
drivers/pinctrl/pinconf-generic.c int pinconf_generic_parse_dt_config(struct device_node *np, · line 391
Quoted 2 lines
drivers/pinctrl/pinconf-generic.c +1
-1- ret =parse_dt_cfg (np, dt_params,ARRAY_SIZE (dt_params), cfg, &ncfg); + ret =parse_fw_cfg (fwnode, dt_params,ARRAY_SIZE (dt_params), cfg, &ncfg);
and that uses:
#ifdef CONFIG_OF
static const struct pinconf_generic_params dt_params[] = {
{ "bias-bus-hold", PIN_CONFIG_BIAS_BUS_HOLD, 0 },
{ "bias-disable", PIN_CONFIG_BIAS_DISABLE, 0 },Are you already working on a patch? ;)
Yours,
Linus Walleij
Quoted 21 lines · Linus Walleij
Quoted 6 lines · Andy Shevchenko
The
parse_dt_cfg()uses OF and fwnode APIs. Fix this inconsistency by fully switching it to use fwnode API and rename the function accordingly.While at it, add missing
linux/property.hinclusion.Signed-off-by Andy Shevchenko <[email protected]>Patch applied, because obviously the kernel looks better after this patch than before it.
I had to rebase the last hunk of changes manually.
I think there is something more to do, but you probably already have a plan:
drivers/pinctrl/pinconf-generic.c int pinconf_generic_parse_dt_config(struct device_node *np, · line 391
Quoted 2 lines
drivers/pinctrl/pinconf-generic.c +1
-1- ret =parse_dt_cfg (np, dt_params,ARRAY_SIZE (dt_params), cfg, &ncfg); + ret =parse_fw_cfg (fwnode, dt_params,ARRAY_SIZE (dt_params), cfg, &ncfg);
Quoted 6 lines
and that uses:
#ifdef
CONFIG_OFstatic const struct pinconf_generic_params dt_params[] = { { "bias-bus-hold", PIN_CONFIG_BIAS_BUS_HOLD, 0 }, { "bias-disable", PIN_CONFIG_BIAS_DISABLE, 0 },
Yes, this all is still OF-centric code. The patch was solely for bringing a bit of consistency into one (parse_fw_cfg()) function. For now not much plans are here because ACPI case most likely will require something totally (with the reuse of the opaque pointers to the mappings, though) different.
Quoted 1 line
Are you already working on a patch? ;)
Actually I found one improvement I need to submit.
And looking now at pinconf_generic_parse_dt_pinmux() it also can be translated to fwnode inside.
Signature · 2 lines
With Best Regards, Andy Shevchenko