From 4864eef4d84624a6fcc7f4fe428ae5a377a506ae Mon Sep 17 00:00:00 2001 From: Scott Collyer Date: Tue, 2 Apr 2019 17:35:02 -0700 Subject: 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 Signed-off-by: Furquan Shaikh Reviewed-on: https://chromium-review.googlesource.com/1551581 Commit-Ready: Furquan Shaikh Tested-by: Furquan Shaikh Reviewed-by: Jett Rink Reviewed-by: Paul Fagerburg Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2315960 Tested-by: Devin Lu Reviewed-by: Marco Chen Commit-Queue: Marco Chen --- board/glkrvp/chg_usb_pd.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'board/glkrvp/chg_usb_pd.c') diff --git a/board/glkrvp/chg_usb_pd.c b/board/glkrvp/chg_usb_pd.c index 6ca5006860..3e4d739d56 100644 --- a/board/glkrvp/chg_usb_pd.c +++ b/board/glkrvp/chg_usb_pd.c @@ -31,8 +31,10 @@ enum glkrvp_charge_ports { }; const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { - {NPCX_I2C_PORT7_0, 0xA0, &tcpci_tcpm_drv, TCPC_ALERT_ACTIVE_LOW}, - {NPCX_I2C_PORT7_0, 0xA4, &tcpci_tcpm_drv, TCPC_ALERT_ACTIVE_LOW}, + /* Alert is active-low, push-pull */ + {NPCX_I2C_PORT7_0, 0xA0, &tcpci_tcpm_drv, 0}, + /* Alert is active-low, push-pull */ + {NPCX_I2C_PORT7_0, 0xA4, &tcpci_tcpm_drv, 0}, }; BUILD_ASSERT(ARRAY_SIZE(tcpc_config) == CONFIG_USB_PD_PORT_MAX_COUNT); -- cgit v1.2.1