diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-12-21 09:51:58 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-12-21 09:51:58 +0000 |
| commit | 31e7d57bf0af9a1b9381f2b8ee8ca73599f97af0 (patch) | |
| tree | 2f03ca8c7355af1bb372f32ddc7f2db744ae5770 | |
| parent | 2ba51219c6081bda86ef1f33fd282d10cd33dbc2 (diff) | |
| parent | c95b0a7a3fd9eadc024f425d322381a00fc058bf (diff) | |
| download | eos-android-msm-eos-android13-wear-kr3-pixel-watch.tar.gz | |
Merge cherrypicks of ['partner-android-review.googlesource.com/2692134', 'partner-android-review.googlesource.com/2692135'] into android13-msm-pixelwatch-5.15-24Q1-release.android-wear-13.0.0_r0.14android-wear-13.0.0_r0.12android-msm-eos-android13-wear-kr3-pixel-watchandroid-msm-eos-5.15-tm-wear-kr3-pixel-watch
Change-Id: I2048471841f3c8acfd6d74cbc9e43c0cc1186c41
| -rw-r--r-- | build.config.eos | 1 | ||||
| -rw-r--r-- | dts/google/eos-common.dtsi | 7 |
2 files changed, 8 insertions, 0 deletions
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/soc/msm/wlan_mac 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"; +}; |