summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSue Chen <sue.chen@quanta.corp-partner.google.com>2021-08-24 17:22:13 +0800
committerCommit Bot <commit-bot@chromium.org>2021-08-27 15:06:12 +0000
commit5df9a840bca8bd9cc9bb0b0131a23046760ac4d4 (patch)
treed4c3b3150cc51bbfe15014770ea62c20b177470a
parent8b25b53ed917fa93bd496e5839fc1c69d9ef4728 (diff)
downloadchrome-ec-5df9a840bca8bd9cc9bb0b0131a23046760ac4d4.tar.gz
Tomato: read C1 VBUS voltage from rt1718s
For ADC_VBUS only for C0 VBUS voltage, C1 VBUS voltage should be read from rt1718s internal VBUS ADC. BUG=b:196001868 BRANCH=none TEST=show correct C1 vbus voltage on tomato Signed-off-by: Sue Chen <sue.chen@quanta.corp-partner.google.com> Change-Id: I6c90386e083a480ffaeacd7739d4ddebe0bd8e1e Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3114326 Commit-Queue: Ting Shen <phoenixshen@chromium.org> Reviewed-by: Ting Shen <phoenixshen@chromium.org>
-rw-r--r--baseboard/cherry/baseboard.c18
-rw-r--r--baseboard/cherry/baseboard.h1
2 files changed, 19 insertions, 0 deletions
diff --git a/baseboard/cherry/baseboard.c b/baseboard/cherry/baseboard.c
index d6ccab1fab..36f6adb1f8 100644
--- a/baseboard/cherry/baseboard.c
+++ b/baseboard/cherry/baseboard.c
@@ -629,3 +629,21 @@ __override int board_pd_set_frs_enable(int port, int enable)
/* Use write instead of update to save 1 i2c read in FRS path */
return rt1718s_write8(port, RT1718S_GPIO3_CTRL, value);
}
+
+__override int board_get_vbus_voltage(int port)
+{
+ int voltage = 0;
+
+ switch (port) {
+ case 0:
+ voltage = adc_read_channel(ADC_VBUS);
+ break;
+ case 1:
+ rt1718s_get_adc(port, RT1718S_ADC_VBUS1, &voltage);
+ break;
+ default:
+ return 0;
+ }
+
+ return voltage;
+}
diff --git a/baseboard/cherry/baseboard.h b/baseboard/cherry/baseboard.h
index 21ad6a5e5c..05292fa851 100644
--- a/baseboard/cherry/baseboard.h
+++ b/baseboard/cherry/baseboard.h
@@ -148,6 +148,7 @@
#define CONFIG_USB_PD_TCPMV2
#define CONFIG_USB_PD_TRY_SRC
#define CONFIG_USB_PD_VBUS_DETECT_PPC
+#define CONFIG_USB_PD_VBUS_MEASURE_BY_BOARD
#define CONFIG_USB_PID 0x5054
#define CONFIG_USB_POWER_DELIVERY