Re: [PATCH v6 03/15] pinctrl: bcm: add bcm63xx base code

From: Rob Herring
Date: Wed Mar 10 2021 - 12:51:49 EST

Next message: Sebastian Andrzej Siewior: "Re: [PATCH v3] auxdisplay: Remove in_interrupt() usage."
Previous message: Pierre-Louis Bossart: "Re: [PATCH V2] ASoC: soc-core: Prevent warning if no DMI table is present"
In reply to: Andy Shevchenko: "Re: [PATCH v6 03/15] pinctrl: bcm: add bcm63xx base code"
Next in thread: Linus Walleij: "Re: [PATCH v6 03/15] pinctrl: bcm: add bcm63xx base code"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

On Wed, Mar 10, 2021 at 5:55 AM Álvaro Fernández Rojas
<noltari@xxxxxxxxx> wrote:
>
> Add a helper for registering BCM63XX pin controllers.

Comments below based on my binding changes suggested.

>
> Signed-off-by: Jonas Gorski <jonas.gorski@xxxxxxxxx>
> Co-developed-by: Jonas Gorski <jonas.gorski@xxxxxxxxx>
> Signed-off-by: Álvaro Fernández Rojas <noltari@xxxxxxxxx>
> ---
> v6: add changes suggested by Andy Shevchenko
> v5: add changes suggested by Andy Shevchenko
> v4: drop IRQ selects from Kconfig and add missing of_node_put()
> v3: add new patch with shared code
>
> drivers/pinctrl/bcm/Kconfig | 7 ++
> drivers/pinctrl/bcm/Makefile | 1 +
> drivers/pinctrl/bcm/pinctrl-bcm63xx.c | 113 ++++++++++++++++++++++++++
> drivers/pinctrl/bcm/pinctrl-bcm63xx.h | 43 ++++++++++
> 4 files changed, 164 insertions(+)
> create mode 100644 drivers/pinctrl/bcm/pinctrl-bcm63xx.c
> create mode 100644 drivers/pinctrl/bcm/pinctrl-bcm63xx.h
>
> diff --git a/drivers/pinctrl/bcm/Kconfig b/drivers/pinctrl/bcm/Kconfig
> index 0ed14de0134c..882f19bdc243 100644
> --- a/drivers/pinctrl/bcm/Kconfig
> +++ b/drivers/pinctrl/bcm/Kconfig
> @@ -29,6 +29,13 @@ config PINCTRL_BCM2835
> help
> Say Y here to enable the Broadcom BCM2835 GPIO driver.
>
> +config PINCTRL_BCM63XX
> + bool
> + select GENERIC_PINCONF
> + select GPIO_REGMAP
> + select PINCONF
> + select PINMUX
> +
> config PINCTRL_IPROC_GPIO
> bool "Broadcom iProc GPIO (with PINCONF) driver"
> depends on OF_GPIO && (ARCH_BCM_IPROC || COMPILE_TEST)
> diff --git a/drivers/pinctrl/bcm/Makefile b/drivers/pinctrl/bcm/Makefile
> index 79d5e49fdd9a..0e3cf9b15c65 100644
> --- a/drivers/pinctrl/bcm/Makefile
> +++ b/drivers/pinctrl/bcm/Makefile
> @@ -3,6 +3,7 @@
>
> obj-$(CONFIG_PINCTRL_BCM281XX) += pinctrl-bcm281xx.o
> obj-$(CONFIG_PINCTRL_BCM2835) += pinctrl-bcm2835.o
> +obj-$(CONFIG_PINCTRL_BCM63XX) += pinctrl-bcm63xx.o
> obj-$(CONFIG_PINCTRL_IPROC_GPIO) += pinctrl-iproc-gpio.o
> obj-$(CONFIG_PINCTRL_CYGNUS_MUX) += pinctrl-cygnus-mux.o
> obj-$(CONFIG_PINCTRL_NS) += pinctrl-ns.o
> diff --git a/drivers/pinctrl/bcm/pinctrl-bcm63xx.c b/drivers/pinctrl/bcm/pinctrl-bcm63xx.c
> new file mode 100644
> index 000000000000..2eaac8e6f79f
> --- /dev/null
> +++ b/drivers/pinctrl/bcm/pinctrl-bcm63xx.c
> @@ -0,0 +1,113 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * Driver for BCM63xx GPIO unit (pinctrl + GPIO)
> + *
> + * Copyright (C) 2021 Álvaro Fernández Rojas <noltari@xxxxxxxxx>
> + * Copyright (C) 2016 Jonas Gorski <jonas.gorski@xxxxxxxxx>
> + */
> +
> +#include <linux/gpio/regmap.h>
> +#include <linux/mfd/syscon.h>
> +#include <linux/of.h>
> +#include <linux/platform_device.h>
> +
> +#include "pinctrl-bcm63xx.h"
> +
> +#define BCM63XX_BANK_SIZE 4
> +
> +#define BCM63XX_DIROUT_REG 0x04
> +#define BCM63XX_DATA_REG 0x0c
> +
> +static int bcm63xx_reg_mask_xlate(struct gpio_regmap *gpio,
> + unsigned int base, unsigned int offset,
> + unsigned int *reg, unsigned int *mask)
> +{
> + unsigned int line = offset % BCM63XX_BANK_GPIOS;
> + unsigned int stride = offset / BCM63XX_BANK_GPIOS;
> +
> + *reg = base - stride * BCM63XX_BANK_SIZE;
> + *mask = BIT(line);
> +
> + return 0;
> +}
> +
> +static const struct of_device_id bcm63xx_gpio_of_match[] = {
> + { .compatible = "brcm,bcm6318-gpio", },
> + { .compatible = "brcm,bcm6328-gpio", },
> + { .compatible = "brcm,bcm6358-gpio", },
> + { .compatible = "brcm,bcm6362-gpio", },
> + { .compatible = "brcm,bcm6368-gpio", },
> + { .compatible = "brcm,bcm63268-gpio", },

All these would be moved to gpio-mmio.c (or maybe that can have a
fallback compatible?).

> + { /* sentinel */ }
> +};
> +
> +static int bcm63xx_gpio_probe(struct device *dev,
> + struct fwnode_handle *node,
> + const struct bcm63xx_pinctrl_soc *soc,
> + struct bcm63xx_pinctrl *pc)
> +{
> + struct gpio_regmap_config grc = {0};
> +
> + grc.parent = dev;
> + grc.fwnode = node;
> + grc.ngpio = soc->ngpios;
> + grc.ngpio_per_reg = BCM63XX_BANK_GPIOS;
> + grc.regmap = pc->regs;
> + grc.reg_mask_xlate = bcm63xx_reg_mask_xlate;
> +
> + if (fwnode_property_read_u32(node, "data", &grc.reg_dat_base))
> + grc.reg_dat_base = BCM63XX_DATA_REG;
> + grc.reg_set_base = grc.reg_dat_base;
> +
> + if (fwnode_property_read_u32(node, "dirout", &grc.reg_dir_out_base))
> + grc.reg_dir_out_base = BCM63XX_DIROUT_REG;
> +
> + return PTR_ERR_OR_ZERO(devm_gpio_regmap_register(dev, &grc));
> +}

This function can go.

> +
> +int bcm63xx_pinctrl_probe(struct platform_device *pdev,
> + const struct bcm63xx_pinctrl_soc *soc,
> + void *driver_data)
> +{
> + struct device *dev = &pdev->dev;
> + struct bcm63xx_pinctrl *pc;
> + struct fwnode_handle *node;
> + int err;
> +
> + pc = devm_kzalloc(dev, sizeof(*pc), GFP_KERNEL);
> + if (!pc)
> + return -ENOMEM;
> +
> + platform_set_drvdata(pdev, pc);
> +
> + pc->dev = dev;
> + pc->driver_data = driver_data;
> +
> + pc->regs = syscon_node_to_regmap(dev->parent->of_node);
> + if (IS_ERR(pc->regs))
> + return PTR_ERR(pc->regs);
> +
> + pc->pctl_desc.name = dev_name(dev);
> + pc->pctl_desc.pins = soc->pins;
> + pc->pctl_desc.npins = soc->npins;
> + pc->pctl_desc.pctlops = soc->pctl_ops;
> + pc->pctl_desc.pmxops = soc->pmx_ops;
> + pc->pctl_desc.owner = THIS_MODULE;
> +
> + pc->pctl_dev = devm_pinctrl_register(dev, &pc->pctl_desc, pc);
> + if (IS_ERR(pc->pctl_dev))
> + return PTR_ERR(pc->pctl_dev);
> +
> + device_for_each_child_node(dev, node) {
> + if (of_match_node(bcm63xx_gpio_of_match, to_of_node(node))) {
> + err = bcm63xx_gpio_probe(dev, node, soc, pc);

This would just need an of_platform_populate call.

> + if (err) {
> + dev_err(dev, "could not add GPIO chip\n");
> + fwnode_handle_put(node);
> + return err;
> + }
> + }
> + }
> +
> + return 0;
> +}
> diff --git a/drivers/pinctrl/bcm/pinctrl-bcm63xx.h b/drivers/pinctrl/bcm/pinctrl-bcm63xx.h
> new file mode 100644
> index 000000000000..3bdb50021f1b
> --- /dev/null
> +++ b/drivers/pinctrl/bcm/pinctrl-bcm63xx.h
> @@ -0,0 +1,43 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * Copyright (C) 2021 Álvaro Fernández Rojas <noltari@xxxxxxxxx>
> + * Copyright (C) 2016 Jonas Gorski <jonas.gorski@xxxxxxxxx>
> + */
> +
> +#ifndef __PINCTRL_BCM63XX_H__
> +#define __PINCTRL_BCM63XX_H__
> +
> +#include <linux/pinctrl/pinctrl.h>
> +
> +#define BCM63XX_BANK_GPIOS 32
> +
> +struct bcm63xx_pinctrl_soc {
> + struct pinctrl_ops *pctl_ops;
> + struct pinmux_ops *pmx_ops;
> +
> + const struct pinctrl_pin_desc *pins;
> + unsigned npins;
> +
> + unsigned int ngpios;
> +};
> +
> +struct bcm63xx_pinctrl {
> + struct device *dev;
> + struct regmap *regs;
> +
> + struct pinctrl_desc pctl_desc;
> + struct pinctrl_dev *pctl_dev;
> +
> + void *driver_data;
> +};
> +
> +static inline unsigned int bcm63xx_bank_pin(unsigned int pin)
> +{
> + return pin % BCM63XX_BANK_GPIOS;
> +}
> +
> +int bcm63xx_pinctrl_probe(struct platform_device *pdev,
> + const struct bcm63xx_pinctrl_soc *soc,
> + void *driver_data);
> +
> +#endif /* __PINCTRL_BCM63XX_H__ */
> --
> 2.20.1
>

Next message: Sebastian Andrzej Siewior: "Re: [PATCH v3] auxdisplay: Remove in_interrupt() usage."
Previous message: Pierre-Louis Bossart: "Re: [PATCH V2] ASoC: soc-core: Prevent warning if no DMI table is present"
In reply to: Andy Shevchenko: "Re: [PATCH v6 03/15] pinctrl: bcm: add bcm63xx base code"
Next in thread: Linus Walleij: "Re: [PATCH v6 03/15] pinctrl: bcm: add bcm63xx base code"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]