diff options
| author | Libin Yang | 2013-07-03 06:55:58 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2013-07-26 18:22:42 +0200 |
| commit | 05fed81625bf755cc67c5864cdfd18b69ea828d1 (patch) | |
| tree | b5f42709eaab7c459ec9643dffc9d4e4ec8264b5 /drivers/media/platform/marvell-ccic/cafe-driver.c | |
| parent | [media] media: i2c: adv7343: add OF support (diff) | |
| download | kernel-qcow2-linux-05fed81625bf755cc67c5864cdfd18b69ea828d1.tar.gz kernel-qcow2-linux-05fed81625bf755cc67c5864cdfd18b69ea828d1.tar.xz kernel-qcow2-linux-05fed81625bf755cc67c5864cdfd18b69ea828d1.zip | |
[media] marvell-ccic: add MIPI support for marvell-ccic driver
This patch adds the MIPI support for marvell-ccic.
Board driver should determine whether using MIPI or not.
Signed-off-by: Albert Wang <twang13@marvell.com>
Signed-off-by: Libin Yang <lbyang@marvell.com>
Acked-by: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/platform/marvell-ccic/cafe-driver.c')
| -rw-r--r-- | drivers/media/platform/marvell-ccic/cafe-driver.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/platform/marvell-ccic/cafe-driver.c b/drivers/media/platform/marvell-ccic/cafe-driver.c index 1f079ff33d4b..562845361246 100644 --- a/drivers/media/platform/marvell-ccic/cafe-driver.c +++ b/drivers/media/platform/marvell-ccic/cafe-driver.c @@ -399,7 +399,7 @@ static void cafe_ctlr_init(struct mcam_camera *mcam) } -static void cafe_ctlr_power_up(struct mcam_camera *mcam) +static int cafe_ctlr_power_up(struct mcam_camera *mcam) { /* * Part one of the sensor dance: turn the global @@ -414,6 +414,8 @@ static void cafe_ctlr_power_up(struct mcam_camera *mcam) */ mcam_reg_write(mcam, REG_GPR, GPR_C1EN|GPR_C0EN); /* pwr up, reset */ mcam_reg_write(mcam, REG_GPR, GPR_C1EN|GPR_C0EN|GPR_C0); + + return 0; } static void cafe_ctlr_power_down(struct mcam_camera *mcam) |