diff options
author | Jeff Chase <jnchase@google.com> | 2021-06-28 11:17:41 -0400 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2021-06-29 03:47:26 +0000 |
commit | d0d08e1f15c5396709d709718a0a5dfc168c7063 (patch) | |
tree | 56a50ffe5c524307d8a385f69c84ccf83a3ae756 /board | |
parent | 6d5e9b9b885017b4e6d06cfbb2585cfb23c58d82 (diff) | |
download | chrome-ec-d0d08e1f15c5396709d709718a0a5dfc168c7063.tar.gz |
scout: merge bringup changes
- Update GPIOs
- Toggle 12V power rails on S0
BRANCH=none
BUG=b:187078663
TEST=boot scout
Signed-off-by: Jeff Chase <jnchase@google.com>
Change-Id: Iac2525df80880d5d2053993dccb982da011c0161
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2991899
Reviewed-by: Joe Tessler <jrt@chromium.org>
Commit-Queue: Joe Tessler <jrt@chromium.org>
Diffstat (limited to 'board')
-rw-r--r-- | board/scout/board.c | 14 | ||||
-rw-r--r-- | board/scout/board.h | 2 | ||||
-rw-r--r-- | board/scout/build.mk | 1 | ||||
-rw-r--r-- | board/scout/gpio.inc | 40 | ||||
-rw-r--r-- | board/scout/pse.c | 266 |
5 files changed, 35 insertions, 288 deletions
diff --git a/board/scout/board.c b/board/scout/board.c index e48ed0fe0d..5e7ea14a09 100644 --- a/board/scout/board.c +++ b/board/scout/board.c @@ -87,8 +87,6 @@ static void update_5v_usage(void) base_5v_power += PWR_REAR; if (!gpio_get_level(GPIO_USB_A3_OC_ODL)) base_5v_power += PWR_REAR; - if (ec_config_get_usb4_present() && !gpio_get_level(GPIO_USB_A4_OC_ODL)) - base_5v_power += PWR_REAR; if (!gpio_get_level(GPIO_HDMI_CONN0_OC_ODL)) base_5v_power += PWR_HDMI; if (!gpio_get_level(GPIO_HDMI_CONN1_OC_ODL)) @@ -140,8 +138,8 @@ const struct pwm_t pwm_channels[] = { const struct i2c_port_t i2c_ports[] = { {"ina", I2C_PORT_INA, 400, GPIO_I2C0_SCL, GPIO_I2C0_SDA}, {"ppc0", I2C_PORT_PPC0, 400, GPIO_I2C1_SCL, GPIO_I2C1_SDA}, + {"scaler", I2C_PORT_SCALER, 400, GPIO_I2C2_SCL, GPIO_I2C2_SDA}, {"tcpc0", I2C_PORT_TCPC0, 400, GPIO_I2C3_SCL, GPIO_I2C3_SDA}, - {"pse", I2C_PORT_PSE, 400, GPIO_I2C4_SCL, GPIO_I2C4_SDA}, {"power", I2C_PORT_POWER, 400, GPIO_I2C5_SCL, GPIO_I2C5_SDA}, {"eeprom", I2C_PORT_EEPROM, 400, GPIO_I2C7_SCL, GPIO_I2C7_SDA}, }; @@ -364,6 +362,16 @@ void board_enable_s0_rails(int enable) { /* This output isn't connected on protos; safe to set anyway. */ gpio_set_level(GPIO_EN_PP5000_HDMI, enable); + + /* + * Toggle scaler power and its downstream USB devices. + */ + gpio_set_level(GPIO_EC_SCALER_EN, enable); + gpio_set_level(GPIO_PWR_CTRL, enable); + gpio_set_level(GPIO_EC_MX8M_ONOFF, enable); + gpio_set_level(GPIO_EC_CAM_V3P3_EN, enable); + + gpio_set_level(GPIO_PP3300_TPU_A_EN, enable); } int ec_config_get_usb4_present(void) diff --git a/board/scout/board.h b/board/scout/board.h index 859d86e020..5af0cd943f 100644 --- a/board/scout/board.h +++ b/board/scout/board.h @@ -120,8 +120,8 @@ #define CONFIG_I2C_CONTROLLER #define I2C_PORT_INA NPCX_I2C_PORT0_0 #define I2C_PORT_PPC0 NPCX_I2C_PORT1_0 +#define I2C_PORT_SCALER NPCX_I2C_PORT2_0 #define I2C_PORT_TCPC0 NPCX_I2C_PORT3_0 -#define I2C_PORT_PSE NPCX_I2C_PORT4_1 #define I2C_PORT_POWER NPCX_I2C_PORT5_0 #define I2C_PORT_EEPROM NPCX_I2C_PORT7_0 #define I2C_ADDR_EEPROM_FLAGS 0x50 diff --git a/board/scout/build.mk b/board/scout/build.mk index 0acd315b39..cf964a2d15 100644 --- a/board/scout/build.mk +++ b/board/scout/build.mk @@ -12,4 +12,3 @@ CHIP_VARIANT:=npcx7m6fc board-y=board.o board-y+=led.o -board-y+=pse.o diff --git a/board/scout/gpio.inc b/board/scout/gpio.inc index 10f9ce3018..32e077de50 100644 --- a/board/scout/gpio.inc +++ b/board/scout/gpio.inc @@ -54,8 +54,6 @@ GPIO_INT(USB_A0_OC_ODL, PIN(E, 4), GPIO_INT_BOTH, port_ocp_interrupt) GPIO_INT(USB_A1_OC_ODL, PIN(A, 2), GPIO_INT_BOTH, port_ocp_interrupt) GPIO_INT(USB_A2_OC_ODL, PIN(F, 5), GPIO_INT_BOTH, port_ocp_interrupt) GPIO_INT(USB_A3_OC_ODL, PIN(0, 3), GPIO_INT_BOTH, port_ocp_interrupt) -/* May be reconfigured as input */ -GPIO_INT(USB_A4_OC_ODL, PIN(B, 0), GPIO_OUT_LOW | GPIO_INT_BOTH, port_ocp_interrupt) /* PCH/CPU signals */ GPIO(EC_PCH_PWROK, PIN(0, 5), GPIO_OUT_LOW) @@ -67,6 +65,15 @@ GPIO(EC_PROCHOT_IN_OD, PIN(3, 4), GPIO_INPUT) GPIO(EC_PROCHOT_ODL, PIN(6, 3), GPIO_ODR_HIGH) GPIO(SYS_RST_ODL, PIN(C, 5), GPIO_ODR_HIGH) +/* i.MX8 soundbar signals */ +GPIO(BOOT_IND_EC, PIN(E, 2), GPIO_INPUT) + +/* TSUM scaler signals */ +GPIO(TSUM_WAKEUP_EC, PIN(B, 1), GPIO_INPUT) + +/* ALS signals */ +GPIO(EC_RGB_INT_L, PIN(9, 7), GPIO_INPUT) + /* Power control outputs */ GPIO(EN_PP5000_A, PIN(A, 4), GPIO_OUT_LOW) GPIO(EN_PP3300_INA_H1_EC_ODL, PIN(5, 7), GPIO_ODR_HIGH) @@ -77,6 +84,11 @@ GPIO(EN_ROA_RAILS, PIN(A, 3), GPIO_OUT_LOW) GPIO(EN_PP950_VCCIO, PIN(1, 0), GPIO_OUT_LOW) GPIO(EC_IMVP8_PE, PIN(A, 7), GPIO_OUT_LOW) GPIO(EN_IMVP8_VR, PIN(F, 4), GPIO_OUT_LOW) +GPIO(EC_CAM_V3P3_EN, PIN(C, 6), GPIO_OUT_LOW) +GPIO(EC_MX8M_ONOFF, PIN(9, 3), GPIO_OUT_LOW) +GPIO(EC_SCALER_EN, PIN(E, 0), GPIO_OUT_LOW) +GPIO(PP3300_TPU_A_EN, PIN(B, 0), GPIO_OUT_LOW) +GPIO(PWR_CTRL, PIN(6, 2), GPIO_OUT_LOW) /* Barreljack */ GPIO(EN_PPVAR_BJ_ADP_L, PIN(0, 4), GPIO_OUT_LOW) @@ -88,7 +100,6 @@ GPIO(USB_A2_STATUS_L, PIN(6, 1), GPIO_INPUT) GPIO(USB_A3_STATUS_L, PIN(C, 7), GPIO_INPUT) /* USB type C */ -GPIO(USB_C0_TCPC_RST, PIN(9, 7), GPIO_OUT_LOW) GPIO(USB_C0_POL_L, PIN(0, 0), GPIO_INPUT | GPIO_SEL_1P8V) /* USB-C Polarity */ /* Misc. */ @@ -96,11 +107,10 @@ GPIO(M2_SSD_PLN, PIN(A, 0), GPIO_INPUT) GPIO(EC_ENTERING_RW, PIN(E, 3), GPIO_OUT_LOW) GPIO(CCD_MODE_ODL, PIN(E, 5), GPIO_ODR_HIGH) GPIO(PACKET_MODE_EN, PIN(7, 5), GPIO_OUT_LOW) -GPIO(EC_RST_LTC4291_L, PIN(9, 6), GPIO_OUT_HIGH) /* PSE controller reset */ +GPIO(EN_PP_MST_OD, PIN(9, 6), GPIO_OUT_HIGH) /* HDMI/CEC */ GPIO(EN_PP5000_HDMI, PIN(5, 0), GPIO_OUT_LOW) -GPIO(HDMI_CONN0_CEC_OUT, PIN(B, 1), GPIO_ODR_HIGH) GPIO(HDMI_CONN0_CEC_IN, PIN(4, 0), GPIO_INPUT) GPIO(HDMI_CONN1_CEC_OUT, PIN(9, 5), GPIO_ODR_HIGH) GPIO(HDMI_CONN1_CEC_IN, PIN(D, 3), GPIO_INPUT) @@ -110,10 +120,10 @@ GPIO(I2C0_SCL, PIN(B, 5), GPIO_INPUT) /* EC_I2C_INA_SC GPIO(I2C0_SDA, PIN(B, 4), GPIO_INPUT) /* EC_I2C_INA_SDA */ GPIO(I2C1_SCL, PIN(9, 0), GPIO_INPUT) /* EC_I2C_USB_C0_TCPPC_SCL */ GPIO(I2C1_SDA, PIN(8, 7), GPIO_INPUT) /* EC_I2C_USB_C0_TCPPC_SDA */ -GPIO(I2C3_SCL, PIN(D, 1), GPIO_INPUT) /* EC_I2C_USB_C0_TCPC_SCL */ -GPIO(I2C3_SDA, PIN(D, 0), GPIO_INPUT) /* EC_I2C_USB_C0_TCPC_SDA */ -GPIO(I2C4_SCL, PIN(F, 3), GPIO_INPUT) /* EC_I2C_LTC_SCL */ -GPIO(I2C4_SDA, PIN(F, 2), GPIO_INPUT) /* EC_I2C_LTC_SDA */ +GPIO(I2C2_SCL, PIN(9, 2), GPIO_INPUT) /* EC_I2C_DDR_SCALER_SCL */ +GPIO(I2C2_SDA, PIN(9, 1), GPIO_INPUT) /* EC_I2C_DDR_SCALER_SDA */ +GPIO(I2C3_SCL, PIN(D, 1), GPIO_INPUT) /* EC_I2C_ALS_SCL */ +GPIO(I2C3_SDA, PIN(D, 0), GPIO_INPUT) /* EC_I2C_ALS_SDA */ GPIO(I2C5_SCL, PIN(3, 3), GPIO_INPUT) /* EC_I2C_IMVP8_SCL */ GPIO(I2C5_SDA, PIN(3, 6), GPIO_INPUT) /* EC_I2C_IMVP8_SDA */ GPIO(I2C7_SCL, PIN(B, 3), GPIO_INPUT) /* EC_I2C_EEPROM_SCL */ @@ -123,8 +133,8 @@ GPIO(I2C7_SDA, PIN(B, 2), GPIO_INPUT) /* EC_I2C_EEPROM ALTERNATE(PIN_MASK(B, 0x30), 0, MODULE_I2C, 0) /* I2C0 */ ALTERNATE(PIN_MASK(9, 0x01), 0, MODULE_I2C, 0) /* I2C1 SCL */ ALTERNATE(PIN_MASK(8, 0x80), 0, MODULE_I2C, 0) /* I2C1 SDA */ +ALTERNATE(PIN_MASK(9, 0x03), 0, MODULE_I2C, 0) /* I2C2 */ ALTERNATE(PIN_MASK(D, 0x03), 0, MODULE_I2C, 0) /* I2C3 */ -ALTERNATE(PIN_MASK(F, 0x0C), 0, MODULE_I2C, 0) /* I2C4 */ ALTERNATE(PIN_MASK(3, 0x48), 0, MODULE_I2C, 0) /* I2C5 */ ALTERNATE(PIN_MASK(B, 0x0C), 0, MODULE_I2C, 0) /* I2C7 */ @@ -135,7 +145,7 @@ ALTERNATE(PIN_MASK(B, 0x80), 0, MODULE_PWM, 0) /* PWM5 - Fan 1 ALTERNATE(PIN_MASK(7, 0x08), 0, MODULE_PWM, 0) /* TA2 - Fan Tachometer */ /* ADC */ -ALTERNATE(PIN_MASK(4, 0x2A), 0, MODULE_ADC, 0) /* ADC0, ADC2, ADC4 */ +ALTERNATE(PIN_MASK(4, 0x2E), 0, MODULE_ADC, 0) /* ADC0, ADC1, ADC2, ADC4 */ ALTERNATE(PIN_MASK(E, 0x02), 0, MODULE_ADC, 0) /* ADC7 */ ALTERNATE(PIN_MASK(F, 0x01), 0, MODULE_ADC, 0) /* ADC9 */ @@ -146,16 +156,11 @@ ALTERNATE(PIN_MASK(6, 0x30), 0, MODULE_UART, 0) /* UART from EC UNUSED(PIN(1, 3)) /* EC_GP_SEL1_ODL */ UNUSED(PIN(C, 0)) /* FAN_PWM_2 */ UNUSED(PIN(8, 0)) /* LED_BLUE_L */ -UNUSED(PIN(4, 4)) /* ADC1/TEMP_SENSOR_2 */ UNUSED(PIN(4, 2)) /* ADC3/TEMP_SENSOR_3 */ UNUSED(PIN(C, 2)) /* A12 NC */ -UNUSED(PIN(9, 2)) /* K8 NC */ -UNUSED(PIN(9, 1)) /* L8 NC */ UNUSED(PIN(1, 2)) /* C6 NC */ UNUSED(PIN(6, 6)) /* H4 NC */ UNUSED(PIN(8, 1)) /* L6 NC */ -UNUSED(PIN(C, 6)) /* B11 NC */ -UNUSED(PIN(E, 2)) /* B8 NC */ UNUSED(PIN(8, 5)) /* L7 NC */ UNUSED(PIN(3, 2)) /* E5 NC */ UNUSED(PIN(D, 6)) /* F6 NC */ @@ -163,5 +168,6 @@ UNUSED(PIN(3, 5)) /* F5 NC */ UNUSED(PIN(5, 6)) /* M2 NC */ UNUSED(PIN(D, 2)) /* C11 NC */ UNUSED(PIN(8, 6)) /* J8 NC */ -UNUSED(PIN(9, 3)) /* M11 NC */ UNUSED(PIN(7, 2)) /* H6 NC */ +UNUSED(PIN(F, 2)) /* E11 NC */ +UNUSED(PIN(F, 3)) /* F7 NC */ diff --git a/board/scout/pse.c b/board/scout/pse.c deleted file mode 100644 index 1c1b6bb41b..0000000000 --- a/board/scout/pse.c +++ /dev/null @@ -1,266 +0,0 @@ -/* Copyright 2021 The Chromium OS Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -/* - * The LTC4291 is a power over ethernet (PoE) power sourcing equipment (PSE) - * controller. - */ - -#include "common.h" -#include "console.h" -#include "ec_commands.h" -#include "hooks.h" -#include "host_command.h" -#include "i2c.h" -#include "string.h" -#include "timer.h" -#include "util.h" - -#define LTC4291_I2C_ADDR 0x2C - -#define LTC4291_REG_SUPEVN_COR 0x0B -#define LTC4291_REG_STATPWR 0x10 -#define LTC4291_REG_STATPIN 0x11 -#define LTC4291_REG_OPMD 0x12 -#define LTC4291_REG_DISENA 0x13 -#define LTC4291_REG_DETENA 0x14 -#define LTC4291_REG_DETPB 0x18 -#define LTC4291_REG_PWRPB 0x19 -#define LTC4291_REG_RSTPB 0x1A -#define LTC4291_REG_ID 0x1B -#define LTC4291_REG_DEVID 0x43 -#define LTC4291_REG_HPMD1 0x46 -#define LTC4291_REG_HPMD2 0x4B -#define LTC4291_REG_HPMD3 0x50 -#define LTC4291_REG_HPMD4 0x55 -#define LTC4291_REG_LPWRPB 0x6E - -#define LTC4291_FLD_STATPIN_AUTO BIT(0) -#define LTC4291_FLD_RSTPB_RSTALL BIT(4) - -#define LTC4291_STATPWR_ON_PORT(port) (0x01 << (port)) -#define LTC4291_DETENA_EN_PORT(port) (0x11 << (port)) -#define LTC4291_DETPB_EN_PORT(port) (0x11 << (port)) -#define LTC4291_PWRPB_OFF_PORT(port) (0x10 << (port)) - -#define LTC4291_OPMD_AUTO 0xFF -#define LTC4291_DISENA_ALL 0x0F -#define LTC4291_DETENA_ALL 0xFF -#define LTC4291_ID 0x64 -#define LTC4291_DEVID 0x38 -#define LTC4291_HPMD_MIN 0x00 -#define LTC4291_HPMD_MAX 0xA8 - -#define LTC4291_PORT_MAX 4 - -#define LTC4291_RESET_DELAY_US (20 * MSEC) - -#define I2C_PSE_READ(reg, data) \ - i2c_read8(I2C_PORT_PSE, LTC4291_I2C_ADDR, LTC4291_REG_##reg, (data)) - -#define I2C_PSE_WRITE(reg, data) \ - i2c_write8(I2C_PORT_PSE, LTC4291_I2C_ADDR, LTC4291_REG_##reg, (data)) - -#define CPRINTS(format, args...) cprints(CC_SYSTEM, format, ## args) - -static int pse_write_hpmd(int port, int val) -{ - switch (port) { - case 0: - return I2C_PSE_WRITE(HPMD1, val); - case 1: - return I2C_PSE_WRITE(HPMD2, val); - case 2: - return I2C_PSE_WRITE(HPMD3, val); - case 3: - return I2C_PSE_WRITE(HPMD4, val); - default: - return EC_ERROR_INVAL; - } -} - -/* - * Port 1: 100W - * Port 2-4: 15W - */ -static int pse_port_hpmd[4] = { - LTC4291_HPMD_MAX, - LTC4291_HPMD_MIN, - LTC4291_HPMD_MIN, - LTC4291_HPMD_MIN, -}; - -static int pse_port_enable(int port) -{ - /* Enable detection and classification */ - return I2C_PSE_WRITE(DETPB, LTC4291_DETPB_EN_PORT(port)); -} - -static int pse_port_disable(int port) -{ - /* Request power off (this also disables detection/classification) */ - return I2C_PSE_WRITE(PWRPB, LTC4291_PWRPB_OFF_PORT(port)); -} - -static int pse_init_worker(void) -{ - timestamp_t deadline; - int err, id, devid, statpin, port; - - /* Ignore errors -- may already be resetting */ - I2C_PSE_WRITE(RSTPB, LTC4291_FLD_RSTPB_RSTALL); - - deadline.val = get_time().val + LTC4291_RESET_DELAY_US; - while ((err = I2C_PSE_READ(ID, &id)) != 0) { - if (timestamp_expired(deadline, NULL)) - return err; - } - - err = I2C_PSE_READ(DEVID, &devid); - if (err != 0) - return err; - - if (id != LTC4291_ID || devid != LTC4291_DEVID) - return EC_ERROR_INVAL; - - err = I2C_PSE_READ(STATPIN, &statpin); - if (err != 0) - return err; - - /* - * We don't want to supply power until we've had a chance to set the - * limits. - */ - if (statpin & LTC4291_FLD_STATPIN_AUTO) - CPRINTS("WARN: PSE reset in AUTO mode"); - - err = I2C_PSE_WRITE(OPMD, LTC4291_OPMD_AUTO); - if (err != 0) - return err; - - /* Set maximum power each port is allowed to allocate. */ - for (port = 0; port < LTC4291_PORT_MAX; port++) { - err = pse_write_hpmd(port, pse_port_hpmd[port]); - if (err != 0) - return err; - } - - err = I2C_PSE_WRITE(DISENA, LTC4291_DISENA_ALL); - if (err != 0) - return err; - - err = I2C_PSE_WRITE(DETENA, LTC4291_DETENA_ALL); - if (err != 0) - return err; - - return 0; -} - -static void pse_init(void) -{ - int err; - - err = pse_init_worker(); - if (err != 0) - CPRINTS("PSE init failed: %d", err); - else - CPRINTS("PSE init done"); -} -DECLARE_HOOK(HOOK_CHIPSET_RESUME, pse_init, HOOK_PRIO_DEFAULT); - -/* Also reset the PSE on a reboot to toggle the power. */ -DECLARE_HOOK(HOOK_CHIPSET_RESET, pse_init, HOOK_PRIO_DEFAULT); - -static int command_pse(int argc, char **argv) -{ - int port; - - /* - * TODO(b/156399232): endeavour: PSE controller reset by PLTRST - * - * Initialization does not reliably work after reset because the device - * is held in reset by the AP. Running this command after boot finishes - * always succeeds. Remove once the reset signal changes. - */ - if (!strncmp(argv[1], "init", 4)) - return pse_init_worker(); - - if (argc != 3) - return EC_ERROR_PARAM_COUNT; - - port = atoi(argv[1]); - if (port < 0 || port >= LTC4291_PORT_MAX) - return EC_ERROR_PARAM1; - - if (!strncmp(argv[2], "off", 3)) - return pse_port_disable(port); - else if (!strncmp(argv[2], "on", 2)) - return pse_port_enable(port); - else if (!strncmp(argv[2], "min", 3)) - return pse_write_hpmd(port, LTC4291_HPMD_MIN); - else if (!strncmp(argv[2], "max", 3)) - return pse_write_hpmd(port, LTC4291_HPMD_MAX); - else - return EC_ERROR_PARAM2; -} -DECLARE_CONSOLE_COMMAND(pse, command_pse, - "<port# 0-3> <off | on | min | max>", - "Set PSE port power"); - -static int ec_command_pse_status(int port, uint8_t *status) -{ - int detena, statpwr; - int err; - - err = I2C_PSE_READ(DETENA, &detena); - if (err != 0) - return err; - - err = I2C_PSE_READ(STATPWR, &statpwr); - if (err != 0) - return err; - - if ((detena & LTC4291_DETENA_EN_PORT(port)) == 0) - *status = EC_PSE_STATUS_DISABLED; - else if ((statpwr & LTC4291_STATPWR_ON_PORT(port)) == 0) - *status = EC_PSE_STATUS_ENABLED; - else - *status = EC_PSE_STATUS_POWERED; - - return 0; -} - -static enum ec_status ec_command_pse(struct host_cmd_handler_args *args) -{ - const struct ec_params_pse *p = args->params; - int err = 0; - - if (p->port >= LTC4291_PORT_MAX) - return EC_RES_INVALID_PARAM; - - switch (p->cmd) { - case EC_PSE_STATUS: { - struct ec_response_pse_status *r = args->response; - - args->response_size = sizeof(*r); - err = ec_command_pse_status(p->port, &r->status); - break; - } - case EC_PSE_ENABLE: - err = pse_port_enable(p->port); - break; - case EC_PSE_DISABLE: - err = pse_port_disable(p->port); - break; - default: - return EC_RES_INVALID_PARAM; - } - - if (err) - return EC_RES_ERROR; - - return EC_RES_SUCCESS; -} -DECLARE_HOST_COMMAND(EC_CMD_PSE, ec_command_pse, EC_VER_MASK(0)); |