On Tue, Sep 26, 2023 at 11:06 AM Bartosz Golaszewski <brgl@xxxxxxxx> wrote:
>
> From: Bartosz Golaszewski <bartosz.golaszewski@xxxxxxxxxx>
>
> 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: Bartosz Golaszewski <bartosz.golaszewski@xxxxxxxxxx>
> ---
> This is an alternative to the previous patch that instead of replacing
> one active-low setter with another, just moves the quirk over to
> gpiolib-of.c
>
> drivers/gpio/gpiolib-of.c | 9 +++++++++
> drivers/mtd/nand/raw/ingenic/ingenic_nand_drv.c | 12 ------------
> 2 files changed, 9 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c
> index 5515f32cf19b..58c0bbe9d569 100644
> --- a/drivers/gpio/gpiolib-of.c
> +++ b/drivers/gpio/gpiolib-of.c
> @@ -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;
> diff --git a/drivers/mtd/nand/raw/ingenic/ingenic_nand_drv.c b/drivers/mtd/nand/raw/ingenic/ingenic_nand_drv.c
> index 6748226b8bd1..c816dc137245 100644
> --- a/drivers/mtd/nand/raw/ingenic/ingenic_nand_drv.c
> +++ b/drivers/mtd/nand/raw/ingenic/ingenic_nand_drv.c
> @@ -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)) {
> --
> 2.39.2
>
Queued for v6.7.
Bartosz
