---

yaml --- r: 295078 b: refs/heads/master c: 63b1a90 h: refs/heads/master v: v3
git-mirror · Mar 19, 2012 · 85f5d9d · 85f5d9d
1 parent 7f0071e
commit 85f5d9d
Show file tree

Hide file tree

Showing 9 changed files with 1,458 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f877ed9780f43da51a4544e5b90b7f4a145964ff
+refs/heads/master: 63b1a90da93e019adcafa2b2b1b921fc97debec5
diff --git a/trunk/drivers/media/video/Kconfig b/trunk/drivers/media/video/Kconfig
@@ -871,6 +871,8 @@ source "drivers/media/video/davinci/Kconfig"
 
 source "drivers/media/video/omap/Kconfig"
 
+source "drivers/media/video/blackfin/Kconfig"
+
 config VIDEO_SH_VOU
 	tristate "SuperH VOU video output driver"
 	depends on VIDEO_DEV && ARCH_SHMOBILE

diff --git a/trunk/drivers/media/video/Makefile b/trunk/drivers/media/video/Makefile
@@ -187,6 +187,8 @@ obj-$(CONFIG_VIDEO_SAMSUNG_S5P_TV)	+= s5p-tv/
 
 obj-$(CONFIG_VIDEO_SAMSUNG_S5P_G2D)	+= s5p-g2d/
 
+obj-$(CONFIG_BLACKFIN)                  += blackfin/
+
 obj-$(CONFIG_ARCH_DAVINCI)		+= davinci/
 
 obj-$(CONFIG_VIDEO_SH_VOU)		+= sh_vou.o

diff --git a/trunk/drivers/media/video/blackfin/Kconfig b/trunk/drivers/media/video/blackfin/Kconfig
@@ -0,0 +1,10 @@
+config VIDEO_BLACKFIN_CAPTURE
+	tristate "Blackfin Video Capture Driver"
+	depends on VIDEO_V4L2 && BLACKFIN && I2C
+	select VIDEOBUF2_DMA_CONTIG
+	help
+	  V4L2 bridge driver for Blackfin video capture device.
+	  Choose PPI or EPPI as its interface.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called bfin_video_capture.
diff --git a/trunk/drivers/media/video/blackfin/Makefile b/trunk/drivers/media/video/blackfin/Makefile
@@ -0,0 +1,2 @@
+bfin_video_capture-objs := bfin_capture.o ppi.o
+obj-$(CONFIG_VIDEO_BLACKFIN_CAPTURE) += bfin_video_capture.o
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		bfin_video_capture-objs := bfin_capture.o ppi.o
		obj-$(CONFIG_VIDEO_BLACKFIN_CAPTURE) += bfin_video_capture.o