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

Commit 6647c6c0 authored by Rabin Vincent's avatar Rabin Vincent Committed by Russell King
Browse files

ARM: 6147/1: nomadik-gpio: set val in ->direction_output() 



The ->direction_output() callback needs to set the value it was passed,
in addition to setting the direction as output.  On this peripheral, we
can't set the value before setting the direction, so set it after.

Acked-by: default avatarAlessandro Rubini <rubini@unipv.it>
Acked-by: default avatarLinus Walleij <linus.walleij@stericsson.com>
Signed-off-by: default avatarRabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 5c0c1f08

arch/arm/plat-nomadik/gpio.c

+12 −10
Original line number Diff line number Diff line
@@ -266,16 +266,6 @@ static int nmk_gpio_make_input(struct gpio_chip *chip, unsigned offset) 
	return 0;

}



static int nmk_gpio_make_output(struct gpio_chip *chip, unsigned offset,

				int val)

{

	struct nmk_gpio_chip *nmk_chip =

		container_of(chip, struct nmk_gpio_chip, chip);



	writel(1 << offset, nmk_chip->addr + NMK_GPIO_DIRS);

	return 0;

}



static int nmk_gpio_get_input(struct gpio_chip *chip, unsigned offset)

{

	struct nmk_gpio_chip *nmk_chip =
@@ -298,6 +288,18 @@ static void nmk_gpio_set_output(struct gpio_chip *chip, unsigned offset, 
		writel(bit, nmk_chip->addr + NMK_GPIO_DATC);

}



static int nmk_gpio_make_output(struct gpio_chip *chip, unsigned offset,

				int val)

{

	struct nmk_gpio_chip *nmk_chip =

		container_of(chip, struct nmk_gpio_chip, chip);



	writel(1 << offset, nmk_chip->addr + NMK_GPIO_DIRS);

	nmk_gpio_set_output(chip, offset, val);



	return 0;

}



/* This structure is replicated for each GPIO block allocated at probe time */

static struct gpio_chip nmk_gpio_template = {

	.direction_input	= nmk_gpio_make_input,