From 2426d55495a9ec731cfaf73229a988df46ee1c19 Mon Sep 17 00:00:00 2001
From: Sylwester Nawrocki <s.nawrocki@samsung.com>
Date: Mon, 21 Feb 2011 12:09:01 -0300
Subject: [PATCH] --- yaml --- r: 242064 b: refs/heads/master c:
 e0eec9af8bf599642f2730ed207296a92e6204aa h: refs/heads/master v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/media/video/s5p-fimc/fimc-reg.c | 6 ++++--
 trunk/include/media/s5p_fimc.h                | 2 ++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index fbfd55fddeac..8052740073bd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 117182d18399a956719be94d3e6e17aad9210cda
+refs/heads/master: e0eec9af8bf599642f2730ed207296a92e6204aa
diff --git a/trunk/drivers/media/video/s5p-fimc/fimc-reg.c b/trunk/drivers/media/video/s5p-fimc/fimc-reg.c
index 10684aef5b2d..4d929a394521 100644
--- a/trunk/drivers/media/video/s5p-fimc/fimc-reg.c
+++ b/trunk/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) {
diff --git a/trunk/include/media/s5p_fimc.h b/trunk/include/media/s5p_fimc.h
index 82496d38a96a..9fdff8a4ed26 100644
--- a/trunk/include/media/s5p_fimc.h
+++ b/trunk/include/media/s5p_fimc.h
@@ -33,6 +33,7 @@ struct i2c_board_info;
  * @board_info: pointer to I2C subdevice's board info
  * @clk_frequency: frequency of the clock the host interface provides to sensor
  * @bus_type: determines bus type, MIPI, ITU-R BT.601 etc.
+ * @csi_data_align: MIPI-CSI interface data alignment in bits
  * @i2c_bus_num: i2c control bus id the sensor is attached to
  * @mux_id: FIMC camera interface multiplexer index (separate for MIPI and ITU)
  * @flags: flags defining bus signals polarity inversion (High by default)
@@ -41,6 +42,7 @@ struct s5p_fimc_isp_info {
 	struct i2c_board_info *board_info;
 	unsigned long clk_frequency;
 	enum cam_bus_type bus_type;
+	u16 csi_data_align;
 	u16 i2c_bus_num;
 	u16 mux_id;
 	u16 flags;