scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2026-01-10 17:41:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: remove the conflict I2C2/GPIO config in nyan/big.

Browse Source 
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>
This commit is contained in:
Louis Yung-Chieh Lo
2014-03-07 15:52:53 -08:00
committed by chrome-internal-fetch
parent ee15efddb4
commit c00675b909
5 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
board/big/board.c
View File

@@ -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},

2
board/big/board.h
View File

@@ -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,

2
board/nyan/board.c
View File

@@ -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},

2
board/nyan/board.h
View File

@@ -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,

3
chip/stm32/i2c-stm32l.c
View File

@@ -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