diff options
author | Xiyuan Xia <xiyuan@chromium.org> | 2019-12-17 21:14:31 +0000 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2019-12-18 01:14:59 +0000 |
commit | 093b5d0f9706268b1a077f87339fd7407345d3fa (patch) | |
tree | c4be206937ac65ae95260dec940e00db1a5a8d0e /board/kodama | |
parent | 122f0b194d6ced2683e97686008bc3de2680edc4 (diff) | |
download | chrome-ec-093b5d0f9706268b1a077f87339fd7407345d3fa.tar.gz |
Revert "kodama/jacuzzi: enable i2c bitbang"
This reverts commit e25c81318a06506c79423900b9592a7caa36cfed.
Reason for revert:
This CL triggers the free space problem on kodama board.
See https://crbug.com/1034518
Original change's description:
> kodama/jacuzzi: enable i2c bitbang
>
> - Enable bitbang driver
> - increase the console/hook stack size because accessing bitbang i2c bus
> requires more stack memory than before
>
> BUG=b:138161741,b:138415463
> TEST=see CL:1765110
> BRANCH=kukui
>
> Change-Id: I54aa0b5c37cd3fde497b552ea553e5542e594546
> Signed-off-by: Ting Shen <phoenixshen@google.com>
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1876290
> Reviewed-by: Alexandru M Stan <amstan@chromium.org>
> Commit-Queue: Ting Shen <phoenixshen@chromium.org>
> Tested-by: Ting Shen <phoenixshen@chromium.org>
Bug: b:138161741, b:138415463, chromium:1034518
Change-Id: Ie42a9e3b6bf79416c0741d623217d2872e52d8ba
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1972385
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Commit-Queue: Xiyuan Xia <xiyuan@chromium.org>
Tested-by: Xiyuan Xia <xiyuan@chromium.org>
Diffstat (limited to 'board/kodama')
-rw-r--r-- | board/kodama/board.c | 11 | ||||
-rw-r--r-- | board/kodama/board.h | 12 | ||||
-rw-r--r-- | board/kodama/ec.tasklist | 2 | ||||
-rw-r--r-- | board/kodama/gpio.inc | 3 |
4 files changed, 4 insertions, 24 deletions
diff --git a/board/kodama/board.c b/board/kodama/board.c index f68127a9cc..6a21ca0847 100644 --- a/board/kodama/board.c +++ b/board/kodama/board.c @@ -24,7 +24,6 @@ #include "hooks.h" #include "host_command.h" #include "i2c.h" -#include "i2c_bitbang.h" #include "lid_switch.h" #include "power.h" #include "power_button.h" @@ -68,11 +67,6 @@ const struct i2c_port_t i2c_ports[] = { }; const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports); -const struct i2c_port_t i2c_bitbang_ports[] = { - {"battery", 2, 100, GPIO_I2C3_SCL, GPIO_I2C3_SDA, .drv = &bitbang_drv}, -}; -const unsigned int i2c_bitbang_ports_used = ARRAY_SIZE(i2c_bitbang_ports); - /* power signal list. Must match order of enum power_signal. */ const struct power_signal_info power_signal_list[] = { {GPIO_AP_IN_SLEEP_L, POWER_SIGNAL_ACTIVE_LOW, "AP_IN_S3_L"}, @@ -377,8 +371,3 @@ void board_fill_source_power_info(int port, r->meas.current_lim = 1500; r->max_power = r->meas.voltage_now * r->meas.current_max; } - -int board_get_battery_i2c(void) -{ - return board_get_version() >= 2 ? 2 : 1; -} diff --git a/board/kodama/board.h b/board/kodama/board.h index cf71fe5dd2..d6d7a329b1 100644 --- a/board/kodama/board.h +++ b/board/kodama/board.h @@ -28,12 +28,6 @@ #define CONFIG_BATTERY_HW_PRESENT_CUSTOM -#define CONFIG_I2C_BITBANG -#define I2C_BITBANG_PORT_COUNT 1 -#undef CONFIG_I2C_NACK_RETRY_COUNT -#define CONFIG_I2C_NACK_RETRY_COUNT 3 -#define CONFIG_SMBUS_PEC - /* Battery */ #define BATTERY_DESIRED_CHARGING_CURRENT 2000 /* mA */ @@ -58,9 +52,9 @@ #define I2C_PORT_CHARGER 0 #define I2C_PORT_TCPC0 0 #define I2C_PORT_USB_MUX 0 -#define I2C_PORT_ACCEL 1 -#define I2C_PORT_BATTERY board_get_battery_i2c() +#define I2C_PORT_BATTERY 1 #define I2C_PORT_VIRTUAL_BATTERY I2C_PORT_BATTERY +#define I2C_PORT_ACCEL 1 /* Define the host events which are allowed to wakeup AP in S3. */ #define CONFIG_MKBP_HOST_EVENT_WAKEUP_MASK \ @@ -119,8 +113,6 @@ int board_get_version(void); int board_is_sourcing_vbus(int port); void pogo_adc_interrupt(enum gpio_signal signal); int board_discharge_on_ac(int enable); -/* returns the i2c port number of battery */ -int board_get_battery_i2c(void); #endif /* !__ASSEMBLER__ */ diff --git a/board/kodama/ec.tasklist b/board/kodama/ec.tasklist index df944a1b07..bfa61707e1 100644 --- a/board/kodama/ec.tasklist +++ b/board/kodama/ec.tasklist @@ -7,7 +7,7 @@ * See CONFIG_TASK_LIST in config.h for details. */ #define CONFIG_TASK_LIST \ - TASK_ALWAYS(HOOKS, hook_task, NULL, VENTI_TASK_STACK_SIZE) \ + TASK_ALWAYS(HOOKS, hook_task, NULL, LARGER_TASK_STACK_SIZE) \ TASK_ALWAYS(CHARGER, charger_task, NULL, VENTI_TASK_STACK_SIZE) \ TASK_ALWAYS(USB_CHG, usb_charger_task, NULL, VENTI_TASK_STACK_SIZE) \ TASK_NOTEST(CHIPSET, chipset_task, NULL, LARGER_TASK_STACK_SIZE) \ diff --git a/board/kodama/gpio.inc b/board/kodama/gpio.inc index b54d6f5ed5..461d34d4d5 100644 --- a/board/kodama/gpio.inc +++ b/board/kodama/gpio.inc @@ -63,8 +63,6 @@ GPIO(I2C1_SCL, PIN(B, 8), GPIO_INPUT) GPIO(I2C1_SDA, PIN(B, 9), GPIO_INPUT) GPIO(I2C2_SCL, PIN(A, 11), GPIO_INPUT) GPIO(I2C2_SDA, PIN(A, 12), GPIO_INPUT) -GPIO(I2C3_SCL, PIN(B, 6), GPIO_ODR_HIGH) -GPIO(I2C3_SDA, PIN(D, 2), GPIO_ODR_HIGH) /* Analog pins */ GPIO(BOARD_ID, PIN(C, 0), GPIO_ANALOG) @@ -85,6 +83,7 @@ GPIO(USB_C0_HPD_OD, PIN(F, 1), GPIO_ODR_LOW) GPIO(BOOTBLOCK_EN_L, PIN(C, 1), GPIO_ODR_HIGH) GPIO(BATT_CUTOFF_INDICATOR, PIN(A, 5), GPIO_OUT_LOW) GPIO(EN_PP3300_POGO, PIN(A, 13), GPIO_OUT_LOW) +GPIO(EN_POGO_CHARGE_L, PIN(B, 6), GPIO_OUT_HIGH) GPIO(BC12_DET_EN, PIN(C, 4), GPIO_OUT_LOW) UNIMPLEMENTED(EN_PP5000_USBC) |