Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-13 08:27:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

gpio: add ops to get dir flags

Browse source 
Add the ops for GPIO driver get_dir_flags(), allows to get dynamically
the current gpio configuration; it is used by the API function
dm_gpio_get_dir_flags().

When these optional ops are absent, the gpio uclass continues to use
the mandatory ops (direction_output, direction_input, get_value) and
value of desc->flags to manage only the main dir flags:
- GPIOD_IS_IN
- GPIOD_IS_OUT
- GPIOD_IS_OUT_ACTIVE
- GPIOD_ACTIVE_LOW

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Patrick Delaunay 2020-01-13 11:35:08 +01:00 committed by Tom Rini
parent 477ca57b9a
commit d2c07e56ab
2 changed files with 40 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
drivers/gpio/gpio-uclass.c
View file

@ -614,19 +614,36 @@ int dm_gpio_set_dir(struct gpio_desc *desc)
int dm_gpio_get_dir_flags(struct gpio_desc *desc, ulong *flags) int dm_gpio_get_dir_flags(struct gpio_desc *desc, ulong *flags)
{ {
int ret; struct udevice *dev = desc->dev;
int ret, value;
struct dm_gpio_ops *ops = gpio_get_ops(dev);
ulong dir_flags; ulong dir_flags;
ret = check_reserved(desc, "get_dir_flags"); ret = check_reserved(desc, "get_dir_flags");
if (ret) if (ret)
return ret; return ret;
dir_flags = desc->flags; /* GPIOD_ are directly provided by driver except GPIOD_ACTIVE_LOW */
/* only GPIOD_IS_OUT_ACTIVE is provided by uclass */ if (ops->get_dir_flags) {
dir_flags &= ~GPIOD_IS_OUT_ACTIVE; ret = ops->get_dir_flags(dev, desc->offset, &dir_flags);
if ((desc->flags & GPIOD_IS_OUT) && _gpio_get_value(desc)) if (ret)
dir_flags |= GPIOD_IS_OUT_ACTIVE; return ret;
/* GPIOD_ACTIVE_LOW is saved in desc->flags */
value = dir_flags & GPIOD_IS_OUT_ACTIVE ? 1 : 0;
if (desc->flags & GPIOD_ACTIVE_LOW)
value = !value;
dir_flags &= ~(GPIOD_ACTIVE_LOW | GPIOD_IS_OUT_ACTIVE);
dir_flags |= (desc->flags & GPIOD_ACTIVE_LOW);
if (value)
dir_flags |= GPIOD_IS_OUT_ACTIVE;
} else {
dir_flags = desc->flags;
/* only GPIOD_IS_OUT_ACTIVE is provided by uclass */
dir_flags &= ~GPIOD_IS_OUT_ACTIVE;
if ((desc->flags & GPIOD_IS_OUT) && _gpio_get_value(desc))
dir_flags |= GPIOD_IS_OUT_ACTIVE;
}
*flags = dir_flags; *flags = dir_flags;
return 0; return 0;
@ -1129,6 +1146,8 @@ static int gpio_post_bind(struct udevice *dev)
ops->get_function += gd->reloc_off; ops->get_function += gd->reloc_off;
if (ops->xlate) if (ops->xlate)
ops->xlate += gd->reloc_off; ops->xlate += gd->reloc_off;
if (ops->get_dir_flags)
ops->get_dir_flags += gd->reloc_off;
reloc_done++; reloc_done++;
} }

15
include/asm-generic/gpio.h
View file

@ -297,6 +297,21 @@ struct dm_gpio_ops {
*/ */
int (*xlate)(struct udevice *dev, struct gpio_desc *desc, int (*xlate)(struct udevice *dev, struct gpio_desc *desc,
struct ofnode_phandle_args *args); struct ofnode_phandle_args *args);
/**
* get_dir_flags() - Get GPIO dir flags
*
* This function return the GPIO direction flags used.
*
* This method is optional.
*
* @dev: GPIO device
* @offset: GPIO offset within that device
* @flags: place to put the used direction flags by GPIO
* @return 0 if OK, -ve on error
*/
int (*get_dir_flags)(struct udevice *dev, unsigned int offset,
ulong *flags);
}; };
/** /**