diff options
| author | Anton Staaf <robotboy@chromium.org> | 2014-07-14 15:33:29 -0700 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-07-17 00:39:52 +0000 |
| commit | 7746b32e17571b0e0cbdcbd101787b742d35c825 (patch) | |
| tree | 5b4374d93630dda800996687239aac5cec681dc7 /board/rambi | |
| parent | 1e73a1ba06b7879de3b03c7cefec9135bf73fcf5 (diff) | |
| download | chrome-ec-7746b32e17571b0e0cbdcbd101787b742d35c825.tar.gz | |
GPIO: Move definition of alternate functions to gpio.inc
This is a straightforward conversion of existing tables
into X-Macro style definitions for the GPIO alternate
functions. This change in itself, is not particularly
powerful, but having all GPIO settings in a single file
makes a board easier to understand.
Signed-off-by: Anton Staaf <robotboy@chromium.org>
BRANCH=none
TEST=make buildall -j
Followed by manual testing of interrupt on change and UART
functionality on STM32F0 based discovery board.
Change-Id: Ib7f1f014f4bd289d7c0ac3100470ba2dc71ca579
Reviewed-on: https://chromium-review.googlesource.com/207987
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Tested-by: Anton Staaf <robotboy@chromium.org>
Commit-Queue: Anton Staaf <robotboy@chromium.org>
Diffstat (limited to 'board/rambi')
| -rw-r--r-- | board/rambi/board.c | 14 | ||||
| -rw-r--r-- | board/rambi/gpio.inc | 10 |
2 files changed, 10 insertions, 14 deletions
diff --git a/board/rambi/board.c b/board/rambi/board.c index 9810f5a0c5..35e5849b73 100644 --- a/board/rambi/board.c +++ b/board/rambi/board.c @@ -34,20 +34,6 @@ #include "gpio_list.h" -/* Pins with alternate functions */ -const struct gpio_alt_func gpio_alt_funcs[] = { - {GPIO_A, 0x03, 1, MODULE_UART}, /* UART0 */ - {GPIO_B, 0x04, 3, MODULE_I2C}, /* I2C0 SCL */ - {GPIO_B, 0x08, 3, MODULE_I2C, GPIO_OPEN_DRAIN}, /* I2C0 SDA */ - {GPIO_B, 0x40, 3, MODULE_I2C}, /* I2C5 SCL */ - {GPIO_B, 0x80, 3, MODULE_I2C, GPIO_OPEN_DRAIN}, /* I2C5 SDA */ - {GPIO_D, 0x0f, 2, MODULE_SPI}, /* SPI1 */ - {GPIO_L, 0x3f, 15, MODULE_LPC}, /* LPC */ - {GPIO_M, 0x21, 15, MODULE_LPC}, /* LPC */ - {GPIO_N, 0x50, 1, MODULE_PWM_LED, GPIO_OPEN_DRAIN}, /* FAN0PWM 3&4 */ -}; -const int gpio_alt_funcs_count = ARRAY_SIZE(gpio_alt_funcs); - /* power signal list. Must match order of enum power_signal. */ const struct power_signal_info power_signal_list[] = { {GPIO_PP1050_PGOOD, 1, "PGOOD_PP1050"}, diff --git a/board/rambi/gpio.inc b/board/rambi/gpio.inc index cdeac22574..43a87ae928 100644 --- a/board/rambi/gpio.inc +++ b/board/rambi/gpio.inc @@ -65,3 +65,13 @@ GPIO(VCORE_EN, C, 5, GPIO_OUT_LOW, NULL) /* Enable core power suppli GPIO(WLAN_OFF_L, J, 4, GPIO_OUT_LOW, NULL) /* Disable WiFi radio */ GPIO(PCH_SCI_L, M, 1, GPIO_ODR_HIGH, NULL) /* Assert SCI to PCH */ GPIO(KBD_IRQ_L, M, 3, GPIO_ODR_HIGH, NULL) /* Negative edge triggered irq. */ + +ALTERNATE(A, 0x03, 1, MODULE_UART, 0) /* UART0 */ +ALTERNATE(B, 0x04, 3, MODULE_I2C, 0) /* I2C0 SCL */ +ALTERNATE(B, 0x08, 3, MODULE_I2C, GPIO_OPEN_DRAIN) /* I2C0 SDA */ +ALTERNATE(B, 0x40, 3, MODULE_I2C, 0) /* I2C5 SCL */ +ALTERNATE(B, 0x80, 3, MODULE_I2C, GPIO_OPEN_DRAIN) /* I2C5 SDA */ +ALTERNATE(D, 0x0f, 2, MODULE_SPI, 0) /* SPI1 */ +ALTERNATE(L, 0x3f, 15, MODULE_LPC, 0) /* LPC */ +ALTERNATE(M, 0x21, 15, MODULE_LPC, 0) /* LPC */ +ALTERNATE(N, 0x50, 1, MODULE_PWM_LED, GPIO_OPEN_DRAIN) /* FAN0PWM 3&4 */ |