diff options
| author | Mary Ruthven <mruthven@chromium.org> | 2019-03-27 17:58:32 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-04-05 03:53:04 -0700 |
| commit | c0814644b003412ac81b83068028749fe8a0ae76 (patch) | |
| tree | 62117e6e472b77a19a56f69dbc5d5ea8b6ce2841 | |
| parent | ed230bf3f5ab05a2e09d4eb88d66cff4b3a856b2 (diff) | |
| download | chrome-ec-c0814644b003412ac81b83068028749fe8a0ae76.tar.gz | |
gpio: add config option for using gpio_get_flags
Separate gpio_get_flags from the CONFIG_CMD_GPIO_EXTENDED, so we can
enable getting the gpio flags without enabling the ability to set them.
BUG=none
BRANCH=cr50
TEST=none
Change-Id: Ib8e3a13fdcfe8ebec4523eb070b2425b5dc28278
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1542798
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
| -rw-r--r-- | chip/npcx/gpio.c | 2 | ||||
| -rw-r--r-- | common/gpio.c | 2 | ||||
| -rw-r--r-- | include/config.h | 3 | ||||
| -rw-r--r-- | include/gpio.h | 6 |
4 files changed, 10 insertions, 3 deletions
diff --git a/chip/npcx/gpio.c b/chip/npcx/gpio.c index 8a76043d3d..6354d06ab1 100644 --- a/chip/npcx/gpio.c +++ b/chip/npcx/gpio.c @@ -330,7 +330,7 @@ void gpio_set_level(enum gpio_signal signal, int value) NPCX_PDOUT(gpio_list[signal].port) &= ~gpio_list[signal].mask; } -#ifdef CONFIG_CMD_GPIO_EXTENDED +#ifdef CONFIG_GPIO_GET_EXTENDED int gpio_get_flags_by_mask(uint32_t port, uint32_t mask) { uint32_t flags = 0; diff --git a/common/gpio.c b/common/gpio.c index 60d4973d61..e20f1f8c93 100644 --- a/common/gpio.c +++ b/common/gpio.c @@ -108,7 +108,7 @@ void gpio_set_flags(enum gpio_signal signal, int flags) gpio_set_flags_by_mask(g->port, g->mask, flags); } -#ifdef CONFIG_CMD_GPIO_EXTENDED +#ifdef CONFIG_GPIO_GET_EXTENDED int gpio_get_flags(enum gpio_signal signal) { const struct gpio_info *g = gpio_list + signal; diff --git a/include/config.h b/include/config.h index 5a62cb5728..aaf134c02f 100644 --- a/include/config.h +++ b/include/config.h @@ -1803,6 +1803,9 @@ */ #undef CONFIG_GPIO_INIT_POWER_ON_DELAY_MS +/* Support getting gpio flags. */ +#undef CONFIG_GPIO_GET_EXTENDED + /* Do we want to detect the lid angle? */ #undef CONFIG_LID_ANGLE diff --git a/include/gpio.h b/include/gpio.h index f01cd5147e..c778c5d3a8 100644 --- a/include/gpio.h +++ b/include/gpio.h @@ -161,7 +161,11 @@ int gpio_is_implemented(enum gpio_signal signal); */ void gpio_set_flags(enum gpio_signal signal, int flags); -#ifdef CONFIG_CMD_GPIO_EXTENDED +#if defined(CONFIG_CMD_GPIO_EXTENDED) && !defined(CONFIG_GPIO_GET_EXTENDED) +#define CONFIG_GPIO_GET_EXTENDED +#endif + +#ifdef CONFIG_GPIO_GET_EXTENDED /** * Get the current flags for a signal. * |