From 73fbcc7d4c65ea100218d0dddc012236c904f9cc Mon Sep 17 00:00:00 2001
From: Torben Hohn <torbenh@linutronix.de>
Date: Tue, 18 Mar 2014 10:55:30 +0100
Subject: [PATCH 46/51] am335x_rt_defconfig: Activate USB and MMC support

---
 arch/arm/configs/am335x_rt_defconfig |   28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/arch/arm/configs/am335x_rt_defconfig b/arch/arm/configs/am335x_rt_defconfig
index 46b7119..85a4af2 100644
--- a/arch/arm/configs/am335x_rt_defconfig
+++ b/arch/arm/configs/am335x_rt_defconfig
@@ -495,7 +495,7 @@ CONFIG_ARM_APPENDED_DTB=y
 CONFIG_ARM_ATAG_DTB_COMPAT=y
 CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y
 # CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND is not set
-CONFIG_CMDLINE="root=/dev/nfs nfsroot=192.168.0.1:/srv/tftp/torbenh/linuxwoche/rfs console=ttyO0,115200 rootwait ip=dhcp rw loglevel=8 consoleblank=0"
+CONFIG_CMDLINE="root=/dev/nfs nfsroot=192.168.0.1:/srv/tftp/torbenh/linuxwoche/rfs console=ttyO0,115200 rootwait ip=dhcp rw loglevel=8 consoleblank=0 "
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
 # CONFIG_CMDLINE_EXTEND is not set
 # CONFIG_CMDLINE_FORCE is not set
@@ -1582,6 +1582,7 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_BATTERY_BQ27x00 is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
+# CONFIG_CHARGER_ISP1704 is not set
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_TWL4030 is not set
 # CONFIG_CHARGER_LP8727 is not set
@@ -2042,7 +2043,18 @@ CONFIG_USB_MON=y
 # CONFIG_USB_SL811_HCD is not set
 # CONFIG_USB_R8A66597_HCD is not set
 # CONFIG_USB_HCD_TEST_MODE is not set
-# CONFIG_USB_MUSB_HDRC is not set
+CONFIG_USB_MUSB_HDRC=y
+# CONFIG_USB_MUSB_HOST is not set
+# CONFIG_USB_MUSB_GADGET is not set
+CONFIG_USB_MUSB_DUAL_ROLE=y
+# CONFIG_USB_MUSB_TUSB6010 is not set
+# CONFIG_USB_MUSB_OMAP2PLUS is not set
+# CONFIG_USB_MUSB_AM35X is not set
+CONFIG_USB_MUSB_DSPS=y
+# CONFIG_USB_MUSB_UX500 is not set
+CONFIG_USB_MUSB_AM335X_CHILD=y
+CONFIG_USB_TI_CPPI41_DMA=y
+# CONFIG_MUSB_PIO_ONLY is not set
 # CONFIG_USB_RENESAS_USBHS is not set
 
 #
@@ -2105,6 +2117,7 @@ CONFIG_USB_STORAGE=y
 # CONFIG_USB_IDMOUSE is not set
 # CONFIG_USB_FTDI_ELAN is not set
 # CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_SISUSBVGA is not set
 # CONFIG_USB_LD is not set
 # CONFIG_USB_TRANCEVIBRATOR is not set
 # CONFIG_USB_IOWARRIOR is not set
@@ -2118,12 +2131,13 @@ CONFIG_USB_TEST=y
 #
 # USB Physical Layer drivers
 #
-# CONFIG_USB_PHY is not set
-# CONFIG_NOP_USB_XCEIV is not set
+CONFIG_USB_PHY=y
+CONFIG_NOP_USB_XCEIV=y
 # CONFIG_OMAP_CONTROL_USB is not set
 # CONFIG_OMAP_USB2 is not set
 # CONFIG_OMAP_USB3 is not set
-# CONFIG_AM335X_PHY_USB is not set
+CONFIG_AM335X_CONTROL_USB=y
+CONFIG_AM335X_PHY_USB=y
 # CONFIG_SAMSUNG_USB2PHY is not set
 # CONFIG_SAMSUNG_USB3PHY is not set
 # CONFIG_USB_GPIO_VBUS is not set
@@ -2186,7 +2200,7 @@ CONFIG_SDIO_UART=y
 # CONFIG_MMC_SDHCI_PXAV3 is not set
 # CONFIG_MMC_SDHCI_PXAV2 is not set
 CONFIG_MMC_OMAP=y
-# CONFIG_MMC_OMAP_HS is not set
+CONFIG_MMC_OMAP_HS=y
 # CONFIG_MMC_DW is not set
 # CONFIG_MMC_VUB300 is not set
 # CONFIG_MMC_USHC is not set
@@ -2320,7 +2334,7 @@ CONFIG_DMADEVICES=y
 # CONFIG_TIMB_DMA is not set
 CONFIG_TI_EDMA=y
 CONFIG_DMA_OMAP=y
-# CONFIG_TI_CPPI41 is not set
+CONFIG_TI_CPPI41=y
 CONFIG_DMA_ENGINE=y
 CONFIG_DMA_VIRTUAL_CHANNELS=y
 CONFIG_DMA_OF=y
-- 
1.7.10.4