Proxmox-Port/linux-loongson
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson synced 2025-08-30 13:03:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pinctrl: nuvoton: Reduce use of OF-specific APIs

Browse Source 
Some drivers are using device property APIs along with OF-specific ones.
At the same time few of the latter can be converted to device property
calls. Reduce use of OF-specific APIs in order to bring a bit more consistency
into the drivers.

Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/20250318105932.2090926-6-andriy.shevchenko@linux.intel.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Andy Shevchenko 2025-03-18 12:57:18 +02:00 committed by Linus Walleij
parent d52ecc655a
commit 693c9ecd83
4 changed files with 21 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/pinctrl/nuvoton/pinctrl-ma35.c
View File

@ -519,7 +519,6 @@ static int ma35_gpiolib_register(struct platform_device *pdev, struct ma35_pinct
bank->irqtype = 0; bank->irqtype = 0;
bank->irqinten = 0; bank->irqinten = 0;
bank->chip.label = bank->name; bank->chip.label = bank->name;
bank->chip.of_gpio_n_cells = 2;
bank->chip.parent = &pdev->dev; bank->chip.parent = &pdev->dev;
bank->chip.request = ma35_gpio_core_to_request; bank->chip.request = ma35_gpio_core_to_request;
bank->chip.direction_input = ma35_gpio_core_direction_in; bank->chip.direction_input = ma35_gpio_core_direction_in;
@ -976,9 +975,10 @@ static const struct pinconf_ops ma35_pinconf_ops = {
.is_generic = true, .is_generic = true,
}; };
static int ma35_pinctrl_parse_groups(struct device_node *np, struct group_desc *grp, static int ma35_pinctrl_parse_groups(struct fwnode_handle *fwnode, struct group_desc *grp,
struct ma35_pinctrl *npctl, u32 index) struct ma35_pinctrl *npctl, u32 index)
{ {
struct device_node *np = to_of_node(fwnode);
struct ma35_pin_setting *pin; struct ma35_pin_setting *pin;
unsigned long *configs; unsigned long *configs;
unsigned int nconfigs; unsigned int nconfigs;
@ -990,7 +990,7 @@ static int ma35_pinctrl_parse_groups(struct device_node *np, struct group_desc *
if (ret) if (ret)
return ret; return ret;
count = of_property_count_elems_of_size(np, "nuvoton,pins", sizeof(u32)); count = fwnode_property_count_u32(fwnode, "nuvoton,pins");
if (!count || count % 3) if (!count || count % 3)
return -EINVAL; return -EINVAL;
@ -1000,7 +1000,7 @@ static int ma35_pinctrl_parse_groups(struct device_node *np, struct group_desc *
grp->grp.name = np->name; grp->grp.name = np->name;
ret = of_property_read_u32_array(np, "nuvoton,pins", elems, count); ret = fwnode_property_read_u32_array(fwnode, "nuvoton,pins", elems, count);
if (ret) if (ret)
return -EINVAL; return -EINVAL;
grp->grp.npins = count / 3; grp->grp.npins = count / 3;
@ -1027,10 +1027,11 @@ static int ma35_pinctrl_parse_groups(struct device_node *np, struct group_desc *
return 0; return 0;
} }
static int ma35_pinctrl_parse_functions(struct device_node *np, struct ma35_pinctrl *npctl, static int ma35_pinctrl_parse_functions(struct fwnode_handle *fwnode, struct ma35_pinctrl *npctl,
u32 index) u32 index)
{ {
struct device_node *child; struct device_node *np = to_of_node(fwnode);
struct fwnode_handle *child;
struct pinfunction *func; struct pinfunction *func;
struct group_desc *grp; struct group_desc *grp;
static u32 grp_index; static u32 grp_index;
@ -1050,12 +1051,14 @@ static int ma35_pinctrl_parse_functions(struct device_node *np, struct ma35_pinc
if (!groups) if (!groups)
return -ENOMEM; return -ENOMEM;
for_each_child_of_node(np, child) { fwnode_for_each_child_node(fwnode, child) {
groups[i] = child->name; struct device_node *node = to_of_node(child);
groups[i] = node->name;
grp = &npctl->groups[grp_index++]; grp = &npctl->groups[grp_index++];
ret = ma35_pinctrl_parse_groups(child, grp, npctl, i++); ret = ma35_pinctrl_parse_groups(child, grp, npctl, i++);
if (ret) { if (ret) {
of_node_put(child); fwnode_handle_put(child);
return ret; return ret;
} }
} }
@ -1066,13 +1069,12 @@ static int ma35_pinctrl_parse_functions(struct device_node *np, struct ma35_pinc
static int ma35_pinctrl_probe_dt(struct platform_device *pdev, struct ma35_pinctrl *npctl) static int ma35_pinctrl_probe_dt(struct platform_device *pdev, struct ma35_pinctrl *npctl)
{ {
struct device *dev = &pdev->dev;
struct fwnode_handle *child; struct fwnode_handle *child;
u32 idx = 0; u32 idx = 0;
int ret; int ret;
device_for_each_child_node(&pdev->dev, child) { for_each_gpiochip_node(dev, child) {
if (fwnode_property_present(child, "gpio-controller"))
continue;
npctl->nfunctions++; npctl->nfunctions++;
npctl->ngroups += of_get_child_count(to_of_node(child)); npctl->ngroups += of_get_child_count(to_of_node(child));
} }
@ -1090,11 +1092,8 @@ static int ma35_pinctrl_probe_dt(struct platform_device *pdev, struct ma35_pinct
if (!npctl->groups) if (!npctl->groups)
return -ENOMEM; return -ENOMEM;
device_for_each_child_node(&pdev->dev, child) { for_each_gpiochip_node(dev, child) {
if (fwnode_property_present(child, "gpio-controller")) ret = ma35_pinctrl_parse_functions(child, npctl, idx++);
continue;
ret = ma35_pinctrl_parse_functions(to_of_node(child), npctl, idx++);
if (ret) { if (ret) {
fwnode_handle_put(child); fwnode_handle_put(child);
dev_err(&pdev->dev, "failed to parse function\n"); dev_err(&pdev->dev, "failed to parse function\n");
@ -1139,7 +1138,7 @@ int ma35_pinctrl_probe(struct platform_device *pdev, const struct ma35_pinctrl_s
npctl->info = info; npctl->info = info;
npctl->dev = &pdev->dev; npctl->dev = &pdev->dev;
npctl->regmap = syscon_regmap_lookup_by_phandle(pdev->dev.of_node, "nuvoton,sys"); npctl->regmap = syscon_regmap_lookup_by_phandle(dev_of_node(dev), "nuvoton,sys");
if (IS_ERR(npctl->regmap)) if (IS_ERR(npctl->regmap))
return dev_err_probe(&pdev->dev, PTR_ERR(npctl->regmap), return dev_err_probe(&pdev->dev, PTR_ERR(npctl->regmap),
"No syscfg phandle specified\n"); "No syscfg phandle specified\n");

1
drivers/pinctrl/nuvoton/pinctrl-ma35d1.c
View File

@ -9,7 +9,6 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/mod_devicetable.h> #include <linux/mod_devicetable.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/pm.h> #include <linux/pm.h>

17
drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c
View File

@ -7,10 +7,8 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/mfd/syscon.h> #include <linux/mfd/syscon.h>
#include <linux/mod_devicetable.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of.h>
#include <linux/of_address.h>
#include <linux/of_irq.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/property.h> #include <linux/property.h>
#include <linux/regmap.h> #include <linux/regmap.h>
@ -1832,22 +1830,13 @@ static struct pinctrl_desc npcm7xx_pinctrl_desc = {
static int npcm7xx_gpio_of(struct npcm7xx_pinctrl *pctrl) static int npcm7xx_gpio_of(struct npcm7xx_pinctrl *pctrl)
{ {
int ret = -ENXIO; int ret = -ENXIO;
struct resource res;
struct device *dev = pctrl->dev; struct device *dev = pctrl->dev;
struct fwnode_reference_args args; struct fwnode_reference_args args;
struct fwnode_handle *child; struct fwnode_handle *child;
int id = 0; int id = 0;
for_each_gpiochip_node(dev, child) { for_each_gpiochip_node(dev, child) {
struct device_node *np = to_of_node(child); pctrl->gpio_bank[id].base = fwnode_iomap(child, 0);
ret = of_address_to_resource(np, 0, &res);
if (ret < 0) {
dev_err(dev, "Resource fail for GPIO bank %u\n", id);
return ret;
}
pctrl->gpio_bank[id].base = ioremap(res.start, resource_size(&res));
if (!pctrl->gpio_bank[id].base) if (!pctrl->gpio_bank[id].base)
return -EINVAL; return -EINVAL;
@ -1869,7 +1858,7 @@ static int npcm7xx_gpio_of(struct npcm7xx_pinctrl *pctrl)
return ret; return ret;
} }
ret = irq_of_parse_and_map(np, 0); ret = fwnode_irq_get(child, 0);
if (!ret) { if (!ret) {
dev_err(dev, "No IRQ for GPIO bank %u\n", id); dev_err(dev, "No IRQ for GPIO bank %u\n", id);
return -EINVAL; return -EINVAL;

2
drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c
View File

@ -2421,7 +2421,7 @@ static int npcm8xx_pinctrl_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, pctrl); platform_set_drvdata(pdev, pctrl);
pctrl->gcr_regmap = pctrl->gcr_regmap =
syscon_regmap_lookup_by_phandle(dev->of_node, "nuvoton,sysgcr"); syscon_regmap_lookup_by_phandle(dev_of_node(dev), "nuvoton,sysgcr");
if (IS_ERR(pctrl->gcr_regmap)) if (IS_ERR(pctrl->gcr_regmap))
return dev_err_probe(dev, PTR_ERR(pctrl->gcr_regmap), return dev_err_probe(dev, PTR_ERR(pctrl->gcr_regmap),
"Failed to find nuvoton,sysgcr property\n"); "Failed to find nuvoton,sysgcr property\n");