diff options
| author | Aaron Zhang <zhangjianbo@huaqin.corp-partner.google.com> | 2020-08-10 09:47:42 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-08-22 09:55:00 +0000 |
| commit | 621475cdd00ca3e6ff6862db7f750dbf57857539 (patch) | |
| tree | 10a9b1da6aad88321a939c4f78fe3d8be220fc38 | |
| parent | 1cfa64f98e77a3243e854ba8abc1c087f3e714b0 (diff) | |
| download | chrome-ec-621475cdd00ca3e6ff6862db7f750dbf57857539.tar.gz | |
Fennel: Remove the prepocessor check for BOARD_JUNIPER and BOARD_JACUZZI.
Remove the prepocessor check for BOARD_JUNIPER and BOARD_JACUZZI.
BUG=b:165214737
BRANCH=firmware-kukui-12573.B
TEST=make -j BOARD=fennel
Change-Id: I0cc9c143be16b02ad7d1b2735772d3d6875ba34e
Signed-off-by: Aaron Zhang <zhangjianbo@huaqin.corp-partner.google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2351643
Reviewed-by: Zhuohao Lee <zhuohao@chromium.org>
Reviewed-by: Ting Shen <phoenixshen@chromium.org>
| -rw-r--r-- | board/fennel/board.c | 4 | ||||
| -rw-r--r-- | board/fennel/board.h | 8 | ||||
| -rw-r--r-- | board/fennel/gpio.inc | 8 |
3 files changed, 2 insertions, 18 deletions
diff --git a/board/fennel/board.c b/board/fennel/board.c index c605802f65..6ca7c05ce2 100644 --- a/board/fennel/board.c +++ b/board/fennel/board.c @@ -68,11 +68,7 @@ BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT); /* I2C ports */ const struct i2c_port_t i2c_ports[] = { {"typec", 0, 400, GPIO_I2C1_SCL, GPIO_I2C1_SDA}, -#ifdef BOARD_JACUZZI - {"other", 1, 100, GPIO_I2C2_SCL, GPIO_I2C2_SDA}, -#else /* Juniper */ {"other", 1, 400, GPIO_I2C2_SCL, GPIO_I2C2_SDA}, -#endif }; const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports); diff --git a/board/fennel/board.h b/board/fennel/board.h index cb8a0f5411..0c6f3d2aba 100644 --- a/board/fennel/board.h +++ b/board/fennel/board.h @@ -18,12 +18,9 @@ #include "baseboard.h" -#ifdef BOARD_JUNIPER #undef CONFIG_CHIPSET_POWER_SEQ_VERSION #define CONFIG_CHIPSET_POWER_SEQ_VERSION 1 - #undef CONFIG_SYSTEM_UNLOCKED -#endif #define CONFIG_BATTERY_HW_PRESENT_CUSTOM @@ -38,6 +35,7 @@ #define CONFIG_EXTPOWER_DEBOUNCE_MS 200 #define CONFIG_I2C_BITBANG +#undef I2C_BITBANG_PORT_COUNT #define I2C_BITBANG_PORT_COUNT 1 #undef CONFIG_I2C_NACK_RETRY_COUNT #define CONFIG_I2C_NACK_RETRY_COUNT 10 @@ -75,11 +73,7 @@ #define I2C_PORT_SENSORS 1 #define I2C_PORT_IO_EXPANDER_IT8801 1 #define I2C_PORT_VIRTUAL_BATTERY I2C_PORT_BATTERY -#ifdef BOARD_JACUZZI -#define I2C_PORT_BATTERY 1 -#else /* Juniper */ #define I2C_PORT_BATTERY 2 -#endif /* Enable Accel over SPI */ #define CONFIG_SPI_ACCEL_PORT 0 /* The first SPI master port (SPI2) */ diff --git a/board/fennel/gpio.inc b/board/fennel/gpio.inc index 96742c2cdd..6f531634a1 100644 --- a/board/fennel/gpio.inc +++ b/board/fennel/gpio.inc @@ -81,19 +81,13 @@ GPIO(EC_INT_L, PIN(C, 7), GPIO_ODR_HIGH) /* EC_AP_INT_ODL */ GPIO(EC_BOARD_ID_EN_L, PIN(C, 15), GPIO_ODR_HIGH) /* EC_BOARD_ID_EN_ODL */ GPIO(USB_C0_HPD_OD, PIN(F, 1), GPIO_ODR_LOW) GPIO(BOOTBLOCK_EN_L, PIN(C, 1), GPIO_ODR_HIGH) +GPIO(EN_PP1800_S5_L, PIN(A, 14), GPIO_OUT_LOW) GPIO(USB_C0_DISCHARGE, PIN(B, 6), GPIO_OUT_LOW) IOEX(LED_BLUE, EXPIN(0, 1, 4), GPIO_OUT_HIGH) /* LED BLUE */ IOEX(LED_GREEN, EXPIN(0, 1, 3), GPIO_OUT_HIGH) /* LED GREEN */ IOEX(LED_ORANGE, EXPIN(0, 1, 2), GPIO_OUT_HIGH) /* LED ORANGE */ -#ifdef BOARD_JACUZZI -GPIO(LID_ACCEL_INT_ODL, PIN(A, 14), GPIO_INPUT) -/* Jacuzzi doesn't have EN_PP1800_S5_L. */ -UNIMPLEMENTED(EN_PP1800_S5_L) -#else -GPIO(EN_PP1800_S5_L, PIN(A, 14), GPIO_OUT_LOW) -#endif /* * TODO(b:138352732): On IT88801 expander, To be readded once IT8801 driver and * gpio expander framework has landed. |