---

yaml --- r: 92373 b: refs/heads/master c: f523dd0 h: refs/heads/master i: 92371: d3d1245 v: v3
git-mirror · Apr 24, 2008 · a85bdbe · a85bdbe
1 parent 4c7fc72
commit a85bdbe
Show file tree

Hide file tree

Showing 4 changed files with 711 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3bc43840c3fbffaf8216883a37b336a41050d7f7
+refs/heads/master: f523dd0da985ef618d6f986217f0dd0975072515
diff --git a/trunk/drivers/media/video/Kconfig b/trunk/drivers/media/video/Kconfig
@@ -845,6 +845,21 @@ config SOC_CAMERA
 	  over a bus like PCI or USB. For example some i2c camera connected
 	  directly to the data bus of an SoC.
 
+config SOC_CAMERA_MT9M001
+	tristate "mt9m001 support"
+	depends on SOC_CAMERA && GENERIC_GPIO
+	select GPIO_PCA953X if MT9M001_PCA9536_SWITCH
+	help
+	  This driver supports MT9M001 cameras from Micron, monochrome
+	  and colour models.
+
+config MT9M001_PCA9536_SWITCH
+	bool "pca9536 datawidth switch for mt9m001"
+	depends on SOC_CAMERA_MT9M001
+	help
+	  Select this if your MT9M001 camera uses a PCA9536 I2C GPIO
+	  extender to switch between 8 and 10 bit datawidth modes
+
 config VIDEO_PXA27x
 	tristate "PXA27x Quick Capture Interface driver"
 	depends on VIDEO_DEV && PXA27x

diff --git a/trunk/drivers/media/video/Makefile b/trunk/drivers/media/video/Makefile
@@ -138,6 +138,7 @@ obj-$(CONFIG_VIDEO_CX23885) += cx23885/
 
 obj-$(CONFIG_VIDEO_PXA27x)	+= pxa_camera.o
 obj-$(CONFIG_SOC_CAMERA)	+= soc_camera.o
+obj-$(CONFIG_SOC_CAMERA_MT9M001)	+= mt9m001.o
 
 EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
 EXTRA_CFLAGS += -Idrivers/media/dvb/frontends