Commit fbbbcd17 authored by Dmitry Torokhov's avatar Dmitry Torokhov Committed by Bartosz Golaszewski
Browse files

gpiolib: of: add quirk for locating reset lines with legacy bindings 



Some legacy mappings used "gpio[s]-reset" instead of "reset-gpios",
add a quirk so that gpiod API will still work on unmodified DTSes.

Reviewed-by: default avatarDaniel Thompson <daniel.thompson@linaro.org>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
parent 307c593b

drivers/gpio/gpiolib-of.c

+16 −0
Original line number Diff line number Diff line
@@ -382,9 +382,18 @@ static struct gpio_desc *of_find_gpio_rename(struct device_node *np, 
		 */

		const char *compatible;

	} gpios[] = {

#if !IS_ENABLED(CONFIG_LCD_HX8357)

		/* Himax LCD controllers used "gpios-reset" */

		{ "reset",	"gpios-reset",	"himax,hx8357" },

		{ "reset",	"gpios-reset",	"himax,hx8369" },

#endif

#if IS_ENABLED(CONFIG_MFD_ARIZONA)

		{ "wlf,reset",	NULL,		NULL },

#endif

#if !IS_ENABLED(CONFIG_PCI_LANTIQ)

		/* MIPS Lantiq PCI */

		{ "reset",	"gpios-reset",	"lantiq,pci-xway" },

#endif



		/*

		 * Some regulator bindings happened before we managed to
@@ -399,6 +408,13 @@ static struct gpio_desc *of_find_gpio_rename(struct device_node *np, 
		{ "wlf,ldo2ena", NULL,		NULL }, /* WM8994 */

#endif



#if IS_ENABLED(CONFIG_SND_SOC_TLV320AIC3X)

		{ "reset",	"gpio-reset",	"ti,tlv320aic3x" },

		{ "reset",	"gpio-reset",	"ti,tlv320aic33" },

		{ "reset",	"gpio-reset",	"ti,tlv320aic3007" },

		{ "reset",	"gpio-reset",	"ti,tlv320aic3104" },

		{ "reset",	"gpio-reset",	"ti,tlv320aic3106" },

#endif

#if IS_ENABLED(CONFIG_SPI_GPIO)

		/*

		 * The SPI GPIO bindings happened before we managed to