Commit 3a7fd473 authored by Bartosz Golaszewski's avatar Bartosz Golaszewski
Browse files

mtd: rawnand: ingenic: move the GPIO quirk to gpiolib-of.c 



We have a special place for OF polarity quirks in gpiolib-of.c. Let's
move this over there so that it doesn't pollute the driver.

Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Acked-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Acked-by: default avatarPaul Cercueil <paul@crapouillou.net>
Reviewed-by: default avatarAndy Shevchenko <andy@kernel.org>
parent 16fdcec8

drivers/gpio/gpiolib-of.c

+9 −0
Original line number Diff line number Diff line
@@ -192,6 +192,15 @@ static void of_gpio_try_fixup_polarity(const struct device_node *np, 
		 */

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

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

		/*

		 * The rb-gpios semantics was undocumented and qi,lb60 (along with

		 * the ingenic driver) got it wrong. The active state encodes the

		 * NAND ready state, which is high level. Since there's no signal

		 * inverter on this board, it should be active-high. Let's fix that

		 * here for older DTs so we can re-use the generic nand_gpio_waitrdy()

		 * helper, and be consistent with what other drivers do.

		 */

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

#endif

	};

	unsigned int i;

drivers/mtd/nand/raw/ingenic/ingenic_nand_drv.c

+0 −12
Original line number Diff line number Diff line
@@ -380,18 +380,6 @@ static int ingenic_nand_init_chip(struct platform_device *pdev, 
		return ret;

	}



	/*

	 * The rb-gpios semantics was undocumented and qi,lb60 (along with

	 * the ingenic driver) got it wrong. The active state encodes the

	 * NAND ready state, which is high level. Since there's no signal

	 * inverter on this board, it should be active-high. Let's fix that

	 * here for older DTs so we can re-use the generic nand_gpio_waitrdy()

	 * helper, and be consistent with what other drivers do.

	 */

	if (of_machine_is_compatible("qi,lb60") &&

	    gpiod_is_active_low(nand->busy_gpio))

		gpiod_toggle_active_low(nand->busy_gpio);



	nand->wp_gpio = devm_gpiod_get_optional(dev, "wp", GPIOD_OUT_LOW);



	if (IS_ERR(nand->wp_gpio)) {