]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ENGR00170548-1 [IMX6Q] USB-HOST:Enable the USB video and audio
authormake shi <b15407@freescale.com>
Tue, 20 Dec 2011 02:02:29 +0000 (10:02 +0800)
committerLothar Waßmann <LW@KARO-electronics.de>
Fri, 24 May 2013 06:33:40 +0000 (08:33 +0200)
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>
arch/arm/configs/imx6_defconfig

index c319c0143d1446e187357aac87738444a5098382..4b6496f7684dfa431bb0f1ac3da4b68912daf7e6 100644 (file)
@@ -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