tcpc: change name of get_vbus_level to check_vbus_level

this is to add near future functionality to allow
not only the current PRESENT range check but to add
Save0V range checking as well, for platforms that
allow for this.  This just lays the framework and
is functionally equivalent.

BUG=none
BRANCH=none
TEST=verify basic USB functionality

Signed-off-by: Denis Brockus <dbrockus@google.com>
Change-Id: I1eb3411bc3aa9b792c9b97799e1721e5cb229f64
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2199036
Tested-by: Denis Brockus <dbrockus@chromium.org>
Reviewed-by: Diana Z <dzigterman@chromium.org>
Commit-Queue: Denis Brockus <dbrockus@chromium.org>
Auto-Submit: Denis Brockus <dbrockus@chromium.org>

12 files changed, 29 insertions, 26 deletions

diff --git a/driver/tcpm/anx7447.c b/driver/tcpm/anx7447.c
index 0d4be2c477..aee839936d 100644
--- a/driver/tcpm/anx7447.c
+++ b/driver/tcpm/anx7447.c
@@ -751,7 +751,7 @@ const struct tcpm_drv anx7447_tcpm_drv = {
 	.release		= &anx7447_release,
 	.get_cc			= &tcpci_tcpm_get_cc,
 #ifdef CONFIG_USB_PD_VBUS_DETECT_TCPC
-	.get_vbus_level		= &tcpci_tcpm_get_vbus_level,
+	.check_vbus_level	= &tcpci_tcpm_check_vbus_level,
 #endif
 	.select_rp_value	= &tcpci_tcpm_select_rp_value,
 	.set_cc			= &anx7447_set_cc,
diff --git a/driver/tcpm/anx74xx.c b/driver/tcpm/anx74xx.c
index f8b12fe43d..c40c65e312 100644
--- a/driver/tcpm/anx74xx.c
+++ b/driver/tcpm/anx74xx.c
@@ -860,7 +860,7 @@ static int anx74xx_tcpm_set_rx_enable(int port, int enable)
 }
 
 #ifdef CONFIG_USB_PD_VBUS_DETECT_TCPC
-static int anx74xx_tcpm_get_vbus_level(int port)
+static bool anx74xx_tcpm_check_vbus_level(int port, enum vbus_level level)
 {
 	int reg = 0;
 
@@ -1155,7 +1155,7 @@ const struct tcpm_drv anx74xx_tcpm_drv = {
 	.release		= &anx74xx_tcpm_release,
 	.get_cc			= &anx74xx_tcpm_get_cc,
 #ifdef CONFIG_USB_PD_VBUS_DETECT_TCPC
-	.get_vbus_level		= &anx74xx_tcpm_get_vbus_level,
+	.check_vbus_level	= &anx74xx_tcpm_check_vbus_level,
 #endif
 	.select_rp_value	= &anx74xx_tcpm_select_rp_value,
 	.set_cc			= &anx74xx_tcpm_set_cc,
diff --git a/driver/tcpm/anx7688.c b/driver/tcpm/anx7688.c
index 8b5a70cf73..a4baad42c3 100644
--- a/driver/tcpm/anx7688.c
+++ b/driver/tcpm/anx7688.c
@@ -171,7 +171,7 @@ static int anx7688_mux_set(const struct usb_mux *me, mux_state_t mux_state)
 }
 
 #ifdef CONFIG_USB_PD_VBUS_DETECT_TCPC
-static int anx7688_tcpm_get_vbus_level(int port)
+static bool anx7688_tcpm_check_vbus_level(int port, enum vbus_level level)
 {
 	int reg = 0;
 
@@ -191,7 +191,7 @@ const struct tcpm_drv anx7688_tcpm_drv = {
 	.release		= &anx7688_release,
 	.get_cc			= &tcpci_tcpm_get_cc,
 #ifdef CONFIG_USB_PD_VBUS_DETECT_TCPC
-	.get_vbus_level		= &anx7688_tcpm_get_vbus_level,
+	.check_vbus_level	= &anx7688_tcpm_check_vbus_level,
 #endif
 	.select_rp_value	= &tcpci_tcpm_select_rp_value,
 	.set_cc			= &tcpci_tcpm_set_cc,
diff --git a/driver/tcpm/fusb302.c b/driver/tcpm/fusb302.c
index 61a5623fb9..67121cba28 100644
--- a/driver/tcpm/fusb302.c
+++ b/driver/tcpm/fusb302.c
@@ -904,7 +904,7 @@ static int fusb302_tcpm_transmit(int port, enum tcpm_transmit_type type,
 }
 
 #ifdef CONFIG_USB_PD_VBUS_DETECT_TCPC
-static int fusb302_tcpm_get_vbus_level(int port)
+static bool fusb302_tcpm_check_vbus_level(int port, enum vbus_level level)
 {
 	int reg;
 
@@ -950,9 +950,10 @@ void fusb302_tcpc_alert(int port)
 		/* VBUS crossed threshold */
 #ifdef CONFIG_USB_CHARGER
 		usb_charger_vbus_change(port,
-					fusb302_tcpm_get_vbus_level(port));
+					fusb302_tcpm_check_vbus_level(port,
+							VBUS_PRESENT));
 #else
-		if (!fusb302_tcpm_get_vbus_level(port))
+		if (!fusb302_tcpm_check_vbus_level(port, VBUS_PRESENT))
 			pd_vbus_low(port);
 #endif
 		task_wake(PD_PORT_TO_TASK_ID(port));
@@ -1147,7 +1148,7 @@ const struct tcpm_drv fusb302_tcpm_drv = {
 	.release		= &fusb302_tcpm_release,
 	.get_cc			= &fusb302_tcpm_get_cc,
 #ifdef CONFIG_USB_PD_VBUS_DETECT_TCPC
-	.get_vbus_level		= &fusb302_tcpm_get_vbus_level,
+	.check_vbus_level	= &fusb302_tcpm_check_vbus_level,
 #endif
 	.select_rp_value	= &fusb302_tcpm_select_rp_value,
 	.set_cc			= &fusb302_tcpm_set_cc,
diff --git a/driver/tcpm/mt6370.c b/driver/tcpm/mt6370.c
index 84ebd0a91e..af11bcb11d 100644
--- a/driver/tcpm/mt6370.c
+++ b/driver/tcpm/mt6370.c
@@ -190,7 +190,7 @@ const struct tcpm_drv mt6370_tcpm_drv = {
 	.release		= &tcpci_tcpm_release,
 	.get_cc			= &mt6370_get_cc,
 #ifdef CONFIG_USB_PD_VBUS_DETECT_TCPC
-	.get_vbus_level		= &tcpci_tcpm_get_vbus_level,
+	.check_vbus_level	= &tcpci_tcpm_check_vbus_level,
 #endif
 	.select_rp_value	= &tcpci_tcpm_select_rp_value,
 	.set_cc			= &mt6370_set_cc,
diff --git a/driver/tcpm/nct38xx.c b/driver/tcpm/nct38xx.c
index 4f9aa6efd7..bf803bf8bb 100644
--- a/driver/tcpm/nct38xx.c
+++ b/driver/tcpm/nct38xx.c
@@ -185,7 +185,7 @@ const struct tcpm_drv nct38xx_tcpm_drv = {
 	.release		= &tcpci_tcpm_release,
 	.get_cc			= &tcpci_tcpm_get_cc,
 #ifdef CONFIG_USB_PD_VBUS_DETECT_TCPC
-	.get_vbus_level		= &tcpci_tcpm_get_vbus_level,
+	.check_vbus_level	= &tcpci_tcpm_check_vbus_level,
 #endif
 	.select_rp_value	= &tcpci_tcpm_select_rp_value,
 	.set_cc			= &tcpci_tcpm_set_cc,
diff --git a/driver/tcpm/ps8xxx.c b/driver/tcpm/ps8xxx.c
index 37371b55ea..78996ba2ca 100644
--- a/driver/tcpm/ps8xxx.c
+++ b/driver/tcpm/ps8xxx.c
@@ -353,7 +353,7 @@ const struct tcpm_drv ps8xxx_tcpm_drv = {
 	.get_cc			= &tcpci_tcpm_get_cc,
 #endif
 #ifdef CONFIG_USB_PD_VBUS_DETECT_TCPC
-	.get_vbus_level		= &tcpci_tcpm_get_vbus_level,
+	.check_vbus_level	= &tcpci_tcpm_check_vbus_level,
 #endif
 	.select_rp_value	= &tcpci_tcpm_select_rp_value,
 	.set_cc			= &tcpci_tcpm_set_cc,
diff --git a/driver/tcpm/raa489000.c b/driver/tcpm/raa489000.c
index 21265c17d2..19e94ee7dc 100644
--- a/driver/tcpm/raa489000.c
+++ b/driver/tcpm/raa489000.c
@@ -177,7 +177,7 @@ const struct tcpm_drv raa489000_tcpm_drv = {
 	.release                = &tcpci_tcpm_release,
 	.get_cc                 = &tcpci_tcpm_get_cc,
 #ifdef CONFIG_USB_PD_VBUS_DETECT_TCPC
-	.get_vbus_level         = &tcpci_tcpm_get_vbus_level,
+	.check_vbus_level       = &tcpci_tcpm_check_vbus_level,
 #endif
 	.select_rp_value        = &tcpci_tcpm_select_rp_value,
 	.set_cc                 = &raa489000_tcpm_set_cc,
diff --git a/driver/tcpm/tcpci.c b/driver/tcpm/tcpci.c
index 97840516a7..742f9c0d37 100644
--- a/driver/tcpm/tcpci.c
+++ b/driver/tcpm/tcpci.c
@@ -634,7 +634,7 @@ void tcpci_tcpc_fast_role_swap_enable(int port, int enable)
 #endif
 
 #ifdef CONFIG_USB_PD_VBUS_DETECT_TCPC
-int tcpci_tcpm_get_vbus_level(int port)
+bool tcpci_tcpm_check_vbus_level(int port, enum vbus_level level)
 {
 	return tcpc_vbus[port];
 }
@@ -1051,18 +1051,19 @@ void tcpci_tcpc_alert(int port)
 		}
 	}
 	if (alert & TCPC_REG_ALERT_POWER_STATUS) {
-		int reg = 0;
+		int pwr_status = 0;
+
 		/* Read Power Status register */
-		tcpci_tcpm_get_power_status(port, &reg);
+		tcpci_tcpm_get_power_status(port, &pwr_status);
 		/* Update VBUS status */
-		tcpc_vbus[port] = reg &
+		tcpc_vbus[port] = pwr_status &
 			TCPC_REG_POWER_STATUS_VBUS_PRES ? 1 : 0;
 #if defined(CONFIG_USB_PD_VBUS_DETECT_TCPC) && defined(CONFIG_USB_CHARGER)
 		/* Update charge manager with new VBUS state */
 		usb_charger_vbus_change(port, tcpc_vbus[port]);
 		pd_event |= TASK_EVENT_WAKE;
 #endif /* CONFIG_USB_PD_VBUS_DETECT_TCPC && CONFIG_USB_CHARGER */
-		if (reg & TCPC_REG_POWER_STATUS_VBUS_DET)
+		if (pwr_status & TCPC_REG_POWER_STATUS_VBUS_DET)
 			board_vbus_present_change();
 	}
 
@@ -1451,7 +1452,7 @@ const struct tcpm_drv tcpci_tcpm_drv = {
 	.release		= &tcpci_tcpm_release,
 	.get_cc			= &tcpci_tcpm_get_cc,
 #ifdef CONFIG_USB_PD_VBUS_DETECT_TCPC
-	.get_vbus_level		= &tcpci_tcpm_get_vbus_level,
+	.check_vbus_level	= &tcpci_tcpm_check_vbus_level,
 #endif
 	.select_rp_value	= &tcpci_tcpm_select_rp_value,
 	.set_cc			= &tcpci_tcpm_set_cc,
diff --git a/driver/tcpm/tcpci.h b/driver/tcpm/tcpci.h
index c3ee70e982..6a05b1aaca 100644
--- a/driver/tcpm/tcpci.h
+++ b/driver/tcpm/tcpci.h
@@ -208,7 +208,7 @@ void tcpci_tcpc_alert(int port);
 int tcpci_tcpm_init(int port);
 int tcpci_tcpm_get_cc(int port, enum tcpc_cc_voltage_status *cc1,
 	enum tcpc_cc_voltage_status *cc2);
-int tcpci_tcpm_get_vbus_level(int port);
+bool tcpci_tcpm_check_vbus_level(int port, enum vbus_level level);
 int tcpci_tcpm_select_rp_value(int port, int rp);
 int tcpci_tcpm_set_cc(int port, int pull);
 int tcpci_tcpm_set_polarity(int port, enum tcpc_cc_polarity polarity);
diff --git a/driver/tcpm/tcpm.h b/driver/tcpm/tcpm.h
index e360811155..c62235eec9 100644
--- a/driver/tcpm/tcpm.h
+++ b/driver/tcpm/tcpm.h
@@ -163,9 +163,9 @@ static inline int tcpm_get_cc(int port, enum tcpc_cc_voltage_status *cc1,
 	return tcpc_config[port].drv->get_cc(port, cc1, cc2);
 }
 
-static inline int tcpm_get_vbus_level(int port)
+static inline bool tcpm_check_vbus_level(int port, enum vbus_level level)
 {
-	return tcpc_config[port].drv->get_vbus_level(port);
+	return tcpc_config[port].drv->check_vbus_level(port, level);
 }
 
 static inline int tcpm_select_rp_value(int port, int rp)
@@ -328,13 +328,14 @@ int tcpm_get_cc(int port, enum tcpc_cc_voltage_status *cc1,
 	enum tcpc_cc_voltage_status *cc2);
 
 /**
- * Read VBUS
+ * Check VBUS level
  *
  * @param port Type-C port number
+ * @param level safe level voltage to check against
  *
- * @return 0 => VBUS not detected, 1 => VBUS detected
+ * @return False => VBUS not at level, True => VBUS at level
  */
-int tcpm_get_vbus_level(int port);
+bool tcpm_check_vbus_level(int port, enum vbus_level level);
 
 /**
  * Set the value of the CC pull-up used when we are a source.
diff --git a/driver/tcpm/tusb422.c b/driver/tcpm/tusb422.c
index db8a9f7c0b..6c26646384 100644
--- a/driver/tcpm/tusb422.c
+++ b/driver/tcpm/tusb422.c
@@ -55,7 +55,7 @@ const struct tcpm_drv tusb422_tcpm_drv = {
 	.release		= &tcpci_tcpm_release,
 	.get_cc			= &tcpci_tcpm_get_cc,
 #ifdef CONFIG_USB_PD_VBUS_DETECT_TCPC
-	.get_vbus_level		= &tcpci_tcpm_get_vbus_level,
+	.check_vbus_level	= &tcpci_tcpm_check_vbus_level,
 #endif
 	.select_rp_value	= &tcpci_tcpm_select_rp_value,
 	.set_cc			= &tcpci_tcpm_set_cc,