diff options
author | Scott Collyer <scollyer@google.com> | 2019-04-02 17:35:02 -0700 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2019-04-17 21:32:25 -0700 |
commit | f562e995c896e32816f013b848b8ffe61c8f09cd (patch) | |
tree | f19048398dc014684479eb162f3db3e56cbd9f24 /baseboard | |
parent | 8841b815c195aadacb8f0f6e625041c3427bbd97 (diff) | |
download | chrome-ec-f562e995c896e32816f013b848b8ffe61c8f09cd.tar.gz |
tcpm: Refactor tcpc_config to include a flags field
tcpc_config contained a field for both the alert polarity and open
drain/push pull configuration. There is also a possible difference in TCPC
reset polarity. Instead of adding yet another field to describe this
configuration, it would be better to convert alert polairty, open
drain and reset polarity into a single flags field.
This CL modifies the tcpc_config struct to use a single flags field
and adds defines for what existing flag options can be.
BUG=b:130194031
BRANCH=none
TEST=make -j buildall
Change-Id: Ifb7e7604edb7021fb2d36ee279049eb52fefc99e
Signed-off-by: Scott Collyer <scollyer@google.com>
Signed-off-by: Furquan Shaikh <furquan@google.com>
Reviewed-on: https://chromium-review.googlesource.com/1551581
Commit-Ready: Furquan Shaikh <furquan@chromium.org>
Tested-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-by: Jett Rink <jettrink@chromium.org>
Reviewed-by: Paul Fagerburg <pfagerburg@chromium.org>
Diffstat (limited to 'baseboard')
-rw-r--r-- | baseboard/dragonegg/baseboard.c | 9 | ||||
-rw-r--r-- | baseboard/grunt/baseboard.c | 7 | ||||
-rw-r--r-- | baseboard/hatch/baseboard.c | 6 | ||||
-rw-r--r-- | baseboard/kalista/baseboard.c | 4 | ||||
-rw-r--r-- | baseboard/octopus/variant_usbc_ec_tcpcs.c | 6 | ||||
-rw-r--r-- | baseboard/octopus/variant_usbc_standalone_tcpcs.c | 9 |
6 files changed, 26 insertions, 15 deletions
diff --git a/baseboard/dragonegg/baseboard.c b/baseboard/dragonegg/baseboard.c index 54cc16a98d..dbf3a8fedd 100644 --- a/baseboard/dragonegg/baseboard.c +++ b/baseboard/dragonegg/baseboard.c @@ -166,20 +166,23 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_COUNT] = { [USB_PD_PORT_ITE_0] = { /* TCPC is embedded within EC so no i2c config needed */ .drv = &it83xx_tcpm_drv, - .pol = TCPC_ALERT_ACTIVE_LOW, + /* Alert is active-low, push-pull */ + .flags = 0, }, [USB_PD_PORT_ITE_1] = { /* TCPC is embedded within EC so no i2c config needed */ .drv = &it83xx_tcpm_drv, - .pol = TCPC_ALERT_ACTIVE_LOW, + /* Alert is active-low, push-pull */ + .flags = 0, }, [USB_PD_PORT_TUSB422_2] = { .i2c_host_port = I2C_PORT_USBC1C2, .i2c_slave_addr = TUSB422_I2C_ADDR, .drv = &tusb422_tcpm_drv, - .pol = TCPC_ALERT_ACTIVE_LOW, + /* Alert is active-low, push-pull */ + .flags = 0, }, }; diff --git a/baseboard/grunt/baseboard.c b/baseboard/grunt/baseboard.c index 70350cffec..e743c195a4 100644 --- a/baseboard/grunt/baseboard.c +++ b/baseboard/grunt/baseboard.c @@ -89,14 +89,15 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_COUNT] = { .i2c_host_port = I2C_PORT_TCPC0, .i2c_slave_addr = ANX74XX_I2C_ADDR1, .drv = &anx74xx_tcpm_drv, - .pol = TCPC_ALERT_ACTIVE_LOW, - .od = TCPC_ALERT_OPEN_DRAIN, + /* Alert is active-low, open-drain */ + .flags = TCPC_FLAGS_ALERT_OD, }, [USB_PD_PORT_PS8751] = { .i2c_host_port = I2C_PORT_TCPC1, .i2c_slave_addr = PS8751_I2C_ADDR1, .drv = &ps8xxx_tcpm_drv, - .pol = TCPC_ALERT_ACTIVE_LOW, + /* Alert is active-low, push-pull */ + .flags = 0, }, }; diff --git a/baseboard/hatch/baseboard.c b/baseboard/hatch/baseboard.c index ad89d52284..ba90e10fa2 100644 --- a/baseboard/hatch/baseboard.c +++ b/baseboard/hatch/baseboard.c @@ -151,13 +151,15 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_COUNT] = { .i2c_host_port = I2C_PORT_TCPC0, .i2c_slave_addr = AN7447_TCPC0_I2C_ADDR, .drv = &anx7447_tcpm_drv, - .pol = TCPC_ALERT_ACTIVE_LOW, + /* Alert is active-low, push-pull */ + .flags = 0, }, [USB_PD_PORT_TCPC_1] = { .i2c_host_port = I2C_PORT_TCPC1, .i2c_slave_addr = PS8751_I2C_ADDR1, .drv = &ps8xxx_tcpm_drv, - .pol = TCPC_ALERT_ACTIVE_LOW, + /* Alert is active-low, push-pull */ + .flags = 0, }, }; diff --git a/baseboard/kalista/baseboard.c b/baseboard/kalista/baseboard.c index 53e75508a9..08fa73dd92 100644 --- a/baseboard/kalista/baseboard.c +++ b/baseboard/kalista/baseboard.c @@ -150,8 +150,8 @@ const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports); /* TCPC mux configuration */ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_COUNT] = { - {I2C_PORT_TCPC0, I2C_ADDR_TCPC0, &ps8xxx_tcpm_drv, - TCPC_ALERT_ACTIVE_LOW}, + /* Alert is active-low, push-pull */ + {I2C_PORT_TCPC0, I2C_ADDR_TCPC0, &ps8xxx_tcpm_drv, 0}, }; static int ps8751_tune_mux(int port) diff --git a/baseboard/octopus/variant_usbc_ec_tcpcs.c b/baseboard/octopus/variant_usbc_ec_tcpcs.c index 570a919b6c..2bdb7d2c1d 100644 --- a/baseboard/octopus/variant_usbc_ec_tcpcs.c +++ b/baseboard/octopus/variant_usbc_ec_tcpcs.c @@ -31,12 +31,14 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_COUNT] = { [USB_PD_PORT_ITE_0] = { /* TCPC is embedded within EC so no i2c config needed */ .drv = &it83xx_tcpm_drv, - .pol = TCPC_ALERT_ACTIVE_LOW, + /* Alert is active-low, push-pull */ + .flags = 0, }, [USB_PD_PORT_ITE_1] = { /* TCPC is embedded within EC so no i2c config needed */ .drv = &it83xx_tcpm_drv, - .pol = TCPC_ALERT_ACTIVE_LOW, + /* Alert is active-low, push-pull */ + .flags = 0, }, }; diff --git a/baseboard/octopus/variant_usbc_standalone_tcpcs.c b/baseboard/octopus/variant_usbc_standalone_tcpcs.c index fbae3e70d0..4d4ac83b6d 100644 --- a/baseboard/octopus/variant_usbc_standalone_tcpcs.c +++ b/baseboard/octopus/variant_usbc_standalone_tcpcs.c @@ -35,18 +35,21 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_COUNT] = { #if defined(VARIANT_OCTOPUS_TCPC_0_PS8751) .i2c_slave_addr = PS8751_I2C_ADDR1, .drv = &ps8xxx_tcpm_drv, - .pol = TCPC_ALERT_ACTIVE_LOW + /* Alert is active-low, push-pull */ + .flags = 0, #else .i2c_slave_addr = AN7447_TCPC0_I2C_ADDR, .drv = &anx7447_tcpm_drv, - .pol = TCPC_ALERT_ACTIVE_LOW, + /* Alert is active-low, push-pull */ + .flags = 0, #endif }, [USB_PD_PORT_TCPC_1] = { .i2c_host_port = I2C_PORT_TCPC1, .i2c_slave_addr = PS8751_I2C_ADDR1, .drv = &ps8xxx_tcpm_drv, - .pol = TCPC_ALERT_ACTIVE_LOW, + /* Alert is active-low, push-pull */ + .flags = 0, }, }; |