diff options
author | Olof Johansson <olof@lixom.net> | 2016-12-07 12:35:06 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2016-12-07 12:35:06 -0800 |
commit | 9f793ef32fc6bf8ae8ca49e3adcdca7143553b58 (patch) | |
tree | d1db2a984a4922544a1dada1fa98d5557a6701af /arch/arm/configs/davinci_all_defconfig | |
parent | b1dbf794b97716576e7dbad8d299bd4bb54c6a71 (diff) | |
parent | 47d03e48efa572109229aec9436948d92f44b689 (diff) |
Merge tag 'davinci-for-v4.10/defconfig-4' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/defconfig
Enable support for MUSB based USB OTG on DA850.
* tag 'davinci-for-v4.10/defconfig-4' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
ARM: davinci_all_defconfig: Enable da8xx usb otg
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs/davinci_all_defconfig')
-rw-r--r-- | arch/arm/configs/davinci_all_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/davinci_all_defconfig b/arch/arm/configs/davinci_all_defconfig index 0472eaa41748..8806754f7175 100644 --- a/arch/arm/configs/davinci_all_defconfig +++ b/arch/arm/configs/davinci_all_defconfig @@ -161,8 +161,10 @@ CONFIG_USB_MON=m CONFIG_USB_OHCI_HCD=m CONFIG_USB_STORAGE=m CONFIG_USB_MUSB_HDRC=m +CONFIG_USB_MUSB_DA8XX=m CONFIG_MUSB_PIO_ONLY=y CONFIG_USB_TEST=m +CONFIG_NOP_USB_XCEIV=m CONFIG_USB_GADGET=m CONFIG_USB_GADGET_DEBUG_FILES=y CONFIG_USB_GADGET_DEBUG_FS=y |