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

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

Merge "defconfig: lahaina: Enable USB_BAM and USB_F_QDSS for GKI"

parents f0921de7 1740dedf

arch/arm64/configs/vendor/lahaina_GKI.config

+2 −1
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ CONFIG_USB_CONFIGFS_F_DIAG=m 
CONFIG_USB_CONFIGFS_F_CCID=m

CONFIG_USB_CONFIGFS_F_CDEV=m

CONFIG_USB_CONFIGFS_F_GSI=m

CONFIG_USB_CONFIGFS_F_QDSS=m

CONFIG_USB_CONFIGFS_F_UAC2=m

CONFIG_USB_STORAGE=m

CONFIG_TYPEC_UCSI=m
@@ -216,7 +217,7 @@ CONFIG_TOUCHSCREEN_ATMEL_MXT=m 
CONFIG_SPS=m

CONFIG_SPS_SUPPORT_NDP_BAM=y

# CONFIG_SPS_SUPPORT_BAMDMA is not set

# CONFIG_USB_BAM is not set

CONFIG_USB_BAM=m

CONFIG_UTS_NS=y

CONFIG_HH_IRQ_LEND=m

CONFIG_SM_GCC_SHIMA=m

arch/arm64/configs/vendor/lahaina_QGKI.config

+0 −2
Original line number Diff line number Diff line
@@ -127,8 +127,6 @@ CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=10000 
CONFIG_SPS=y

# CONFIG_SPS_SUPPORT_BAMDMA is not set

CONFIG_SPS_SUPPORT_NDP_BAM=y

CONFIG_USB_BAM=y

CONFIG_USB_CONFIGFS_F_QDSS=y

CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y

CONFIG_CRYPTO_DEV_QCOM_MSM_QCE=y

CONFIG_CRYPTO_DEV_QCRYPTO=y

drivers/usb/gadget/function/f_qdss.c

+3 −6
Original line number Diff line number Diff line
@@ -402,8 +402,7 @@ static int qdss_bind(struct usb_configuration *c, struct usb_function *f) 
	if (!strcmp(qdss->ch.name, USB_QDSS_CH_MDM))

		qdss_data_ep_comp_desc.bMaxBurst = 0;



	ep = usb_ep_autoconfig_ss(gadget, &qdss_ss_data_desc,

		&qdss_data_ep_comp_desc);

	ep = usb_ep_autoconfig(gadget, &qdss_ss_data_desc);

	if (!ep) {

		pr_err("%s: ep_autoconfig error\n", __func__);

		goto clear_ep;
@@ -415,8 +414,7 @@ static int qdss_bind(struct usb_configuration *c, struct usb_function *f) 
		msm_ep_set_endless(qdss->port.data, true);



	if (qdss->debug_inface_enabled) {

		ep = usb_ep_autoconfig_ss(gadget, &qdss_ss_ctrl_in_desc,

			&qdss_ctrl_in_ep_comp_desc);

		ep = usb_ep_autoconfig(gadget, &qdss_ss_ctrl_in_desc);

		if (!ep) {

			pr_err("%s: ep_autoconfig error\n", __func__);

			goto clear_ep;
@@ -425,8 +423,7 @@ static int qdss_bind(struct usb_configuration *c, struct usb_function *f) 
		qdss->port.ctrl_in = ep;

		ep->driver_data = qdss;



		ep = usb_ep_autoconfig_ss(gadget, &qdss_ss_ctrl_out_desc,

			&qdss_ctrl_out_ep_comp_desc);

		ep = usb_ep_autoconfig(gadget, &qdss_ss_ctrl_out_desc);

		if (!ep) {

			pr_err("%s: ep_autoconfig error\n", __func__);

			goto clear_ep;