Merge "ABI: Disable USB_ROLE_SWITCH and TYPEC in GKI"

This commit is contained in:
qctecmdr 2020-08-06 00:53:19 -07:00 • committed by Gerrit - the friendly Code Review server
commit 98161b4faa
5 changed files with 68354 additions and 67312 deletions

File diff suppressed because it is too large Load diff

View file

@ -2580,6 +2580,8 @@
usb_remove_phy
usb_reset_device
usb_reset_endpoint
usb_role_switch_get
usb_role_switch_put
usb_role_switch_register
usb_role_switch_set_role
usb_role_switch_unregister

View file

@ -30,7 +30,6 @@ CONFIG_USB_DWC3_MSM=m
CONFIG_USB_EHSET_TEST_FIXTURE=m
CONFIG_USB_LINK_LAYER_TEST=m
CONFIG_USB_CONFIGFS_F_DIAG=m
CONFIG_TYPEC=m
CONFIG_SDCARD_FS=m
CONFIG_TYPEC_UCSI=m
CONFIG_INTERCONNECT_QCOM=m
@ -118,7 +117,6 @@ CONFIG_VIDEO_MEM2MEM_DEINTERLACE=y
# CONFIG_SLIMBUS_MSM_CTRL is not set
# CONFIG_SLIMBUS_MSM_NGD is not set
CONFIG_QSEECOM=m
CONFIG_USB_ROLE_SWITCH=m
# CONFIG_QCOM_MINIDUMP is not set
CONFIG_QCOM_EUD=m
CONFIG_MSM_RPM_SMD=m

View file

@ -181,7 +181,6 @@ CONFIG_QSEECOM=m
CONFIG_QCOM_SMCINVOKE=m
CONFIG_HDCP_QSEECOM=m
CONFIG_HW_RANDOM_MSM_LEGACY=m
CONFIG_USB_ROLE_SWITCH=m
CONFIG_MHI_BUS=m
CONFIG_MHI_UCI=m
CONFIG_PCI_MSM=m

View file

@ -1644,11 +1644,12 @@ event_post:
set_bit(ICNSS_FW_DOWN, &priv->state);
icnss_ignore_fw_timeout(true);
if (test_bit(ICNSS_FW_READY, &priv->state))
if (test_bit(ICNSS_FW_READY, &priv->state)) {
fw_down_data.crashed = event_data->crashed;
icnss_call_driver_uevent(priv,
ICNSS_UEVENT_FW_DOWN,
&fw_down_data);
}
}
clear_bit(ICNSS_HOST_TRIGGERED_PDR, &priv->state);