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

Commit 15b0454d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: msm: Enable USB on msm8953 32bit"

parents 5862240a 8f20ee46

arch/arm/configs/msm8953-perf_defconfig

+42 −0
Original line number Original line Diff line number Diff line
@@ -352,6 +352,7 @@ CONFIG_LOGO=y 
CONFIG_SOUND=y

CONFIG_SOUND=y

CONFIG_SND=y

CONFIG_SND=y

CONFIG_SND_DYNAMIC_MINORS=y

CONFIG_SND_DYNAMIC_MINORS=y

CONFIG_SND_USB_AUDIO=y

CONFIG_SND_SOC=y

CONFIG_SND_SOC=y

CONFIG_UHID=y

CONFIG_UHID=y

CONFIG_HID_APPLE=y

CONFIG_HID_APPLE=y
@@ -359,7 +360,33 @@ CONFIG_HID_ELECOM=y 
CONFIG_HID_MAGICMOUSE=y

CONFIG_HID_MAGICMOUSE=y

CONFIG_HID_MICROSOFT=y

CONFIG_HID_MICROSOFT=y

CONFIG_HID_MULTITOUCH=y

CONFIG_HID_MULTITOUCH=y

CONFIG_USB_HIDDEV=y

CONFIG_USB=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

CONFIG_USB_MON=y

CONFIG_USB_XHCI_HCD=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_HCD_PLATFORM=y

CONFIG_USB_OHCI_HCD=y

CONFIG_USB_OHCI_HCD_PLATFORM=y

CONFIG_USB_ACM=y

CONFIG_USB_STORAGE=y

CONFIG_USB_STORAGE_DATAFAB=y

CONFIG_USB_STORAGE_FREECOM=y

CONFIG_USB_STORAGE_ISD200=y

CONFIG_USB_STORAGE_USBAT=y

CONFIG_USB_STORAGE_SDDR09=y

CONFIG_USB_STORAGE_SDDR55=y

CONFIG_USB_STORAGE_JUMPSHOT=y

CONFIG_USB_STORAGE_ALAUDA=y

CONFIG_USB_STORAGE_ONETOUCH=y

CONFIG_USB_STORAGE_KARMA=y

CONFIG_USB_STORAGE_CYPRESS_ATACB=y

CONFIG_USB_DWC3=y

CONFIG_USB_DWC3=y

CONFIG_USB_DWC3_GADGET=y

CONFIG_USB_DWC3_MSM=y

CONFIG_USB_SERIAL=y

CONFIG_USB_EHSET_TEST_FIXTURE=y

CONFIG_NOP_USB_XCEIV=y

CONFIG_NOP_USB_XCEIV=y

CONFIG_DUAL_ROLE_USB_INTF=y

CONFIG_DUAL_ROLE_USB_INTF=y

CONFIG_USB_MSM_SSPHY_QMP=y

CONFIG_USB_MSM_SSPHY_QMP=y
@@ -368,6 +395,21 @@ CONFIG_USB_GADGET=y 
CONFIG_USB_GADGET_DEBUG_FILES=y

CONFIG_USB_GADGET_DEBUG_FILES=y

CONFIG_USB_GADGET_DEBUG_FS=y

CONFIG_USB_GADGET_DEBUG_FS=y

CONFIG_USB_GADGET_VBUS_DRAW=500

CONFIG_USB_GADGET_VBUS_DRAW=500

CONFIG_USB_CONFIGFS=y

CONFIG_USB_CONFIGFS_SERIAL=y

CONFIG_USB_CONFIGFS_NCM=y

CONFIG_USB_CONFIGFS_QCRNDIS=y

CONFIG_USB_CONFIGFS_RMNET_BAM=y

CONFIG_USB_CONFIGFS_MASS_STORAGE=y

CONFIG_USB_CONFIGFS_F_FS=y

CONFIG_USB_CONFIGFS_F_MTP=y

CONFIG_USB_CONFIGFS_F_PTP=y

CONFIG_USB_CONFIGFS_F_ACC=y

CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y

CONFIG_USB_CONFIGFS_UEVENT=y

CONFIG_USB_CONFIGFS_F_HID=y

CONFIG_USB_CONFIGFS_F_DIAG=y

CONFIG_USB_CONFIGFS_F_QDSS=y

CONFIG_MMC=y

CONFIG_MMC=y

CONFIG_MMC_PERF_PROFILING=y

CONFIG_MMC_PERF_PROFILING=y

CONFIG_MMC_PARANOID_SD_INIT=y

CONFIG_MMC_PARANOID_SD_INIT=y

arch/arm/configs/msm8953_defconfig

+42 −0
Original line number Original line Diff line number Diff line
@@ -363,6 +363,7 @@ CONFIG_LOGO=y 
CONFIG_SOUND=y

CONFIG_SOUND=y

CONFIG_SND=y

CONFIG_SND=y

CONFIG_SND_DYNAMIC_MINORS=y

CONFIG_SND_DYNAMIC_MINORS=y

CONFIG_SND_USB_AUDIO=y

CONFIG_SND_SOC=y

CONFIG_SND_SOC=y

CONFIG_UHID=y

CONFIG_UHID=y

CONFIG_HID_APPLE=y

CONFIG_HID_APPLE=y
@@ -370,7 +371,33 @@ CONFIG_HID_ELECOM=y 
CONFIG_HID_MAGICMOUSE=y

CONFIG_HID_MAGICMOUSE=y

CONFIG_HID_MICROSOFT=y

CONFIG_HID_MICROSOFT=y

CONFIG_HID_MULTITOUCH=y

CONFIG_HID_MULTITOUCH=y

CONFIG_USB_HIDDEV=y

CONFIG_USB=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

CONFIG_USB_MON=y

CONFIG_USB_XHCI_HCD=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_HCD_PLATFORM=y

CONFIG_USB_OHCI_HCD=y

CONFIG_USB_OHCI_HCD_PLATFORM=y

CONFIG_USB_ACM=y

CONFIG_USB_STORAGE=y

CONFIG_USB_STORAGE_DATAFAB=y

CONFIG_USB_STORAGE_FREECOM=y

CONFIG_USB_STORAGE_ISD200=y

CONFIG_USB_STORAGE_USBAT=y

CONFIG_USB_STORAGE_SDDR09=y

CONFIG_USB_STORAGE_SDDR55=y

CONFIG_USB_STORAGE_JUMPSHOT=y

CONFIG_USB_STORAGE_ALAUDA=y

CONFIG_USB_STORAGE_ONETOUCH=y

CONFIG_USB_STORAGE_KARMA=y

CONFIG_USB_STORAGE_CYPRESS_ATACB=y

CONFIG_USB_DWC3=y

CONFIG_USB_DWC3=y

CONFIG_USB_DWC3_GADGET=y

CONFIG_USB_DWC3_MSM=y

CONFIG_USB_SERIAL=y

CONFIG_USB_EHSET_TEST_FIXTURE=y

CONFIG_NOP_USB_XCEIV=y

CONFIG_NOP_USB_XCEIV=y

CONFIG_DUAL_ROLE_USB_INTF=y

CONFIG_DUAL_ROLE_USB_INTF=y

CONFIG_USB_MSM_SSPHY_QMP=y

CONFIG_USB_MSM_SSPHY_QMP=y
@@ -379,6 +406,21 @@ CONFIG_USB_GADGET=y 
CONFIG_USB_GADGET_DEBUG_FILES=y

CONFIG_USB_GADGET_DEBUG_FILES=y

CONFIG_USB_GADGET_DEBUG_FS=y

CONFIG_USB_GADGET_DEBUG_FS=y

CONFIG_USB_GADGET_VBUS_DRAW=500

CONFIG_USB_GADGET_VBUS_DRAW=500

CONFIG_USB_CONFIGFS=y

CONFIG_USB_CONFIGFS_SERIAL=y

CONFIG_USB_CONFIGFS_NCM=y

CONFIG_USB_CONFIGFS_QCRNDIS=y

CONFIG_USB_CONFIGFS_RMNET_BAM=y

CONFIG_USB_CONFIGFS_MASS_STORAGE=y

CONFIG_USB_CONFIGFS_F_FS=y

CONFIG_USB_CONFIGFS_F_MTP=y

CONFIG_USB_CONFIGFS_F_PTP=y

CONFIG_USB_CONFIGFS_F_ACC=y

CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y

CONFIG_USB_CONFIGFS_UEVENT=y

CONFIG_USB_CONFIGFS_F_HID=y

CONFIG_USB_CONFIGFS_F_DIAG=y

CONFIG_USB_CONFIGFS_F_QDSS=y

CONFIG_MMC=y

CONFIG_MMC=y

CONFIG_MMC_PERF_PROFILING=y

CONFIG_MMC_PERF_PROFILING=y

CONFIG_MMC_RING_BUFFER=y

CONFIG_MMC_RING_BUFFER=y