---

yaml --- r: 261349 b: refs/heads/master c: a9b36e8 h: refs/heads/master i: 261347: 57ea42f v: v3
git-mirror · Jul 27, 2011 · 3c87011 · 3c87011
1 parent 2336786
commit 3c87011
Show file tree

Hide file tree

Showing 6 changed files with 206 additions and 55 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c895d548c393d913152195c9e70816e13c64f9f
+refs/heads/master: a9b36e850782db853b9da050be9ed2050de51ad4
diff --git a/trunk/drivers/media/video/marvell-ccic/Kconfig b/trunk/drivers/media/video/marvell-ccic/Kconfig
@@ -14,6 +14,7 @@ config VIDEO_MMP_CAMERA
 	select VIDEO_OV7670
 	select I2C_GPIO
 	select VIDEOBUF2_VMALLOC
+	select VIDEOBUF2_DMA_CONTIG
 	---help---
 	  This is a Video4Linux2 driver for the integrated camera
 	  controller found on Marvell Armada 610 application

diff --git a/trunk/drivers/media/video/marvell-ccic/cafe-driver.c b/trunk/drivers/media/video/marvell-ccic/cafe-driver.c
@@ -481,6 +481,12 @@ static int cafe_pci_probe(struct pci_dev *pdev,
 	 */
 	mcam->clock_speed = 45;
 	mcam->use_smbus = 1;
+	/*
+	 * Vmalloc mode for buffers is traditional with this driver.
+	 * We *might* be able to run DMA_contig, especially on a system
+	 * with CMA in it.
+	 */
+	mcam->buffer_mode = B_vmalloc;
 	/*
 	 * Get set up on the PCI bus.
 	 */