From acb20a316d1c954e7b915fe58ea2339b31adaa11 Mon Sep 17 00:00:00 2001
From: Sylwester Nawrocki <s.nawrocki@samsung.com>
Date: Mon, 17 Sep 2012 06:02:31 -0300
Subject: [PATCH] --- yaml --- r: 333791 b: refs/heads/master c:
 73f56c239f341f14cd1591fb0c3aafc673f4d409 h: refs/heads/master i:   333789:
 4119cc5f643dd4c7d7d261582fe2b28f66e37a53   333787:
 7d0a486a06272134444d7882bd245305f4543919   333783:
 32581b13477f8d656f25abb55aef946052a5778f   333775:
 733f4bb1563e53c469142aca2922cf9053f11e6c   333759:
 676d4256ee2583d7828070dae63a5b6f9d7f682d v: v3

---
 [refs]                                           | 2 +-
 trunk/arch/arm/mach-exynos/mach-nuri.c           | 3 ---
 trunk/arch/arm/mach-exynos/mach-universal_c210.c | 3 ---
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 8139472c1e69..c3ab34391027 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3b1b4e732e18befcfa428bac1c487f681fbc36a
+refs/heads/master: 73f56c239f341f14cd1591fb0c3aafc673f4d409
diff --git a/trunk/arch/arm/mach-exynos/mach-nuri.c b/trunk/arch/arm/mach-exynos/mach-nuri.c
index ea785fcaf6c3..12ff01d8bd46 100644
--- a/trunk/arch/arm/mach-exynos/mach-nuri.c
+++ b/trunk/arch/arm/mach-exynos/mach-nuri.c
@@ -1180,9 +1180,7 @@ static struct platform_device cam_8m_12v_fixed_rdev = {
 static struct s5p_platform_mipi_csis mipi_csis_platdata = {
 	.clk_rate	= 166000000UL,
 	.lanes		= 2,
-	.alignment	= 32,
 	.hs_settle	= 12,
-	.phy_enable	= s5p_csis_phy_enable,
 };
 
 #define GPIO_CAM_MEGA_RST	EXYNOS4_GPY3(7) /* ISP_RESET */
@@ -1226,7 +1224,6 @@ static struct s5p_fimc_isp_info nuri_camera_sensors[] = {
 		.bus_type	= FIMC_MIPI_CSI2,
 		.board_info	= &m5mols_board_info,
 		.clk_frequency	= 24000000UL,
-		.csi_data_align	= 32,
 	},
 };
 
diff --git a/trunk/arch/arm/mach-exynos/mach-universal_c210.c b/trunk/arch/arm/mach-exynos/mach-universal_c210.c
index 4d1f40d44ed1..acd2e9db329f 100644
--- a/trunk/arch/arm/mach-exynos/mach-universal_c210.c
+++ b/trunk/arch/arm/mach-exynos/mach-universal_c210.c
@@ -942,9 +942,7 @@ static struct platform_device cam_s_if_fixed_reg_dev = {
 static struct s5p_platform_mipi_csis mipi_csis_platdata = {
 	.clk_rate	= 166000000UL,
 	.lanes		= 2,
-	.alignment	= 32,
 	.hs_settle	= 12,
-	.phy_enable	= s5p_csis_phy_enable,
 };
 
 #define GPIO_CAM_LEVEL_EN(n)	EXYNOS4_GPE4(n + 3)
@@ -1008,7 +1006,6 @@ static struct s5p_fimc_isp_info universal_camera_sensors[] = {
 		.board_info	= &m5mols_board_info,
 		.i2c_bus_num	= 0,
 		.clk_frequency	= 24000000UL,
-		.csi_data_align	= 32,
 	},
 };