Skip to content

Commit 94f5311

Browse files
authored
Merge pull request #1 from Kethen/gloria-20231218-dwc
make a few usb drivers available for storage probing
2 parents 22d83b3 + 791f6e3 commit 94f5311

1 file changed

Lines changed: 20 additions & 20 deletions

File tree

arch/x86/configs/android-x86_64_defconfig

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7471,7 +7471,7 @@ CONFIG_USB_STORAGE_ONETOUCH=y
74717471
CONFIG_USB_STORAGE_KARMA=m
74727472
CONFIG_USB_STORAGE_CYPRESS_ATACB=y
74737473
CONFIG_USB_STORAGE_ENE_UB6250=y
7474-
CONFIG_USB_UAS=m
7474+
CONFIG_USB_UAS=y
74757475

74767476
#
74777477
# USB Imaging devices
@@ -7487,7 +7487,7 @@ CONFIG_USBIP_HOST=m
74877487
# CONFIG_USBIP_DEBUG is not set
74887488
# CONFIG_USB_CDNS_SUPPORT is not set
74897489
# CONFIG_USB_MUSB_HDRC is not set
7490-
CONFIG_USB_DWC3=m
7490+
CONFIG_USB_DWC3=y
74917491
CONFIG_USB_DWC3_ULPI=y
74927492
# CONFIG_USB_DWC3_HOST is not set
74937493
# CONFIG_USB_DWC3_GADGET is not set
@@ -7496,18 +7496,18 @@ CONFIG_USB_DWC3_DUAL_ROLE=y
74967496
#
74977497
# Platform Glue Driver Support
74987498
#
7499-
CONFIG_USB_DWC3_PCI=m
7500-
CONFIG_USB_DWC3_HAPS=m
7501-
CONFIG_USB_DWC3_OF_SIMPLE=m
7502-
CONFIG_USB_DWC2=m
7499+
CONFIG_USB_DWC3_PCI=y
7500+
CONFIG_USB_DWC3_HAPS=y
7501+
CONFIG_USB_DWC3_OF_SIMPLE=y
7502+
CONFIG_USB_DWC2=y
75037503
# CONFIG_USB_DWC2_HOST is not set
75047504

75057505
#
75067506
# Gadget/Dual-role mode requires USB Gadget support to be enabled
75077507
#
75087508
# CONFIG_USB_DWC2_PERIPHERAL is not set
75097509
CONFIG_USB_DWC2_DUAL_ROLE=y
7510-
CONFIG_USB_DWC2_PCI=m
7510+
CONFIG_USB_DWC2_PCI=y
75117511
# CONFIG_USB_DWC2_DEBUG is not set
75127512
# CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set
75137513
# CONFIG_USB_CHIPIDEA is not set
@@ -7615,7 +7615,7 @@ CONFIG_NOP_USB_XCEIV=m
76157615
# CONFIG_USB_ISP1301 is not set
76167616
# end of USB Physical Layer drivers
76177617

7618-
CONFIG_USB_GADGET=m
7618+
CONFIG_USB_GADGET=y
76197619
# CONFIG_USB_GADGET_DEBUG is not set
76207620
CONFIG_USB_GADGET_DEBUG_FILES=y
76217621
CONFIG_USB_GADGET_DEBUG_FS=y
@@ -7725,23 +7725,23 @@ CONFIG_USB_G_WEBCAM=m
77257725
CONFIG_USB_RAW_GADGET=m
77267726
# end of USB Gadget precomposed configurations
77277727

7728-
CONFIG_TYPEC=m
7729-
CONFIG_TYPEC_TCPM=m
7730-
CONFIG_TYPEC_TCPCI=m
7731-
CONFIG_TYPEC_RT1711H=m
7728+
CONFIG_TYPEC=y
7729+
CONFIG_TYPEC_TCPM=y
7730+
CONFIG_TYPEC_TCPCI=y
7731+
CONFIG_TYPEC_RT1711H=y
77327732
# CONFIG_TYPEC_MT6360 is not set
77337733
# CONFIG_TYPEC_TCPCI_MT6370 is not set
7734-
CONFIG_TYPEC_TCPCI_MAXIM=m
7735-
CONFIG_TYPEC_FUSB302=m
7736-
CONFIG_TYPEC_UCSI=m
7737-
CONFIG_UCSI_CCG=m
7738-
CONFIG_UCSI_ACPI=m
7734+
CONFIG_TYPEC_TCPCI_MAXIM=y
7735+
CONFIG_TYPEC_FUSB302=y
7736+
CONFIG_TYPEC_UCSI=y
7737+
CONFIG_UCSI_CCG=y
7738+
CONFIG_UCSI_ACPI=y
77397739
# CONFIG_UCSI_STM32G0 is not set
7740-
CONFIG_TYPEC_TPS6598X=m
7740+
CONFIG_TYPEC_TPS6598X=y
77417741
# CONFIG_TYPEC_ANX7411 is not set
77427742
# CONFIG_TYPEC_RT1719 is not set
7743-
CONFIG_TYPEC_HD3SS3220=m
7744-
CONFIG_TYPEC_STUSB160X=m
7743+
CONFIG_TYPEC_HD3SS3220=y
7744+
CONFIG_TYPEC_STUSB160X=y
77457745
# CONFIG_TYPEC_WUSB3801 is not set
77467746

77477747
#

0 commit comments

Comments
 (0)