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

Commit e4889362 authored by Axel Lin's avatar Axel Lin Committed by Linus Walleij
Browse files

gpio: sama5d2-piobu: Set proper output level for direction_output 



Set proper output level base on the argument of direction_output.
Also remove sama5d2_piobu_set_direction() as there is only one caller
now.

Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 72893f0c

drivers/gpio/gpio-sama5d2-piobu.c

+8 −12
Original line number Diff line number Diff line
@@ -108,16 +108,6 @@ static int sama5d2_piobu_read_value(struct gpio_chip *chip, unsigned int pin, 
	return val & mask;

}



/**

 * sama5d2_piobu_set_direction() - mark pin as input or output

 */

static int sama5d2_piobu_set_direction(struct gpio_chip *chip,

				       unsigned int direction,

				       unsigned int pin)

{

	return sama5d2_piobu_write_value(chip, pin, PIOBU_DIRECTION, direction);

}



/**

 * sama5d2_piobu_get_direction() - gpiochip get_direction

 */
@@ -138,7 +128,7 @@ static int sama5d2_piobu_get_direction(struct gpio_chip *chip, 
static int sama5d2_piobu_direction_input(struct gpio_chip *chip,

					 unsigned int pin)

{

	return sama5d2_piobu_set_direction(chip, PIOBU_IN, pin);

	return sama5d2_piobu_write_value(chip, pin, PIOBU_DIRECTION, PIOBU_IN);

}



/**
@@ -147,7 +137,13 @@ static int sama5d2_piobu_direction_input(struct gpio_chip *chip, 
static int sama5d2_piobu_direction_output(struct gpio_chip *chip,

					  unsigned int pin, int value)

{

	return sama5d2_piobu_set_direction(chip, PIOBU_OUT, pin);

	unsigned int val = PIOBU_OUT;



	if (value)

		val |= PIOBU_HIGH;



	return sama5d2_piobu_write_value(chip, pin, PIOBU_DIRECTION | PIOBU_SOD,

					 val);

}



/**