diff options
| author | Aseda Aboagye <aaboagye@google.com> | 2021-12-01 16:13:30 -0600 |
|---|---|---|
| committer | Aseda Aboagye <aaboagye@google.com> | 2021-12-01 16:13:30 -0600 |
| commit | 6eaa2bbe9454c4f4ad50bcdce35ada437ece31f8 (patch) | |
| tree | f97daf97ccb903fd22396f5f629d5a21a3974e8f /board/pico | |
| parent | dd6dfe084f35922a8bac3f899d912ad9cdbe6f47 (diff) | |
| parent | 5d6dfc1e5f91583c7e26d27073a6401224fe32c5 (diff) | |
| download | chrome-ec-6eaa2bbe9454c4f4ad50bcdce35ada437ece31f8.tar.gz | |
Merge remote-tracking branch cros/main into firmware-dedede-13606.B-master
Relevant changes:
git log --oneline dd6dfe084..5d6dfc1e5 -- baseboard/dedede board/beetley
board/blipper board/boten board/bugzzy board/cret board/drawcia
board/drawcia_riscv board/galtic board/kracko board/lantis board/madoo
board/magolor board/metaknight board/pirika board/sasuke board/sasukette
board/storo board/waddledee board/waddledoo board/wheelie
common/charge_state_v2.c common/mkbp_* common/ocpc.c
common/usbc/usb_tc_drp_acc_trysrc_sm.c common/usbc/usb_sm.c
common/usbc/*_pd_* common/usbc/dp_alt_mode.c common/usbc/usb_prl_sm.c
common/usbc/usb_pe_drp_sm.c common/usb_charger.c common/usb_common.c
common/usbc_ocp.c driver/charger/sm5803.* driver/charger/isl923x.*
driver/tcpm/raa489000.* driver/tcpm/it83* include/power/icelake.h
include/intel_x86.h power/icelake.c power/intel_x86.c util/getversion.sh
d89e49b20 power: Introduce S4 as a real power state
ba8a3c9c0 chgstv2: Use chipset_in_state instead of naming states
262172c84 i2c: Use declared initializers for i2c_ports: boards m-z
b610600e9 bugzzy : disable LCD DCDC by pannel power status
35865dbec TCPMv2: Guard DATA_RESET using CONFIG_USB_PD_DATA_RESET_MSG
d4d8243ed i2c: Use declared initializers for i2c_ports: baseboards
eba8d0305 RAA489000: Fixed RAA489000 max charging current
e78b83e0f TCPMv2: Delay Data Reset until mode entry request
6230e60fc TCPMv2: Support Data Reset as DFP, initiator
412246836 intel_x86: Apply chipset resume init and suspend complete hooks
f2809b72c config: rename CONFIG_HOSTCMD_ESPI to CONFIG_HOST_INTERFACE_ESPI
BRANCH=None
BUG=b:205675485 b:208371172 b:204947672 b:208318528 b:207328258
BUG=b:195416058 b:141363146
TEST=`make -j buildall`
Signed-off-by: Aseda Aboagye <aaboagye@google.com>
Change-Id: If1ab393cea39835edc2ec90f15ae0cd00dcf9400
Diffstat (limited to 'board/pico')
| -rw-r--r-- | board/pico/board.c | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/board/pico/board.c b/board/pico/board.c index e930c7c998..fbb21be654 100644 --- a/board/pico/board.c +++ b/board/pico/board.c @@ -207,9 +207,27 @@ BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT); /******************************************************************************/ /* I2C ports */ const struct i2c_port_t i2c_ports[] = { - {"typec", IT83XX_I2C_CH_C, 400, GPIO_I2C_C_SCL, GPIO_I2C_C_SDA}, - {"sensor", IT83XX_I2C_CH_B, 400, GPIO_I2C_B_SCL, GPIO_I2C_B_SDA}, - {"battery", IT83XX_I2C_CH_A, 100, GPIO_I2C_A_SCL, GPIO_I2C_A_SDA}, + { + .name = "typec", + .port = IT83XX_I2C_CH_C, + .kbps = 400, + .scl = GPIO_I2C_C_SCL, + .sda = GPIO_I2C_C_SDA + }, + { + .name = "sensor", + .port = IT83XX_I2C_CH_B, + .kbps = 400, + .scl = GPIO_I2C_B_SCL, + .sda = GPIO_I2C_B_SDA + }, + { + .name = "battery", + .port = IT83XX_I2C_CH_A, + .kbps = 100, + .scl = GPIO_I2C_A_SCL, + .sda = GPIO_I2C_A_SDA + }, }; const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports); |