diff options
author | Jonathan Corbet <corbet@lwn.net> | 2011-06-11 14:46:49 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-07-27 17:53:01 -0300 |
commit | 67a8dbbc4e04cd256987b189352472a59aff73be (patch) | |
tree | 767486631bf85293111a634737dfabb954f98950 /include/media | |
parent | 595a93a47a3b7dc1be84160fbd73b1406074f411 (diff) | |
download | linux-3.10-67a8dbbc4e04cd256987b189352472a59aff73be.tar.gz linux-3.10-67a8dbbc4e04cd256987b189352472a59aff73be.tar.bz2 linux-3.10-67a8dbbc4e04cd256987b189352472a59aff73be.zip |
[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.h | 9 | ||||
-rw-r--r-- | include/media/v4l2-chip-ident.h | 3 |
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 00000000000..7611963a257 --- /dev/null +++ b/include/media/mmp-camera.h @@ -0,0 +1,9 @@ +/* + * Information for the Marvell Armada MMP camera + */ + +struct mmp_camera_platform_data { + struct platform_device *i2c_device; + int sensor_power_gpio; + int sensor_reset_gpio; +}; diff --git a/include/media/v4l2-chip-ident.h b/include/media/v4l2-chip-ident.h index b3edb67a831..8717045e4ae 100644 --- a/include/media/v4l2-chip-ident.h +++ b/include/media/v4l2-chip-ident.h @@ -185,8 +185,9 @@ enum { /* module wm8775: just ident 8775 */ V4L2_IDENT_WM8775 = 8775, - /* module cafe_ccic, just ident 8801 */ + /* Marvell controllers starting at 8801 */ V4L2_IDENT_CAFE = 8801, + V4L2_IDENT_ARMADA610 = 8802, /* AKM AK8813/AK8814 */ V4L2_IDENT_AK8813 = 8813, |