summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorRandall Spangler <rspangler@chromium.org>2013-08-02 14:28:43 -0700
committerChromeBot <chrome-bot@google.com>2013-08-07 12:43:35 -0700
commitf2b56fcb9fe078d5a29f1c3744e47e77240cd4e7 (patch)
tree4ff810332c543871da7febb2cc21597eee800b6d /common
parentce704b40005c1acdffabe58f47df42c1d7da33c2 (diff)
downloadchrome-ec-f2b56fcb9fe078d5a29f1c3744e47e77240cd4e7.tar.gz
Clean up configuring GPIO alternate functions
GPIO alternate functions used to be configured throughout the code, which made it hard to tell which ones you needed to configure yourself in board.c. It also sometimes (chip/lm4/i2c.c) led to GPIOs being configured as alternate functions even if they weren't used on a given board. With this change, every board has a table in board.c which lists ALL GPIOs which have alternate functions. This is now the only place where alternate functions are configured. Each module then calls gpio_init_module() to set up its GPIOs. This also fixes a bug where gpio_set_flags() ignored most of the flags passed to it (only direction and level were actually used). On stm32f, gpio_set_alternate() does not exist, and pins are configured via direct register writes from board.c. Rather than attempt to change that in the same CL, I've stubbed out gpio_set_alternate() for stm32f, and will fix the register writes in a follow-up CL. BUG=chrome-os-partner:21618 BRANCH=peppy (fixes I2C1 being initialized even though those pins are used for other things) TEST=boot link, falco, pit, spring Change-Id: I40f47025d8f767e0723c6b40c80413af9ba8deba Signed-off-by: Randall Spangler <rspangler@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/64400
Diffstat (limited to 'common')
-rw-r--r--common/gpio_common.c28
1 files changed, 28 insertions, 0 deletions
diff --git a/common/gpio_common.c b/common/gpio_common.c
index 11ab9fa4e7..e310814847 100644
--- a/common/gpio_common.c
+++ b/common/gpio_common.c
@@ -61,6 +61,34 @@ static int last_val_changed(int i, int v)
/*****************************************************************************/
/* GPIO API */
+void gpio_config_module(enum module_id id, int enable)
+{
+ const struct gpio_alt_func *af = gpio_alt_funcs;
+ int i;
+
+ /* Set module's pins to alternate functions */
+ for (i = 0; i < gpio_alt_funcs_count; i++, af++) {
+ if (id != af->module_id)
+ continue; /* Pins for some other module */
+
+ if (enable) {
+ gpio_set_flags_by_mask(af->port, af->mask, af->flags);
+ gpio_set_alternate_function(af->port, af->mask,
+ af->func);
+ } else {
+ gpio_set_flags_by_mask(af->port, af->mask, GPIO_INPUT);
+ gpio_set_alternate_function(af->port, af->mask, -1);
+ }
+ }
+}
+
+void gpio_set_flags(enum gpio_signal signal, int flags)
+{
+ const struct gpio_info *g = gpio_list + signal;
+
+ gpio_set_flags_by_mask(g->port, g->mask, flags);
+}
+
const char *gpio_get_name(enum gpio_signal signal)
{
return gpio_list[signal].name;