diff options
author | Sylwester Nawrocki <s.nawrocki@samsung.com> | 2012-09-17 05:02:31 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-10-05 21:27:30 -0400 |
commit | 73f56c239f341f14cd1591fb0c3aafc673f4d409 (patch) | |
tree | b755899c15be919707e6d020d51567bff7c33706 | |
parent | e3b1b4e732e18befcfa428bac1c487f681fbc36a (diff) |
[media] ARM: samsung: Remove unused fields from FIMC and CSIS platform data
The MIPI-CSI2 bus data alignment is now being derived from the media
bus pixel code, the drivers don't use the corresponding structure
fields, so remove them. Also remove the s5p_csis_phy_enable callback
which is now used directly by s5p-csis driver.
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | arch/arm/mach-exynos/mach-nuri.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-exynos/mach-universal_c210.c | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-exynos/mach-nuri.c b/arch/arm/mach-exynos/mach-nuri.c index ea785fcaf6c3..12ff01d8bd46 100644 --- a/arch/arm/mach-exynos/mach-nuri.c +++ b/arch/arm/mach-exynos/mach-nuri.c | |||
@@ -1180,9 +1180,7 @@ static struct platform_device cam_8m_12v_fixed_rdev = { | |||
1180 | static struct s5p_platform_mipi_csis mipi_csis_platdata = { | 1180 | static struct s5p_platform_mipi_csis mipi_csis_platdata = { |
1181 | .clk_rate = 166000000UL, | 1181 | .clk_rate = 166000000UL, |
1182 | .lanes = 2, | 1182 | .lanes = 2, |
1183 | .alignment = 32, | ||
1184 | .hs_settle = 12, | 1183 | .hs_settle = 12, |
1185 | .phy_enable = s5p_csis_phy_enable, | ||
1186 | }; | 1184 | }; |
1187 | 1185 | ||
1188 | #define GPIO_CAM_MEGA_RST EXYNOS4_GPY3(7) /* ISP_RESET */ | 1186 | #define GPIO_CAM_MEGA_RST EXYNOS4_GPY3(7) /* ISP_RESET */ |
@@ -1226,7 +1224,6 @@ static struct s5p_fimc_isp_info nuri_camera_sensors[] = { | |||
1226 | .bus_type = FIMC_MIPI_CSI2, | 1224 | .bus_type = FIMC_MIPI_CSI2, |
1227 | .board_info = &m5mols_board_info, | 1225 | .board_info = &m5mols_board_info, |
1228 | .clk_frequency = 24000000UL, | 1226 | .clk_frequency = 24000000UL, |
1229 | .csi_data_align = 32, | ||
1230 | }, | 1227 | }, |
1231 | }; | 1228 | }; |
1232 | 1229 | ||
diff --git a/arch/arm/mach-exynos/mach-universal_c210.c b/arch/arm/mach-exynos/mach-universal_c210.c index 4d1f40d44ed1..acd2e9db329f 100644 --- a/arch/arm/mach-exynos/mach-universal_c210.c +++ b/arch/arm/mach-exynos/mach-universal_c210.c | |||
@@ -942,9 +942,7 @@ static struct platform_device cam_s_if_fixed_reg_dev = { | |||
942 | static struct s5p_platform_mipi_csis mipi_csis_platdata = { | 942 | static struct s5p_platform_mipi_csis mipi_csis_platdata = { |
943 | .clk_rate = 166000000UL, | 943 | .clk_rate = 166000000UL, |
944 | .lanes = 2, | 944 | .lanes = 2, |
945 | .alignment = 32, | ||
946 | .hs_settle = 12, | 945 | .hs_settle = 12, |
947 | .phy_enable = s5p_csis_phy_enable, | ||
948 | }; | 946 | }; |
949 | 947 | ||
950 | #define GPIO_CAM_LEVEL_EN(n) EXYNOS4_GPE4(n + 3) | 948 | #define GPIO_CAM_LEVEL_EN(n) EXYNOS4_GPE4(n + 3) |
@@ -1008,7 +1006,6 @@ static struct s5p_fimc_isp_info universal_camera_sensors[] = { | |||
1008 | .board_info = &m5mols_board_info, | 1006 | .board_info = &m5mols_board_info, |
1009 | .i2c_bus_num = 0, | 1007 | .i2c_bus_num = 0, |
1010 | .clk_frequency = 24000000UL, | 1008 | .clk_frequency = 24000000UL, |
1011 | .csi_data_align = 32, | ||
1012 | }, | 1009 | }, |
1013 | }; | 1010 | }; |
1014 | 1011 | ||