LINARO: CONFIG: Enable MUSB_HDRC and relevant gadget configs

BugLink: https://bugs.launchpad.net/linux-linaro/+bug/730698

Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@linaro.org>

4 files changed, 20 insertions, 3 deletions

diff --git a/debian.linaro/changelog b/debian.linaro/changelog
index dff77b70324..63a5377c5a1 100644
--- a/debian.linaro/changelog
+++ b/debian.linaro/changelog
@@ -4,10 +4,16 @@ linux-linaro (3.1.0-4.4) UNRELEASED; urgency=low
   CHANGELOG: Use the printchanges target to see the curent changes.
   CHANGELOG: Use the insertchanges target to create the final log.
 
-  * Bump abi
+  [ Dave Martin ]
+ 
   * CONFIG: Make sound configs builtin in vexpress
     LP: #862626
 
+  [ Ricardo Salveti ]
+
+  * CONFIG: Enable MUSB_HDRC and relevant gadget configs
+    LP: #730698
+
  -- John Rigby <john.rigby@linaro.org>  Mon, 21 Nov 2011 08:29:27 -0700
 
 linux-linaro (3.1.0-3.3) precise; urgency=low
diff --git a/debian.linaro/config/armel/config.flavour.linaro-omap b/debian.linaro/config/armel/config.flavour.linaro-omap
index caa4791c14c..3b9015de1d1 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-omap
+++ b/debian.linaro/config/armel/config.flavour.linaro-omap
@@ -28,6 +28,7 @@ CONFIG_MFD_CORE=y
 CONFIG_MFD_TWL4030_AUDIO=y
 CONFIG_MMC_UNSAFE_RESUME=y
 # CONFIG_MTD_ARM_INTEGRATOR is not set
+# CONFIG_MUSB_PIO_ONLY is not set
 CONFIG_NOP_USB_XCEIV=y
 CONFIG_NR_CPUS=2
 CONFIG_PL310_ERRATA_588369=y
diff --git a/debian.linaro/config/armel/config.flavour.linaro-vexpress b/debian.linaro/config/armel/config.flavour.linaro-vexpress
index 04be6344c18..f5b897e01e5 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-vexpress
+++ b/debian.linaro/config/armel/config.flavour.linaro-vexpress
@@ -28,6 +28,7 @@ CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
 # CONFIG_MFD_TWL4030_AUDIO is not set
 # CONFIG_MMC_UNSAFE_RESUME is not set
 CONFIG_MTD_ARM_INTEGRATOR=y
+CONFIG_MUSB_PIO_ONLY=y
 # CONFIG_NOP_USB_XCEIV is not set
 CONFIG_NR_CPUS=4
 # CONFIG_PL310_ERRATA_588369 is not set
diff --git a/debian.linaro/config/config.common.ubuntu b/debian.linaro/config/config.common.ubuntu
index 8cf385aebcf..fc18128405c 100644
--- a/debian.linaro/config/config.common.ubuntu
+++ b/debian.linaro/config/config.common.ubuntu
@@ -2059,7 +2059,9 @@ CONFIG_USB_EHCI_TT_NEWSCHED=y
 # CONFIG_USB_EMI26 is not set
 # CONFIG_USB_EMI62 is not set
 CONFIG_USB_EPSON2888=y
-# CONFIG_USB_ETH is not set
+CONFIG_USB_ETH=m
+# CONFIG_USB_ETH_EEM is not set
+CONFIG_USB_ETH_RNDIS=y
 # CONFIG_USB_FILE_STORAGE is not set
 # CONFIG_USB_FTDI_ELAN is not set
 # CONFIG_USB_FUNCTIONFS is not set
@@ -2069,6 +2071,7 @@ CONFIG_USB_GADGET_DEBUG=y
 CONFIG_USB_GADGET_DEBUG_FILES=y
 CONFIG_USB_GADGET_DEBUG_FS=y
 CONFIG_USB_GADGET_DUALSPEED=y
+CONFIG_USB_GADGET_MUSB_HDRC=m
 CONFIG_USB_GADGET_VBUS_DRAW=2
 # CONFIG_USB_GPIO_VBUS is not set
 # CONFIG_USB_G_DBGP is not set
@@ -2081,6 +2084,7 @@ CONFIG_USB_HID=y
 # CONFIG_USB_HIDDEV is not set
 # CONFIG_USB_HWA_HCD is not set
 # CONFIG_USB_IDMOUSE is not set
+CONFIG_USB_INVENTRA_DMA=y
 # CONFIG_USB_IOWARRIOR is not set
 # CONFIG_USB_IPHETH is not set
 # CONFIG_USB_ISIGHTFW is not set
@@ -2099,7 +2103,10 @@ CONFIG_USB_MASS_STORAGE=m
 # CONFIG_USB_MICROTEK is not set
 # CONFIG_USB_MIDI_GADGET is not set
 CONFIG_USB_MON=y
-# CONFIG_USB_MUSB_HDRC is not set
+# CONFIG_USB_MUSB_AM35X is not set
+CONFIG_USB_MUSB_HDRC=y
+CONFIG_USB_MUSB_OMAP2PLUS=y
+# CONFIG_USB_MUSB_TUSB6010 is not set
 # CONFIG_USB_NET2272 is not set
 CONFIG_USB_NET_AX8817X=y
 CONFIG_USB_NET_CDCETHER=y
@@ -2158,11 +2165,13 @@ CONFIG_USB_STORAGE=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_SUSPEND=y
 CONFIG_USB_TEST=y
+# CONFIG_USB_TI_CPPI_DMA is not set
 # CONFIG_USB_TMC is not set
 # CONFIG_USB_TRANCEVIBRATOR is not set
 # CONFIG_USB_UAS is not set
 # CONFIG_USB_ULPI is not set
 CONFIG_USB_USBNET=y
+# CONFIG_USB_UX500_DMA is not set
 # CONFIG_USB_VL600 is not set
 CONFIG_USB_WDM=y
 # CONFIG_USB_WUSB is not set