diff options
author | Diana Z <dzigterman@chromium.org> | 2018-11-21 11:57:36 -0700 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2018-11-27 19:14:02 -0800 |
commit | da44489b829098c579541081fc282dec47b6cab0 (patch) | |
tree | d978b0b5947d5c129e1cb0c60a9ea1efdcf75585 /baseboard | |
parent | 5e30db82364922372d029407cdea53f9835e1b9c (diff) | |
download | chrome-ec-da44489b829098c579541081fc282dec47b6cab0.tar.gz |
Casta: initial EC image
Initial image for casta based on the most recent schematics available.
BUG=b:119174492
BRANCH=octopus
TEST=builds
Change-Id: Ie0575476d79fd8f6c5f697499bc8a660880348e3
Signed-off-by: Diana Z <dzigterman@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1347011
Reviewed-by: Jett Rink <jettrink@chromium.org>
Diffstat (limited to 'baseboard')
-rw-r--r-- | baseboard/octopus/baseboard.h | 2 | ||||
-rw-r--r-- | baseboard/octopus/variant_ec_npcx796fb.c | 6 | ||||
-rw-r--r-- | baseboard/octopus/variant_usbc_standalone_tcpcs.c | 56 |
3 files changed, 51 insertions, 13 deletions
diff --git a/baseboard/octopus/baseboard.h b/baseboard/octopus/baseboard.h index dace7bdbcf..07e77b7013 100644 --- a/baseboard/octopus/baseboard.h +++ b/baseboard/octopus/baseboard.h @@ -162,8 +162,10 @@ #if defined(VARIANT_OCTOPUS_USBC_STANDALONE_TCPCS) #define CONFIG_USB_PD_TCPC_LOW_POWER #define CONFIG_USB_PD_DUAL_ROLE_AUTO_TOGGLE +#if !defined(VARIANT_OCTOPUS_TCPC_0_PS8751) #define CONFIG_USB_PD_TCPM_ANX7447 /* C0 TCPC: ANX7447QN */ #define CONFIG_USB_PD_TCPM_ANX7447_OCM_ERASE_COMMAND +#endif #define CONFIG_USB_PD_TCPM_PS8751 /* C1 TCPC: PS8751 */ #define CONFIG_USB_PD_VBUS_DETECT_TCPC #define CONFIG_USBC_PPC_NX20P3483 diff --git a/baseboard/octopus/variant_ec_npcx796fb.c b/baseboard/octopus/variant_ec_npcx796fb.c index 8d798fc5a7..9089e0fb19 100644 --- a/baseboard/octopus/variant_ec_npcx796fb.c +++ b/baseboard/octopus/variant_ec_npcx796fb.c @@ -9,7 +9,9 @@ #include "gpio.h" #include "i2c.h" #include "power.h" +#ifdef CONFIG_PWM #include "pwm_chip.h" +#endif #include "timer.h" #include "usbc_ppc.h" #include "util.h" @@ -33,13 +35,17 @@ const struct i2c_port_t i2c_ports[] = { {"tcpc1", I2C_PORT_TCPC1, 400, GPIO_I2C2_SCL, GPIO_I2C2_SDA}, {"eeprom", I2C_PORT_EEPROM, 100, GPIO_I2C3_SCL, GPIO_I2C3_SDA}, {"charger", I2C_PORT_CHARGER, 100, GPIO_I2C4_SCL, GPIO_I2C4_SDA}, +#ifndef VARIANT_OCTOPUS_NO_SENSORS {"sensor", I2C_PORT_SENSOR, 100, GPIO_I2C7_SCL, GPIO_I2C7_SDA}, +#endif }; const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports); +#ifdef CONFIG_PWM /******************************************************************************/ /* PWM channels. Must be in the exactly same order as in enum pwm_channel. */ const struct pwm_t pwm_channels[] = { [PWM_CH_KBLIGHT] = { .channel = 3, .flags = 0, .freq = 100 }, }; BUILD_ASSERT(ARRAY_SIZE(pwm_channels) == PWM_CH_COUNT); +#endif diff --git a/baseboard/octopus/variant_usbc_standalone_tcpcs.c b/baseboard/octopus/variant_usbc_standalone_tcpcs.c index ffa26336bb..ec2c65bd23 100644 --- a/baseboard/octopus/variant_usbc_standalone_tcpcs.c +++ b/baseboard/octopus/variant_usbc_standalone_tcpcs.c @@ -24,19 +24,25 @@ #define CPRINTF(format, args...) cprintf(CC_USBCHARGE, format, ## args) #define CPRINTS(format, args...) cprints(CC_USBCHARGE, format, ## args) -#define USB_PD_PORT_ANX7447 0 -#define USB_PD_PORT_PS8751 1 +#define USB_PD_PORT_TCPC_0 0 +#define USB_PD_PORT_TCPC_1 1 /******************************************************************************/ /* USB-C TPCP Configuration */ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_COUNT] = { - [USB_PD_PORT_ANX7447] = { + [USB_PD_PORT_TCPC_0] = { .i2c_host_port = I2C_PORT_TCPC0, +#if defined(VARIANT_OCTOPUS_TCPC_0_PS8751) + .i2c_slave_addr = PS8751_I2C_ADDR1, + .drv = &ps8xxx_tcpm_drv, + .pol = TCPC_ALERT_ACTIVE_LOW +#else .i2c_slave_addr = AN7447_TCPC0_I2C_ADDR, .drv = &anx7447_tcpm_drv, .pol = TCPC_ALERT_ACTIVE_LOW, +#endif }, - [USB_PD_PORT_PS8751] = { + [USB_PD_PORT_TCPC_1] = { .i2c_host_port = I2C_PORT_TCPC1, .i2c_slave_addr = PS8751_I2C_ADDR1, .drv = &ps8xxx_tcpm_drv, @@ -48,11 +54,16 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_COUNT] = { /* USB-C MUX Configuration */ struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_COUNT] = { - [USB_PD_PORT_ANX7447] = { + [USB_PD_PORT_TCPC_0] = { +#if defined(VARIANT_OCTOPUS_TCPC_0_PS8751) + .driver = &tcpci_tcpm_usb_mux_driver, + .hpd_update = &ps8xxx_tcpc_update_hpd_status, +#else .driver = &anx7447_usb_mux_driver, .hpd_update = &anx7447_tcpc_update_hpd_status, +#endif }, - [USB_PD_PORT_PS8751] = { + [USB_PD_PORT_TCPC_1] = { .driver = &tcpci_tcpm_usb_mux_driver, .hpd_update = &ps8xxx_tcpc_update_hpd_status, } @@ -61,12 +72,12 @@ struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_COUNT] = { /******************************************************************************/ /* USB-C PPC Configuration */ struct ppc_config_t ppc_chips[CONFIG_USB_PD_PORT_COUNT] = { - [USB_PD_PORT_ANX7447] = { + [USB_PD_PORT_TCPC_0] = { .i2c_port = I2C_PORT_TCPC0, .i2c_addr = NX20P3483_ADDR2, .drv = &nx20p348x_drv, }, - [USB_PD_PORT_PS8751] = { + [USB_PD_PORT_TCPC_1] = { .i2c_port = I2C_PORT_TCPC1, .i2c_addr = NX20P3483_ADDR2, .drv = &nx20p348x_drv, @@ -113,8 +124,12 @@ uint16_t tcpc_get_alert_status(void) uint16_t status = 0; if (!gpio_get_level(GPIO_USB_C0_MUX_INT_ODL)) { +#if defined(VARIANT_OCTOPUS_TCPC_0_PS8751) + if (gpio_get_level(GPIO_USB_C0_PD_RST_ODL)) +#else if (!gpio_is_implemented(GPIO_USB_C0_PD_RST) || !gpio_get_level(GPIO_USB_C0_PD_RST)) +#endif status |= PD_STATUS_TCPC_ALERT_0; } @@ -134,6 +149,21 @@ uint16_t tcpc_get_alert_status(void) */ void board_reset_pd_mcu(void) { +#if defined(VARIANT_OCTOPUS_TCPC_0_PS8751) + /* + * C0: Assert reset to TCPC0 (PS8751) for required delay if we have a + * battery + */ + if (battery_is_present() == BP_YES) { + /* + * TODO(crbug:846412): After refactor, ensure that battery has + * enough charge to last the reboot as well + */ + gpio_set_level(GPIO_USB_C0_PD_RST_ODL, 0); + msleep(PS8XXX_RESET_DELAY_MS); + gpio_set_level(GPIO_USB_C0_PD_RST_ODL, 1); + } +#else /* * C0: Assert reset to TCPC0 (ANX7447) for required delay (1ms) only if * we have a battery @@ -151,7 +181,7 @@ void board_reset_pd_mcu(void) gpio_set_level(GPIO_USB_C0_PD_RST, 0); msleep(ANX74XX_RESET_FINISH_MS); } - +#endif /* * C1: Assert reset to TCPC1 (PS8751) for required delay (1ms) only if * we have a battery, otherwise we may brown out the system. @@ -182,10 +212,10 @@ static void set_ps8751_gpio3(int enable) * Ensure that we don't put the TCPC back to sleep while we are * accessing debug registers. */ - pd_prevent_low_power_mode(USB_PD_PORT_PS8751, 1); + pd_prevent_low_power_mode(USB_PD_PORT_TCPC_1, 1); /* Enable debug page access */ - rv = tcpc_write(USB_PD_PORT_PS8751, PS8XXX_REG_I2C_DEBUGGING_ENABLE, + rv = tcpc_write(USB_PD_PORT_TCPC_1, PS8XXX_REG_I2C_DEBUGGING_ENABLE, 0x30); if (rv) goto error; @@ -225,8 +255,8 @@ error: CPRINTS("C1: Could not set re-driver power to %d", enable); /* Disable debug page access and allow LPM again*/ - tcpc_write(USB_PD_PORT_PS8751, PS8XXX_REG_I2C_DEBUGGING_ENABLE, 0x31); - pd_prevent_low_power_mode(USB_PD_PORT_PS8751, 0); + tcpc_write(USB_PD_PORT_TCPC_1, PS8XXX_REG_I2C_DEBUGGING_ENABLE, 0x31); + pd_prevent_low_power_mode(USB_PD_PORT_TCPC_1, 0); } /* |