diff options
| author | Randall Spangler <rspangler@chromium.org> | 2013-08-02 14:28:43 -0700 |
|---|---|---|
| committer | ChromeBot <chrome-bot@google.com> | 2013-08-07 12:43:35 -0700 |
| commit | f2b56fcb9fe078d5a29f1c3744e47e77240cd4e7 (patch) | |
| tree | 4ff810332c543871da7febb2cc21597eee800b6d /board/bds | |
| parent | ce704b40005c1acdffabe58f47df42c1d7da33c2 (diff) | |
| download | chrome-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 'board/bds')
| -rw-r--r-- | board/bds/board.c | 13 | ||||
| -rw-r--r-- | board/bds/board.h | 13 |
2 files changed, 20 insertions, 6 deletions
diff --git a/board/bds/board.c b/board/bds/board.c index 830b8fcf41..915679d4c3 100644 --- a/board/bds/board.c +++ b/board/bds/board.c @@ -41,10 +41,19 @@ BUILD_ASSERT(ARRAY_SIZE(i2c_ports) == I2C_PORTS_USED); /* GPIO signal list. Must match order from enum gpio_signal. */ const struct gpio_info gpio_list[] = { - {"RECOVERYn", LM4_GPIO_D, (1<<1), GPIO_PULL_UP, NULL}, - {"DEBUG_LED", LM4_GPIO_A, (1<<7), GPIO_OUT_LOW, NULL}, + {"RECOVERYn", GPIO_D, (1<<1), GPIO_PULL_UP, NULL}, + {"DEBUG_LED", GPIO_A, (1<<7), GPIO_OUT_LOW, NULL}, /* Unimplemented signals which we need to emulate for now */ GPIO_SIGNAL_NOT_IMPLEMENTED("WP"), GPIO_SIGNAL_NOT_IMPLEMENTED("ENTERING_RW"), }; BUILD_ASSERT(ARRAY_SIZE(gpio_list) == GPIO_COUNT); + +/* Pins with alternate functions */ +const struct gpio_alt_func gpio_alt_funcs[] = { + {GPIO_A, 0x03, 1, MODULE_UART}, /* UART0 */ + {GPIO_G, 0x40, 3, MODULE_I2C}, /* I2C5 SCL */ + {GPIO_G, 0x80, 3, GPIO_OPEN_DRAIN}, /* I2C5 SDA */ + {GPIO_B, 0x03, 1, MODULE_UART}, /* UART1 */ +}; +const int gpio_alt_funcs_count = ARRAY_SIZE(gpio_alt_funcs); diff --git a/board/bds/board.h b/board/bds/board.h index 61c7c5a7f9..9d4672a34d 100644 --- a/board/bds/board.h +++ b/board/bds/board.h @@ -27,8 +27,14 @@ #ifndef __ASSEMBLER__ -enum adc_channel -{ +/* Module IDs */ +/* TODO(rspangler): use this in place of enum console_channel as well */ +enum module_id { + MODULE_I2C, + MODULE_UART, +}; + +enum adc_channel { ADC_CH_EC_TEMP = 0, /* EC internal die temperature in degrees K. */ ADC_CH_BDS_POT, /* BDS pot input. */ ADC_CH_COUNT @@ -39,9 +45,8 @@ enum adc_channel /* Number of I2C ports used */ #define I2C_PORTS_USED 1 -/* GPIOs for second UART port */ +/* Second UART port */ #define CONFIG_UART_HOST 1 -#define CONFIG_UART_HOST_GPIOS_PB0_1 /* GPIO signal list */ enum gpio_signal { |