github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-31 11:37:06 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Merge "wcd939x-usbss: Add support for WCD_USBSS_HSJ_CONNECT in the wcd939x i2c driver"

Browse Source
This commit is contained in:
qctecmdr 2022-11-22 11:43:25 -08:00 committed by Gerrit - the friendly Code Review server
commit 9ae5566f8a
4 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
android/abi_gki_aarch64_qcom
View File

@ -1727,6 +1727,7 @@
regmap_write
regulator_allow_bypass
regulator_bulk_disable
regulator_bulk_enable
regulator_count_voltages
regulator_disable
regulator_disable_regmap

1
arch/arm64/configs/vendor/pineapple_GKI.config vendored
View File

@ -153,6 +153,7 @@ CONFIG_QCOM_SPSS=m
CONFIG_QCOM_STATS=m
CONFIG_QCOM_TSENS=m
CONFIG_QCOM_VADC_COMMON=m
CONFIG_QCOM_WCD_USBSS_I2C=m
# CONFIG_QCOM_WCNSS_PIL is not set
CONFIG_QRTR=m
CONFIG_QRTR_SMD=m

8
drivers/soc/qcom/wcd939x-i2c.c
View File

@ -341,6 +341,14 @@ int wcd_usbss_switch_update(enum wcd_usbss_cable_types ctype,
regmap_update_bits_base(wcd_usbss_ctxt_->regmap,
WCD_USBSS_AUDIO_FSM_START, 0x01, 0x01, NULL, false, true);
break;
case WCD_USBSS_HSJ_CONNECT:
/* Select MG2, GSBU1 */
regmap_update_bits(wcd_usbss_ctxt_->regmap,
WCD_USBSS_SWITCH_SELECT0, 0x03, 0x1);
/* Enable SENSE, MIC, AGND switches */
regmap_update_bits(wcd_usbss_ctxt_->regmap,
WCD_USBSS_SWITCH_SETTINGS_ENABLE, 0x07, 0x07);
break;
case WCD_USBSS_DP_AUX_CC1:
fallthrough;
case WCD_USBSS_DP_AUX_CC2:

1
include/linux/soc/qcom/wcd939x-i2c.h
View File

@ -15,6 +15,7 @@ enum wcd_usbss_cable_types {
WCD_USBSS_DP_AUX_CC2,
WCD_USBSS_AATC,
WCD_USBSS_GND_MIC_SWAP_AATC,
WCD_USBSS_HSJ_CONNECT,
};
enum wcd_usbss_cable_status {