diff options
Diffstat (limited to 'common/gpio.c')
| -rw-r--r-- | common/gpio.c | 46 |
1 files changed, 26 insertions, 20 deletions
diff --git a/common/gpio.c b/common/gpio.c index cb3723f865..79d436815d 100644 --- a/common/gpio.c +++ b/common/gpio.c @@ -13,32 +13,31 @@ /* GPIO alternate function structure */ struct gpio_alt_func { - /* Module ID (as uint8_t, since enum would be 32-bit) */ - uint8_t module_id; - - /* Alternate function number */ - uint8_t func; - /* Port base address */ uint32_t port; /* Bitmask on that port (multiple bits allowed) */ uint32_t mask; + /* Alternate function number */ + uint8_t func; + + /* Module ID (as uint8_t, since enum would be 32-bit) */ + uint8_t module_id; + /* Flags (GPIO_*; see above). */ - uint32_t flags; + uint16_t flags; }; /* * Construct the gpio_alt_funcs array. This array is used by gpio_config_module * to enable and disable GPIO alternate functions on a module by module basis. */ -#define ALTERNATE(pinmask, function, module, flagz) \ - {GPIO_##pinmask, .func = (function), .module_id = (module), \ - .flags = (flagz)}, +#define ALTERNATE(pinmask, function, module, flags) \ + {GPIO_##pinmask, function, module, flags}, static const struct gpio_alt_func gpio_alt_funcs[] = { -#include "gpio.wrap" + #include "gpio.wrap" }; /* @@ -48,7 +47,9 @@ static const struct gpio_alt_func gpio_alt_funcs[] = { */ #define GPIO_CONFIG_ALL_PORTS 0xFFFFFFFF -static int gpio_config_pins(enum module_id id, uint32_t port, uint32_t pin_mask, +static int gpio_config_pins(enum module_id id, + uint32_t port, + uint32_t pin_mask, int enable) { const struct gpio_alt_func *af; @@ -56,9 +57,10 @@ static int gpio_config_pins(enum module_id id, uint32_t port, uint32_t pin_mask, /* Find pins and set to alternate functions */ for (af = gpio_alt_funcs; - af < gpio_alt_funcs + ARRAY_SIZE(gpio_alt_funcs); af++) { + af < gpio_alt_funcs + ARRAY_SIZE(gpio_alt_funcs); + af++) { if (af->module_id != id) - continue; /* Pins for some other module */ + continue; /* Pins for some other module */ /* Check to see if the requested port matches. */ if ((port != GPIO_CONFIG_ALL_PORTS) && (port != af->port)) @@ -71,11 +73,13 @@ static int gpio_config_pins(enum module_id id, uint32_t port, uint32_t pin_mask, if ((af->mask & pin_mask) == pin_mask) { if (!(af->flags & GPIO_DEFAULT)) gpio_set_flags_by_mask( - af->port, (af->mask & pin_mask), + af->port, + (af->mask & pin_mask), enable ? af->flags : GPIO_INPUT); - gpio_set_alternate_function(af->port, - (af->mask & pin_mask), - enable ? af->func : -1); + gpio_set_alternate_function( + af->port, + (af->mask & pin_mask), + enable ? af->func : -1); rv = EC_SUCCESS; /* We're done here if we were just setting one port. */ if (port != GPIO_CONFIG_ALL_PORTS) @@ -97,8 +101,10 @@ int gpio_config_module(enum module_id id, int enable) int gpio_config_pin(enum module_id id, enum gpio_signal signal, int enable) { - return gpio_config_pins(id, gpio_list[signal].port, - gpio_list[signal].mask, enable); + return gpio_config_pins(id, + gpio_list[signal].port, + gpio_list[signal].mask, + enable); } void gpio_set_flags(enum gpio_signal signal, int flags) |