diff options
| author | Sylwester Nawrocki <s.nawrocki@samsung.com> | 2011-02-21 12:09:01 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-03-22 04:54:18 -0300 |
| commit | e0eec9af8bf599642f2730ed207296a92e6204aa (patch) | |
| tree | 7b84caef97d1cfeb47dfcbe8fa31e5f8d0b716a2 /drivers/media/video | |
| parent | 117182d18399a956719be94d3e6e17aad9210cda (diff) | |
| download | kernel_samsung_aries-e0eec9af8bf599642f2730ed207296a92e6204aa.zip kernel_samsung_aries-e0eec9af8bf599642f2730ed207296a92e6204aa.tar.gz kernel_samsung_aries-e0eec9af8bf599642f2730ed207296a92e6204aa.tar.bz2 | |
[media] s5p-fimc: Add a platform data entry for MIPI-CSI data alignment
Allow the MIPI-CSI data alignment to be defined in the board setup
as it may be different across various camera sensors.
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video')
| -rw-r--r-- | drivers/media/video/s5p-fimc/fimc-reg.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/video/s5p-fimc/fimc-reg.c b/drivers/media/video/s5p-fimc/fimc-reg.c index 10684ae..4d929a3 100644 --- a/drivers/media/video/s5p-fimc/fimc-reg.c +++ b/drivers/media/video/s5p-fimc/fimc-reg.c @@ -665,10 +665,12 @@ int fimc_hw_set_camera_type(struct fimc_dev *fimc, vid_cap->fmt.code); return -EINVAL; } - writel(tmp | (0x1 << 8), fimc->regs + S5P_CSIIMGFMT); + tmp |= (cam->csi_data_align == 32) << 8; + + writel(tmp, fimc->regs + S5P_CSIIMGFMT); } else if (cam->bus_type == FIMC_ITU_601 || - cam->bus_type == FIMC_ITU_656) { + cam->bus_type == FIMC_ITU_656) { if (cam->mux_id == 0) /* ITU-A, ITU-B: 0, 1 */ cfg |= S5P_CIGCTRL_SELCAM_ITU_A; } else if (cam->bus_type == FIMC_LCD_WB) { |