Merge cherrypicks of ['partner-android-review.googlesource.com/2692134', 'partner-android-review.googlesource.com/2692135'] into android13-msm-pixelwatch-5.15-24Q1-release.
Change-Id: I2048471841f3c8acfd6d74cbc9e43c0cc1186c41
diff --git a/build.config.eos b/build.config.eos
index 8dc8a26..5fcc1f6 100644
--- a/build.config.eos
+++ b/build.config.eos
@@ -54,4 +54,5 @@
private/google-modules/sound/mcu_mic_codec
private/google-modules/nfc/nxp/snxxx
private/google-modules/touch/novatek/nt38350
+private/google-modules/soc/msm/drivers/power/supply/google
"
diff --git a/dts/google/eos-common.dtsi b/dts/google/eos-common.dtsi
index 42ce7f9..e21afea 100644
--- a/dts/google/eos-common.dtsi
+++ b/dts/google/eos-common.dtsi
@@ -106,6 +106,9 @@
/* Always charge on SDP by ignoring ICL requests from USB stack */
google,sdp-icl-req-ignored;
+
+ /* Enable HVDCP3 (QC3) charger detection */
+ google,hvdcp3-detect-en;
};
&pm5100_qbg {
@@ -115,3 +118,7 @@
&extcon_usb_shim {
usb-gate-supported;
};
+
+&google_hvdcp {
+ status = "okay";
+};
