On 06.05.2024 07:59:47, Gregor Herburger wrote: > The mcp251xfd devices allow two pins to be configured as gpio. Add this > functionality to driver. > > Signed-off-by: Gregor Herburger <gregor.herburger@xxxxxxxxxxxxxxx> > --- > drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 173 +++++++++++++++++++++++++ > drivers/net/can/spi/mcp251xfd/mcp251xfd.h | 6 + > 2 files changed, 179 insertions(+) > > diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c > index 4739ad80ef2a..de301f3a2f4e 100644 > --- a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c > +++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c > @@ -16,6 +16,7 @@ > #include <linux/bitfield.h> > #include <linux/clk.h> > #include <linux/device.h> > +#include <linux/gpio/driver.h> > #include <linux/mod_devicetable.h> > #include <linux/module.h> > #include <linux/pm_runtime.h> > @@ -1768,6 +1769,172 @@ static int mcp251xfd_register_check_rx_int(struct mcp251xfd_priv *priv) > return 0; > } > > +#ifdef CONFIG_GPIOLIB > +static const char * const mcp251xfd_gpio_names[] = {"GPIO0", "GPIO1"}; > + > +static int mcp251xfd_gpio_request(struct gpio_chip *chip, unsigned int offset) > +{ > + struct mcp251xfd_priv *priv = gpiochip_get_data(chip); > + u32 pin_mask = MCP251XFD_REG_IOCON_PM0 << offset; > + int ret; > + > + if (priv->rx_int && offset == 1) { > + netdev_err(priv->ndev, "Can't use GPIO 1 with RX-INT!\n"); > + return -EINVAL; > + } > + > + ret = pm_runtime_resume_and_get(priv->ndev->dev.parent); > + if (ret) > + return ret; > + > + return regmap_update_bits(priv->map_reg, MCP251XFD_REG_IOCON, > + pin_mask, pin_mask); The PM bits _should_ be 1 here, as it's the reset default. But you have to convert mcp251xfd_chip_rx_int_enable() and mcp251xfd_chip_rx_int_disable() to from regmap_write() to regmap_update_bits(). Please do this in a separate patch before adding the gpio support. > +} regards, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Embedded Linux | https://www.pengutronix.de | Vertretung Nürnberg | Phone: +49-5121-206917-129 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-9 |
Attachment:
signature.asc
Description: PGP signature