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

gpiolib: of: fix lookup quirk for MIPS Lantiq 



As it turns out, there is a large number of out-of-tree DTSes (in
OpenWrt project) that used to specify incorrect (active high) polarity
for the Lantiq reset GPIO, so to keep compatibility while they are
being updated a quirk for force the polarity low is needed. Luckily
these old DTSes used nonstandard name for the property ("gpio-reset" vs
"reset-gpios") so the quirk will not hurt if there are any new devices
that need inverted polarity as they can specify the right polarity in
their DTS when using the standard "reset-gpios" property.

Additionally the condition to enable the transition from standard to
non-standard reset GPIO property name was inverted and the replacement
name for the property was not correct. Fix this as well.

Fixes: fbbbcd17 ("gpiolib: of: add quirk for locating reset lines with legacy bindings")
Fixes: 90c2d2eb ("MIPS: pci: lantiq: switch to using gpiod API")
Reported-by: default avatarMartin Schiller <ms@dev.tdt.de>
Acked-by: default avatarMartin Schiller <ms@dev.tdt.de>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Link: https://lore.kernel.org/r/ZoLpqv1PN08xHioh@google.com


Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
parent 22a40d14

drivers/gpio/gpiolib-of.c

+12 −2
Original line number Diff line number Diff line
@@ -202,6 +202,16 @@ static void of_gpio_try_fixup_polarity(const struct device_node *np, 
		 * helper, and be consistent with what other drivers do.

		 */

		{ "qi,lb60",		"rb-gpios",	true },

#endif

#if IS_ENABLED(CONFIG_PCI_LANTIQ)

		/*

		 * According to the PCI specification, the RST# pin is an

		 * active-low signal. However, most of the device trees that

		 * have been widely used for a long time incorrectly describe

		 * reset GPIO as active-high, and were also using wrong name

		 * for the property.

		 */

		{ "lantiq,pci-xway",	"gpio-reset",	false },

#endif

	};

	unsigned int i;
@@ -504,9 +514,9 @@ static struct gpio_desc *of_find_gpio_rename(struct device_node *np, 
		{ "reset",	"reset-n-io",	"marvell,nfc-uart" },

		{ "reset",	"reset-n-io",	"mrvl,nfc-uart" },

#endif

#if !IS_ENABLED(CONFIG_PCI_LANTIQ)

#if IS_ENABLED(CONFIG_PCI_LANTIQ)

		/* MIPS Lantiq PCI */

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

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

#endif



		/*