dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-01 08:42:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

gpio: update dir_flags management

Browse Source 
Update the flag management in GPIO uclass: the desc->flags is always
combined with the requested flags and the GPIO descriptor is updated
for further call.

Add a function dm_gpio_get_dir_flags to get dynamically
the current dir_flags (configuration and value).

This patch prepare introduction of the dir flags support with new ops.

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:06 +01:00
committed by Tom Rini
parent 9360bb06f1
commit 695e5fd546
2 changed files with 41 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/gpio/gpio-uclass.c
View File

@@ -141,8 +141,9 @@ int gpio_xlate_offs_flags(struct udevice *dev, struct gpio_desc *desc,
if (args->args_count < 2)
return 0;
desc->flags = 0;
if (args->args[1] & GPIO_ACTIVE_LOW)
desc->flags = GPIOD_ACTIVE_LOW;
desc->flags |= GPIOD_ACTIVE_LOW;
return 0;
}
@@ -559,6 +560,8 @@ int dm_gpio_set_dir_flags(struct gpio_desc *desc, ulong flags)
if (ret)
return ret;
/* combine the requested flags (for IN/OUT) and the descriptor flags */
flags |= desc->flags;
ret = _dm_gpio_set_dir_flags(desc, flags);
/* update the descriptor flags */
@@ -579,6 +582,26 @@ int dm_gpio_set_dir(struct gpio_desc *desc)
return _dm_gpio_set_dir_flags(desc, desc->flags);
}
int dm_gpio_get_dir_flags(struct gpio_desc *desc, ulong *flags)
{
int ret;
ulong dir_flags;
ret = check_reserved(desc, "get_dir_flags");
if (ret)
return ret;
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;
return 0;
}
/**
* gpio_get_value() - [COMPAT] Sample GPIO pin and return it's value
* gpio: GPIO number
@@ -849,7 +872,7 @@ static int gpio_request_tail(int ret, const char *nodename,
debug("%s: dm_gpio_requestf failed\n", __func__);
goto err;
}
ret = dm_gpio_set_dir_flags(desc, flags | desc->flags);
ret = dm_gpio_set_dir_flags(desc, flags);
if (ret) {
debug("%s: dm_gpio_set_dir failed\n", __func__);
goto err;