diff options
| author | Louis Yung-Chieh Lo <yjlou@chromium.org> | 2014-03-07 15:52:53 -0800 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-03-13 23:22:29 +0000 |
| commit | c00675b909327f6563203b5083bbf2293188948e (patch) | |
| tree | 9141a204e75369a3647040511b61f4fca6386a88 | |
| parent | ee15efddb4185c9365f982d15168b37f5916610e (diff) | |
| download | chrome-ec-c00675b909327f6563203b5083bbf2293188948e.tar.gz | |
cleanup: remove the conflict I2C2/GPIO config in nyan/big.
After Alex's CL 8a9817a, the i2c driver no longer hardcodes the
I2C port pin (Ya!). Remove the conflict pin setting in board files.
BRANCH=nyan,big
BUG=chrome-os-partner:26620
TEST=build and run on nyan board. Everything looks good.
Change-Id: Iee2c5f10f642da7ad00f503b6e615cb6aa472459
Signed-off-by: Louis Yung-Chieh Lo <yjlou@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/189245
Reviewed-by: Alec Berg <alecaberg@chromium.org>
| -rw-r--r-- | board/big/board.c | 2 | ||||
| -rw-r--r-- | board/big/board.h | 2 | ||||
| -rw-r--r-- | board/nyan/board.c | 2 | ||||
| -rw-r--r-- | board/nyan/board.h | 2 | ||||
| -rw-r--r-- | chip/stm32/i2c-stm32l.c | 3 |
5 files changed, 0 insertions, 11 deletions
diff --git a/board/big/board.c b/board/big/board.c index 26ae2f9395..815f543dfb 100644 --- a/board/big/board.c +++ b/board/big/board.c @@ -64,8 +64,6 @@ const struct gpio_info gpio_list[] = { {"ENTERING_RW", GPIO_H, (1<<0), GPIO_OUT_LOW, NULL}, {"I2C1_SCL", GPIO_B, (1<<6), GPIO_ODR_HIGH, NULL}, {"I2C1_SDA", GPIO_B, (1<<7), GPIO_ODR_HIGH, NULL}, - {"I2C2_SCL", GPIO_B, (1<<10), GPIO_OUT_LOW, NULL}, - {"I2C2_SDA", GPIO_B, (1<<11), GPIO_OUT_LOW, NULL}, {"LED_POWER_L", GPIO_A, (1<<2), GPIO_OUT_HIGH, NULL}, /* PWR_LED1 */ {"PMIC_PWRON_L", GPIO_A, (1<<12), GPIO_OUT_HIGH, NULL}, {"PMIC_RESET", GPIO_A, (1<<15), GPIO_OUT_LOW, NULL}, diff --git a/board/big/board.h b/board/big/board.h index feaba4dc36..f671702f3f 100644 --- a/board/big/board.h +++ b/board/big/board.h @@ -68,8 +68,6 @@ enum gpio_signal { GPIO_ENTERING_RW, GPIO_I2C1_SCL, GPIO_I2C1_SDA, - GPIO_I2C2_SCL, - GPIO_I2C2_SDA, GPIO_LED_POWER_L, /* alias to GPIO_PWR_LED1 */ GPIO_PMIC_PWRON_L, GPIO_PMIC_RESET, diff --git a/board/nyan/board.c b/board/nyan/board.c index e093c74a6b..e4aadfc5a7 100644 --- a/board/nyan/board.c +++ b/board/nyan/board.c @@ -64,8 +64,6 @@ const struct gpio_info gpio_list[] = { {"ENTERING_RW", GPIO_H, (1<<0), GPIO_OUT_LOW, NULL}, {"I2C1_SCL", GPIO_B, (1<<6), GPIO_ODR_HIGH, NULL}, {"I2C1_SDA", GPIO_B, (1<<7), GPIO_ODR_HIGH, NULL}, - {"I2C2_SCL", GPIO_B, (1<<10), GPIO_ODR_HIGH, NULL}, - {"I2C2_SDA", GPIO_B, (1<<11), GPIO_ODR_HIGH, NULL}, {"LED_POWER_L", GPIO_A, (1<<2), GPIO_OUT_HIGH, NULL}, /* PWR_LED1 */ {"PMIC_PWRON_L", GPIO_A, (1<<12), GPIO_OUT_HIGH, NULL}, {"PMIC_RESET", GPIO_A, (1<<15), GPIO_OUT_LOW, NULL}, diff --git a/board/nyan/board.h b/board/nyan/board.h index 6ed1ab8efd..c49d7f3e3a 100644 --- a/board/nyan/board.h +++ b/board/nyan/board.h @@ -67,8 +67,6 @@ enum gpio_signal { GPIO_ENTERING_RW, GPIO_I2C1_SCL, GPIO_I2C1_SDA, - GPIO_I2C2_SCL, - GPIO_I2C2_SDA, GPIO_LED_POWER_L, /* alias to GPIO_PWR_LED1 */ GPIO_PMIC_PWRON_L, GPIO_PMIC_RESET, diff --git a/chip/stm32/i2c-stm32l.c b/chip/stm32/i2c-stm32l.c index 74643a76c3..8c256d5cb4 100644 --- a/chip/stm32/i2c-stm32l.c +++ b/chip/stm32/i2c-stm32l.c @@ -22,9 +22,6 @@ #define CPUTS(outstr) cputs(CC_I2C, outstr) #define CPRINTF(format, args...) cprintf(CC_I2C, format, ## args) -#define I2C1 STM32_I2C1_PORT -#define I2C2 STM32_I2C2_PORT - /* Maximum transfer of a SMBUS block transfer */ #define SMBUS_MAX_BLOCK 32 |