diff options
| author | Hans Verkuil | 2013-05-29 11:59:44 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2013-06-17 13:46:34 +0200 |
| commit | 7486af1ae3ee34b12fcff1b1ce3a9cc6a2eca03a (patch) | |
| tree | b530832a93119bb6852431769843a9364fe5ad70 /drivers/media/platform/marvell-ccic/mcam-core.h | |
| parent | [media] cx231xx: remove g_chip_ident (diff) | |
| download | kernel-qcow2-linux-7486af1ae3ee34b12fcff1b1ce3a9cc6a2eca03a.tar.gz kernel-qcow2-linux-7486af1ae3ee34b12fcff1b1ce3a9cc6a2eca03a.tar.xz kernel-qcow2-linux-7486af1ae3ee34b12fcff1b1ce3a9cc6a2eca03a.zip | |
[media] marvell-ccic: remove g_chip_ident
Remove g_chip_ident. This driver used some of the V4L2_IDENT defines, replace
those with a driver-specific enum. This makes it possible to drop the
v4l2-chip-ident.h define as well.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/platform/marvell-ccic/mcam-core.h')
| -rw-r--r-- | drivers/media/platform/marvell-ccic/mcam-core.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/media/platform/marvell-ccic/mcam-core.h b/drivers/media/platform/marvell-ccic/mcam-core.h index 01dec9e5fc2b..46b6ea31e66b 100644 --- a/drivers/media/platform/marvell-ccic/mcam-core.h +++ b/drivers/media/platform/marvell-ccic/mcam-core.h @@ -53,6 +53,11 @@ enum mcam_buffer_mode { B_DMA_sg = 2 }; +enum mcam_chip_id { + MCAM_CAFE, + MCAM_ARMADA610, +}; + /* * Is a given buffer mode supported by the current kernel configuration? */ @@ -98,7 +103,7 @@ struct mcam_camera { unsigned char __iomem *regs; spinlock_t dev_lock; struct device *dev; /* For messages, dma alloc */ - unsigned int chip_id; + enum mcam_chip_id chip_id; short int clock_speed; /* Sensor clock speed, default 30 */ short int use_smbus; /* SMBUS or straight I2c? */ enum mcam_buffer_mode buffer_mode; @@ -152,7 +157,6 @@ struct mcam_camera { void (*frame_complete)(struct mcam_camera *cam, int frame); /* Current operating parameters */ - u32 sensor_type; /* Currently ov7670 only */ struct v4l2_pix_format pix_format; enum v4l2_mbus_pixelcode mbus_code; |