summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorKuninori Morimoto2012-10-29 09:15:34 +0100
committerSimon Horman2012-11-08 09:52:03 +0100
commit94e1f7fbe0478f00ccbdb22d9b269943e1daeba6 (patch)
treefc309d1d6029027d8fc0bc5e0402f39cb7ed0641 /arch/arm/configs
parentARM: shmobile: marzen: add USB phy support (diff)
downloadkernel-qcow2-linux-94e1f7fbe0478f00ccbdb22d9b269943e1daeba6.tar.gz
kernel-qcow2-linux-94e1f7fbe0478f00ccbdb22d9b269943e1daeba6.tar.xz
kernel-qcow2-linux-94e1f7fbe0478f00ccbdb22d9b269943e1daeba6.zip
ARM: shmobile: marzen: add USB EHCI driver support
This patch supports CN21/CN22 USB 2.0 (port 0/1/2), and enable USB momery on defconfig Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/marzen_defconfig6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/configs/marzen_defconfig b/arch/arm/configs/marzen_defconfig
index 8a861b75494e..6540dfba1c17 100644
--- a/arch/arm/configs/marzen_defconfig
+++ b/arch/arm/configs/marzen_defconfig
@@ -47,6 +47,8 @@ CONFIG_DEVTMPFS_MOUNT=y
# CONFIG_STANDALONE is not set
# CONFIG_PREVENT_FIRMWARE_BUILD is not set
# CONFIG_FW_LOADER is not set
+CONFIG_SCSI=y
+CONFIG_BLK_DEV_SD=y
CONFIG_NETDEVICES=y
# CONFIG_NET_VENDOR_BROADCOM is not set
# CONFIG_NET_VENDOR_FARADAY is not set
@@ -82,6 +84,10 @@ CONFIG_USB=y
CONFIG_USB_RCAR_PHY=y
CONFIG_MMC=y
CONFIG_MMC_SDHI=y
+CONFIG_USB=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_HCD_PLATFORM=y
+CONFIG_USB_STORAGE=y
CONFIG_UIO=y
CONFIG_UIO_PDRV_GENIRQ=y
# CONFIG_IOMMU_SUPPORT is not set