Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 811a1882 authored by Linus Walleij's avatar Linus Walleij
Browse files

gpio: menz127: use the new open drain callback 



The menz127 driver tries to support open drain by detecting it
at request time. However: without the new callbacks from the
gpiolib it is not really working: the core will still just emulate
the open drain mode by switching the line to an input.

By adding a hook into the new .set_single_ended() call rather than
trying to autodetect at request() time, proper open drain can be
supported.

Cc: Andreas Werner <andy@wernerandy.de>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent f90c6bdb

drivers/gpio/gpio-menz127.c

+11 −7
Original line number Diff line number Diff line
@@ -88,21 +88,25 @@ static int men_z127_debounce(struct gpio_chip *gc, unsigned gpio, 
	return 0;

}



static int men_z127_request(struct gpio_chip *gc, unsigned gpio_pin)

static int men_z127_set_single_ended(struct gpio_chip *gc,

				     unsigned offset,

				     enum single_ended_mode mode)

{

	struct men_z127_gpio *priv = gpiochip_get_data(gc);

	u32 od_en;



	if (gpio_pin >= gc->ngpio)

		return -EINVAL;

	if (mode != LINE_MODE_OPEN_DRAIN &&

	    mode != LINE_MODE_PUSH_PULL)

		return -ENOTSUPP;



	spin_lock(&priv->lock);

	od_en = readl(priv->reg_base + MEN_Z127_ODER);



	if (gpiochip_line_is_open_drain(gc, gpio_pin))

		od_en |= BIT(gpio_pin);

	if (mode == LINE_MODE_OPEN_DRAIN)

		od_en |= BIT(offset);

	else

		od_en &= ~BIT(gpio_pin);

		/* Implicitly LINE_MODE_PUSH_PULL */

		od_en &= ~BIT(offset);



	writel(od_en, priv->reg_base + MEN_Z127_ODER);

	spin_unlock(&priv->lock);
@@ -147,7 +151,7 @@ static int men_z127_probe(struct mcb_device *mdev, 
		goto err_unmap;



	men_z127_gpio->gc.set_debounce = men_z127_debounce;

	men_z127_gpio->gc.request = men_z127_request;

	men_z127_gpio->gc.set_single_ended = men_z127_set_single_ended;



	ret = gpiochip_add_data(&men_z127_gpio->gc, men_z127_gpio);

	if (ret) {