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

Commit 023a6007 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gpio-v4.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio 

Pull GPIO fixes from Linus Walleij:
 "Two GPIO fixes:

   - Fix a translation problem in of_get_named_gpiod_flags()

   - Fix a long standing container_of() mistake in the TPS65912 driver"

* tag 'gpio-v4.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
  gpio: tps65912: fix wrong container_of arguments
  gpiolib: of: allow of_gpiochip_find_and_xlate to find more than one chip per node
parents 10d6dfc1 2f97c20e

drivers/gpio/gpio-tps65912.c

+10 −4
Original line number Diff line number Diff line
@@ -26,9 +26,12 @@ struct tps65912_gpio_data { 
	struct gpio_chip gpio_chip;

};



#define to_tgd(gc) container_of(gc, struct tps65912_gpio_data, gpio_chip)



static int tps65912_gpio_get(struct gpio_chip *gc, unsigned offset)

{

	struct tps65912 *tps65912 = container_of(gc, struct tps65912, gpio);

	struct tps65912_gpio_data *tps65912_gpio = to_tgd(gc);

	struct tps65912 *tps65912 = tps65912_gpio->tps65912;

	int val;



	val = tps65912_reg_read(tps65912, TPS65912_GPIO1 + offset);
@@ -42,7 +45,8 @@ static int tps65912_gpio_get(struct gpio_chip *gc, unsigned offset) 
static void tps65912_gpio_set(struct gpio_chip *gc, unsigned offset,

			      int value)

{

	struct tps65912 *tps65912 = container_of(gc, struct tps65912, gpio);

	struct tps65912_gpio_data *tps65912_gpio = to_tgd(gc);

	struct tps65912 *tps65912 = tps65912_gpio->tps65912;



	if (value)

		tps65912_set_bits(tps65912, TPS65912_GPIO1 + offset,
@@ -55,7 +59,8 @@ static void tps65912_gpio_set(struct gpio_chip *gc, unsigned offset, 
static int tps65912_gpio_output(struct gpio_chip *gc, unsigned offset,

				int value)

{

	struct tps65912 *tps65912 = container_of(gc, struct tps65912, gpio);

	struct tps65912_gpio_data *tps65912_gpio = to_tgd(gc);

	struct tps65912 *tps65912 = tps65912_gpio->tps65912;



	/* Set the initial value */

	tps65912_gpio_set(gc, offset, value);
@@ -66,7 +71,8 @@ static int tps65912_gpio_output(struct gpio_chip *gc, unsigned offset, 


static int tps65912_gpio_input(struct gpio_chip *gc, unsigned offset)

{

	struct tps65912 *tps65912 = container_of(gc, struct tps65912, gpio);

	struct tps65912_gpio_data *tps65912_gpio = to_tgd(gc);

	struct tps65912 *tps65912 = tps65912_gpio->tps65912;



	return tps65912_clear_bits(tps65912, TPS65912_GPIO1 + offset,

								GPIO_CFG_MASK);

drivers/gpio/gpiolib-of.c

+5 −4
Original line number Diff line number Diff line
@@ -46,12 +46,13 @@ static int of_gpiochip_find_and_xlate(struct gpio_chip *gc, void *data) 


	ret = gc->of_xlate(gc, &gg_data->gpiospec, gg_data->flags);

	if (ret < 0) {

		/* We've found the gpio chip, but the translation failed.

		 * Return true to stop looking and return the translation

		 * error via out_gpio

		/* We've found a gpio chip, but the translation failed.

		 * Store translation error in out_gpio.

		 * Return false to keep looking, as more than one gpio chip

		 * could be registered per of-node.

		 */

		gg_data->out_gpio = ERR_PTR(ret);

		return true;

		return false;

	 }



	gg_data->out_gpio = gpiochip_get_desc(gc, ret);