aboutsummaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorJonathan Corbet <corbet@lwn.net>2011-06-11 13:46:49 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-07-27 16:53:01 -0400
commit67a8dbbc4e04cd256987b189352472a59aff73be (patch)
tree767486631bf85293111a634737dfabb954f98950 /include/media
parent595a93a47a3b7dc1be84160fbd73b1406074f411 (diff)
[media] marvell-cam: Basic working MMP camera driver
Now we have a camera working over the marvell cam controller core. It works like the cafe driver and has all the same limitations, contiguous DMA only being one of them. But it's a start. Signed-off-by: Jonathan Corbet <corbet@lwn.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media')
-rw-r--r--include/media/mmp-camera.h9
-rw-r--r--include/media/v4l2-chip-ident.h3
2 files changed, 11 insertions, 1 deletions
diff --git a/include/media/mmp-camera.h b/include/media/mmp-camera.h
new file mode 100644
index 000000000000..7611963a257f
--- /dev/null
+++ b/include/media/mmp-camera.h
@@ -0,0 +1,9 @@
1/*
2 * Information for the Marvell Armada MMP camera
3 */
4
5struct mmp_camera_platform_data {
6 struct platform_device *i2c_device;
7 int sensor_power_gpio;
8 int sensor_reset_gpio;
9};
diff --git a/include/media/v4l2-chip-ident.h b/include/media/v4l2-chip-ident.h
index b3edb67a8311..8717045e4aec 100644
--- a/include/media/v4l2-chip-ident.h
+++ b/include/media/v4l2-chip-ident.h
@@ -185,8 +185,9 @@ enum {
185 /* module wm8775: just ident 8775 */ 185 /* module wm8775: just ident 8775 */
186 V4L2_IDENT_WM8775 = 8775, 186 V4L2_IDENT_WM8775 = 8775,
187 187
188 /* module cafe_ccic, just ident 8801 */ 188 /* Marvell controllers starting at 8801 */
189 V4L2_IDENT_CAFE = 8801, 189 V4L2_IDENT_CAFE = 8801,
190 V4L2_IDENT_ARMADA610 = 8802,
190 191
191 /* AKM AK8813/AK8814 */ 192 /* AKM AK8813/AK8814 */
192 V4L2_IDENT_AK8813 = 8813, 193 V4L2_IDENT_AK8813 = 8813,