summaryrefslogtreecommitdiff
path: root/arch/arm/configs
diff options
context:
space:
mode:
authormake shi <b15407@freescale.com>2011-12-20 10:02:29 +0800
committerJason Liu <r64343@freescale.com>2012-01-09 21:11:50 +0800
commit8030c41281ffe18d1c65c0faa134b7ad637dbb46 (patch)
treecbf35275bfdf99863dec9cad26ffe6e86c63d142 /arch/arm/configs
parent5e998df35337d53819038c021fd7528ed1a52557 (diff)
ENGR00170548-1 [IMX6Q] USB-HOST:Enable the USB video and audio
Enable the USB video config as module avoid conflict with CSI camera Enable the USB audio config as defult built in driver Signed-off-by: make shi <b15407@freescale.com>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/imx6_defconfig7
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/configs/imx6_defconfig b/arch/arm/configs/imx6_defconfig
index c319c0143d14..4b6496f7684d 100644
--- a/arch/arm/configs/imx6_defconfig
+++ b/arch/arm/configs/imx6_defconfig
@@ -1381,7 +1381,10 @@ CONFIG_VIDEO_MXC_IPU_OUTPUT=y
# CONFIG_VIDEO_TIMBERDALE is not set
# CONFIG_VIDEO_SR030PC30 is not set
# CONFIG_SOC_CAMERA is not set
-# CONFIG_V4L_USB_DRIVERS is not set
+CONFIG_V4L_USB_DRIVERS=y
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+CONFIG_USB_VIDEO_BUFFERS_DMA=y
# CONFIG_V4L_MEM2MEM_DRIVERS is not set
# CONFIG_RADIO_ADAPTERS is not set
@@ -1500,7 +1503,7 @@ CONFIG_SND_DRIVERS=y
CONFIG_SND_ARM=y
CONFIG_SND_SPI=y
CONFIG_SND_USB=y
-# CONFIG_SND_USB_AUDIO is not set
+CONFIG_SND_USB_AUDIO=y
# CONFIG_SND_USB_UA101 is not set
# CONFIG_SND_USB_CAIAQ is not set
CONFIG_SND_SOC=y