Created
October 7, 2014 20:40
-
-
Save ssvb/d8e847311d71deb64d2f to your computer and use it in GitHub Desktop.
0001-HACK-Enable-MUSB-CDC_COMPOSITE-in-sun7i-defconfig.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| From f45b37f97e552654bdd01df7cccff1f1cf2a039d Mon Sep 17 00:00:00 2001 | |
| From: Siarhei Siamashka <siarhei.siamashka@gmail.com> | |
| Date: Tue, 7 Oct 2014 00:09:56 +0300 | |
| Subject: [PATCH] HACK: Enable MUSB & CDC_COMPOSITE in sun7i defconfig | |
| Also change tristate->bool in order to be able to statically | |
| compile CDC_COMPOSITE. | |
| --- | |
| arch/arm/configs/sun7i_defconfig | 28 +++++----------------------- | |
| drivers/usb/musb/Kconfig | 16 ++++++++-------- | |
| 2 files changed, 13 insertions(+), 31 deletions(-) | |
| diff --git a/arch/arm/configs/sun7i_defconfig b/arch/arm/configs/sun7i_defconfig | |
| index 1def585..5f99b7c 100644 | |
| --- a/arch/arm/configs/sun7i_defconfig | |
| +++ b/arch/arm/configs/sun7i_defconfig | |
| @@ -954,6 +954,8 @@ CONFIG_USB_WUSB_CBAF_DEBUG=y | |
| CONFIG_USB_EHCI_HCD=y | |
| CONFIG_USB_EHCI_ROOT_HUB_TT=y | |
| CONFIG_USB_OHCI_HCD=y | |
| +CONFIG_USB_MUSB_HDRC=y | |
| +CONFIG_USB_MUSB_SUNXI=y | |
| CONFIG_USB_PRINTER=m | |
| CONFIG_USB_STORAGE=m | |
| CONFIG_USB_STORAGE_REALTEK=m | |
| @@ -1033,29 +1035,9 @@ CONFIG_USB_TRANCEVIBRATOR=m | |
| CONFIG_USB_IOWARRIOR=m | |
| CONFIG_USB_ISIGHTFW=m | |
| CONFIG_USB_GADGET=y | |
| -CONFIG_USB_AUDIO=m | |
| -CONFIG_USB_ETH=m | |
| -CONFIG_USB_ETH_EEM=y | |
| -CONFIG_USB_G_NCM=m | |
| -CONFIG_USB_GADGETFS=m | |
| -CONFIG_USB_FUNCTIONFS=m | |
| -CONFIG_USB_FUNCTIONFS_ETH=y | |
| -CONFIG_USB_FUNCTIONFS_RNDIS=y | |
| -CONFIG_USB_FUNCTIONFS_GENERIC=y | |
| -CONFIG_USB_MASS_STORAGE=m | |
| -CONFIG_USB_G_SERIAL=m | |
| -CONFIG_USB_MIDI_GADGET=m | |
| -CONFIG_USB_G_PRINTER=m | |
| -CONFIG_USB_CDC_COMPOSITE=m | |
| -CONFIG_USB_G_ACM_MS=m | |
| -CONFIG_USB_G_MULTI=m | |
| -CONFIG_USB_G_MULTI_CDC=y | |
| -CONFIG_USB_G_HID=m | |
| -CONFIG_USB_G_DBGP=m | |
| -CONFIG_USB_G_WEBCAM=m | |
| -CONFIG_USB_SW_SUNXI_USB=y | |
| -CONFIG_USB_SW_SUNXI_USB_MANAGER=y | |
| -CONFIG_USB_SW_SUNXI_USB_DEBUG=y | |
| +CONFIG_USB_GADGET_DEBUG=y | |
| +CONFIG_USB_GADGET_MUSB_HDRC=y | |
| +CONFIG_USB_CDC_COMPOSITE=y | |
| CONFIG_MMC=y | |
| CONFIG_MMC_UNSAFE_RESUME=y | |
| CONFIG_MMC_PARANOID_SD_INIT=y | |
| diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig | |
| index c430c65..65f7d46 100644 | |
| --- a/drivers/usb/musb/Kconfig | |
| +++ b/drivers/usb/musb/Kconfig | |
| @@ -38,34 +38,34 @@ choice | |
| prompt "Platform Glue Layer" | |
| config USB_MUSB_DAVINCI | |
| - tristate "DaVinci" | |
| + bool "DaVinci" | |
| depends on ARCH_DAVINCI_DMx | |
| config USB_MUSB_DA8XX | |
| - tristate "DA8xx/OMAP-L1x" | |
| + bool "DA8xx/OMAP-L1x" | |
| depends on ARCH_DAVINCI_DA8XX | |
| config USB_MUSB_TUSB6010 | |
| - tristate "TUSB6010" | |
| + bool "TUSB6010" | |
| config USB_MUSB_OMAP2PLUS | |
| - tristate "OMAP2430 and onwards" | |
| + bool "OMAP2430 and onwards" | |
| depends on ARCH_OMAP2PLUS | |
| config USB_MUSB_AM35X | |
| - tristate "AM35x" | |
| + bool "AM35x" | |
| depends on ARCH_OMAP | |
| config USB_MUSB_BLACKFIN | |
| - tristate "Blackfin" | |
| + bool "Blackfin" | |
| depends on (BF54x && !BF544) || (BF52x && ! BF522 && !BF523) | |
| config USB_MUSB_UX500 | |
| - tristate "U8500 and U5500" | |
| + bool "U8500 and U5500" | |
| depends on (ARCH_U8500 && AB8500_USB) | |
| config USB_MUSB_SUNXI | |
| - tristate "Allwinner SUN4I/SUN5I/SUN7I" | |
| + bool "Allwinner SUN4I/SUN5I/SUN7I" | |
| select NOP_USB_XCEIV | |
| depends on (ARCH_SUN4I || ARCH_SUN5I || ARCH_SUN7I) | |
| -- | |
| 1.8.3.2 | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment