| Message ID | 20221011-gpiolib-quirks-v2-5-73cb7176fd94@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | gpiolib: more quirks to handle legacy names | expand |
On Fri, Oct 14, 2022 at 10:54:29AM -0700, Dmitry Torokhov wrote: > The controller is using non-standard "reset-n-io" name for its reset > gpio property, whereas gpiod API expects "<name>-gpios". Add a quirk > so that gpiod API will still work on unmodified DTSes. > > Reviewed-by: Daniel Thompson <daniel.thompson@linaro.org> > Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> > --- > drivers/gpio/gpiolib-of.c | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c > index 2b5d1b3095c7..5c11ee7638d1 100644 > --- a/drivers/gpio/gpiolib-of.c > +++ b/drivers/gpio/gpiolib-of.c > @@ -390,6 +390,16 @@ static struct gpio_desc *of_find_gpio_rename(struct device_node *np, > #if IS_ENABLED(CONFIG_MFD_ARIZONA) > { "wlf,reset", NULL, NULL }, > #endif > + > +#if IS_ENABLED(CONFIG_NFC_MRVL_I2C) > + { "reset", "reset-n-io", "marvell,nfc-i2c" }, > +#endif > +#if IS_ENABLED(CONFIG_NFC_MRVL_SPI) > + { "reset", "reset-n-io", "marvell,nfc-spi" }, > +#endif > +#if IS_ENABLED(CONFIG_NFC_MRVL_UART) > + { "reset", "reset-n-io", "marvell,nfc-uart" }, I just noticed that there is another compatible (not documented, so I assume it is a legacy one): "mrvl,nfc-uart", so I will be adding it and sending another version. Thanks.
diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c index 2b5d1b3095c7..5c11ee7638d1 100644 --- a/drivers/gpio/gpiolib-of.c +++ b/drivers/gpio/gpiolib-of.c @@ -390,6 +390,16 @@ static struct gpio_desc *of_find_gpio_rename(struct device_node *np, #if IS_ENABLED(CONFIG_MFD_ARIZONA) { "wlf,reset", NULL, NULL }, #endif + +#if IS_ENABLED(CONFIG_NFC_MRVL_I2C) + { "reset", "reset-n-io", "marvell,nfc-i2c" }, +#endif +#if IS_ENABLED(CONFIG_NFC_MRVL_SPI) + { "reset", "reset-n-io", "marvell,nfc-spi" }, +#endif +#if IS_ENABLED(CONFIG_NFC_MRVL_UART) + { "reset", "reset-n-io", "marvell,nfc-uart" }, +#endif #if !IS_ENABLED(CONFIG_PCI_LANTIQ) /* MIPS Lantiq PCI */ { "reset", "gpios-reset", "lantiq,pci-xway" },