On Mon, 13 Jan 2020 at 03:35, Patrick Delaunay patrick.delaunay@st.com wrote:
Add a macro to provide the GPIO output value according the dir flags content.
Signed-off-by: Patrick Delaunay patrick.delaunay@st.com
This patch was part of v2 08/14 = gpio: add ops for configuration with dir flags
Changes in v3:
- Split the previous patch [PATCH v2 08/14] to help review
Changes in v2: None
drivers/gpio/gpio-uclass.c | 9 +++------ include/asm-generic/gpio.h | 6 ++++++ 2 files changed, 9 insertions(+), 6 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org
diff --git a/drivers/gpio/gpio-uclass.c b/drivers/gpio/gpio-uclass.c index 62462dffa5..1d16d4acf9 100644 --- a/drivers/gpio/gpio-uclass.c +++ b/drivers/gpio/gpio-uclass.c @@ -541,12 +541,9 @@ static int _dm_gpio_set_dir_flags(struct gpio_desc *desc, ulong flags) }
if (flags & GPIOD_IS_OUT) {
int value = flags & GPIOD_IS_OUT_ACTIVE ? 1 : 0;if (flags & GPIOD_ACTIVE_LOW)value = !value;ret = ops->direction_output(dev, desc->offset, value);} else if (flags & GPIOD_IS_IN) {
ret = ops->direction_output(dev, desc->offset,GPIOD_FLAGS_OUTPUT(flags));} else if (flags & GPIOD_IS_IN) { ret = ops->direction_input(dev, desc->offset); }diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h index 454578c8d2..111319f41f 100644 --- a/include/asm-generic/gpio.h +++ b/include/asm-generic/gpio.h @@ -129,6 +129,12 @@ struct gpio_desc { */ };
+/* helper to compute the value of the gpio output */ +#define GPIOD_FLAGS_OUTPUT_MASK (GPIOD_ACTIVE_LOW | GPIOD_IS_OUT_ACTIVE) +#define GPIOD_FLAGS_OUTPUT(flags) \
(((((flags) & GPIOD_FLAGS_OUTPUT_MASK) == GPIOD_IS_OUT_ACTIVE) || \(((flags) & GPIOD_FLAGS_OUTPUT_MASK) == GPIOD_ACTIVE_LOW)))
nit: you don't need brackets around the == operands, I think.
/**
- dm_gpio_is_valid() - Check if a GPIO is valid
-- 2.17.1