Commit e42615ec authored by Matti Vaittinen's avatar Matti Vaittinen Committed by Linus Walleij
Browse files

gpio: Use new GPIO_LINE_DIRECTION 



It's hard for occasional GPIO code reader/writer to know if values 0/1
equal to IN or OUT. Use defined GPIO_LINE_DIRECTION_IN and
GPIO_LINE_DIRECTION_OUT to help them out.

NOTE - for gpio-amd-fch and gpio-bd9571mwv:
This commit also changes the return value for direction get to equal 1
for direction INPUT. Prior this commit these drivers might have
returned some other positive value but 1 for INPUT.

Signed-off-by: default avatarMatti Vaittinen <matti.vaittinen@fi.rohmeurope.com>
Acked-by: default avatarScott Branden <scott.branden@broadcom.com>
Reviewed-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
Reviewed-by: default avatarMichal Simek <michal.simek@xilinx.com>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Acked-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarWilliam Breathitt Gray <vilhelm.gray@gmail.com>
Acked-by: default avatarKuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 9208b1e7

drivers/gpio/gpio-104-dio-48e.c

+4 −1
Original line number Diff line number Diff line
@@ -59,7 +59,10 @@ static int dio48e_gpio_get_direction(struct gpio_chip *chip, unsigned offset) 
	const unsigned port = offset / 8;

	const unsigned mask = BIT(offset % 8);



	return !!(dio48egpio->io_state[port] & mask);

	if (dio48egpio->io_state[port] & mask)

		return  GPIO_LINE_DIRECTION_IN;



	return GPIO_LINE_DIRECTION_OUT;

}



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

drivers/gpio/gpio-104-idi-48.c

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ struct idi_48_gpio { 


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

{

	return 1;

	return GPIO_LINE_DIRECTION_IN;

}



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

drivers/gpio/gpio-104-idio-16.c

+2 −2
Original line number Diff line number Diff line
@@ -51,9 +51,9 @@ struct idio_16_gpio { 
static int idio_16_gpio_get_direction(struct gpio_chip *chip, unsigned offset)

{

	if (offset > 15)

		return 1;

		return GPIO_LINE_DIRECTION_IN;



	return 0;

	return GPIO_LINE_DIRECTION_OUT;

}



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

drivers/gpio/gpio-74xx-mmio.c

+4 −1
Original line number Diff line number Diff line
@@ -77,7 +77,10 @@ static int mmio_74xx_get_direction(struct gpio_chip *gc, unsigned offset) 
{

	struct mmio_74xx_gpio_priv *priv = gpiochip_get_data(gc);



	return !(priv->flags & MMIO_74XX_DIR_OUT);

	if (priv->flags & MMIO_74XX_DIR_OUT)

		return GPIO_LINE_DIRECTION_OUT;



	return  GPIO_LINE_DIRECTION_IN;

}



static int mmio_74xx_dir_in(struct gpio_chip *gc, unsigned int gpio)

drivers/gpio/gpio-amd-fch.c

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ static int amd_fch_gpio_get_direction(struct gpio_chip *gc, unsigned int gpio) 
	ret = (readl_relaxed(ptr) & AMD_FCH_GPIO_FLAG_DIRECTION);

	spin_unlock_irqrestore(&priv->lock, flags);



	return ret;

	return ret ? GPIO_LINE_DIRECTION_IN : GPIO_LINE_DIRECTION_OUT;

}



static void amd_fch_gpio_set(struct gpio_chip *gc,

CRA Git | Maintained and supported by SUSTech CRA and CCSE