Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98161b4f authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ABI: Disable USB_ROLE_SWITCH and TYPEC in GKI"

parents 60c110ac 8fb9c688

android/abi_gki_aarch64_261a54f37d.xml

+68350 −67308

File changed.

Preview size limit exceeded, changes collapsed.

android/abi_gki_aarch64_qcom

+2 −0
Original line number Diff line number Diff line
@@ -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

arch/arm64/configs/vendor/holi_GKI.config

+0 −2
Original line number Diff line number Diff line
@@ -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

arch/arm64/configs/vendor/lahaina_GKI.config

+0 −1
Original line number Diff line number Diff line
@@ -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

drivers/soc/qcom/icnss2/main.c

+2 −1
Original line number Diff line number Diff line
@@ -1644,12 +1644,13 @@ static int icnss_service_notifier_notify(struct notifier_block *nb, 
		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);

	icnss_driver_event_post(priv, ICNSS_DRIVER_EVENT_PD_SERVICE_DOWN,