xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
qctecmdr
2020-09-14 20:12:26 -07:00
committed by Gerrit - the friendly Code Review server
parent f0921de704 1740dedfc2
commit 158801d1ab
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm64/configs/vendor/lahaina_GKI.config vendored
View File

@@ -39,6 +39,7 @@ CONFIG_USB_CONFIGFS_F_DIAG=m
CONFIG_USB_CONFIGFS_F_CCID=m CONFIG_USB_CONFIGFS_F_CCID=m
CONFIG_USB_CONFIGFS_F_CDEV=m CONFIG_USB_CONFIGFS_F_CDEV=m
CONFIG_USB_CONFIGFS_F_GSI=m CONFIG_USB_CONFIGFS_F_GSI=m
CONFIG_USB_CONFIGFS_F_QDSS=m
CONFIG_USB_CONFIGFS_F_UAC2=m CONFIG_USB_CONFIGFS_F_UAC2=m
CONFIG_USB_STORAGE=m CONFIG_USB_STORAGE=m
CONFIG_TYPEC_UCSI=m CONFIG_TYPEC_UCSI=m
@@ -216,7 +217,7 @@ CONFIG_TOUCHSCREEN_ATMEL_MXT=m
CONFIG_SPS=m CONFIG_SPS=m
CONFIG_SPS_SUPPORT_NDP_BAM=y CONFIG_SPS_SUPPORT_NDP_BAM=y
# CONFIG_SPS_SUPPORT_BAMDMA is not set # CONFIG_SPS_SUPPORT_BAMDMA is not set
# CONFIG_USB_BAM is not set CONFIG_USB_BAM=m
CONFIG_UTS_NS=y CONFIG_UTS_NS=y
CONFIG_HH_IRQ_LEND=m CONFIG_HH_IRQ_LEND=m
CONFIG_SM_GCC_SHIMA=m CONFIG_SM_GCC_SHIMA=m

2
arch/arm64/configs/vendor/lahaina_QGKI.config vendored
View File

@@ -127,8 +127,6 @@ CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=10000
CONFIG_SPS=y CONFIG_SPS=y
# CONFIG_SPS_SUPPORT_BAMDMA is not set # CONFIG_SPS_SUPPORT_BAMDMA is not set
CONFIG_SPS_SUPPORT_NDP_BAM=y CONFIG_SPS_SUPPORT_NDP_BAM=y
CONFIG_USB_BAM=y
CONFIG_USB_CONFIGFS_F_QDSS=y
CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
CONFIG_CRYPTO_DEV_QCOM_MSM_QCE=y CONFIG_CRYPTO_DEV_QCOM_MSM_QCE=y
CONFIG_CRYPTO_DEV_QCRYPTO=y CONFIG_CRYPTO_DEV_QCRYPTO=y

9
drivers/usb/gadget/function/f_qdss.c
View File

@@ -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)) if (!strcmp(qdss->ch.name, USB_QDSS_CH_MDM))
qdss_data_ep_comp_desc.bMaxBurst = 0; qdss_data_ep_comp_desc.bMaxBurst = 0;
ep = usb_ep_autoconfig_ss(gadget, &qdss_ss_data_desc, ep = usb_ep_autoconfig(gadget, &qdss_ss_data_desc);
&qdss_data_ep_comp_desc);
if (!ep) { if (!ep) {
pr_err("%s: ep_autoconfig error\n", __func__); pr_err("%s: ep_autoconfig error\n", __func__);
goto clear_ep; 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); msm_ep_set_endless(qdss->port.data, true);
if (qdss->debug_inface_enabled) { if (qdss->debug_inface_enabled) {
ep = usb_ep_autoconfig_ss(gadget, &qdss_ss_ctrl_in_desc, ep = usb_ep_autoconfig(gadget, &qdss_ss_ctrl_in_desc);
&qdss_ctrl_in_ep_comp_desc);
if (!ep) { if (!ep) {
pr_err("%s: ep_autoconfig error\n", __func__); pr_err("%s: ep_autoconfig error\n", __func__);
goto clear_ep; goto clear_ep;
@@ -425,8 +423,7 @@ static int qdss_bind(struct usb_configuration *c, struct usb_function *f)
qdss->port.ctrl_in = ep; qdss->port.ctrl_in = ep;
ep->driver_data = qdss; ep->driver_data = qdss;
ep = usb_ep_autoconfig_ss(gadget, &qdss_ss_ctrl_out_desc, ep = usb_ep_autoconfig(gadget, &qdss_ss_ctrl_out_desc);
&qdss_ctrl_out_ep_comp_desc);
if (!ep) { if (!ep) {
pr_err("%s: ep_autoconfig error\n", __func__); pr_err("%s: ep_autoconfig error\n", __func__);
goto clear_ep; goto clear_ep;