Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73f56c23 authored Sep 17, 2012 by Sylwester Nawrocki Committed by Mauro Carvalho Chehab Oct 05, 2012

[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>

parent e3b1b4e7

arch/arm/mach-exynos/mach-nuri.c

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1180,9 +1180,7 @@ static struct platform_device cam_8m_12v_fixed_rdev = {
	static struct s5p_platform_mipi_csis mipi_csis_platdata = {		static struct s5p_platform_mipi_csis mipi_csis_platdata = {
	.clk_rate = 166000000UL,		.clk_rate = 166000000UL,
	.lanes = 2,		.lanes = 2,
	.alignment = 32,
	.hs_settle = 12,		.hs_settle = 12,
	.phy_enable = s5p_csis_phy_enable,
	};		};

	#define GPIO_CAM_MEGA_RST EXYNOS4_GPY3(7) /* ISP_RESET */		#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,		.bus_type = FIMC_MIPI_CSI2,
	.board_info = &m5mols_board_info,		.board_info = &m5mols_board_info,
	.clk_frequency = 24000000UL,		.clk_frequency = 24000000UL,
	.csi_data_align = 32,
	},		},
	};		};

arch/arm/mach-exynos/mach-universal_c210.c

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -942,9 +942,7 @@ static struct platform_device cam_s_if_fixed_reg_dev = {
	static struct s5p_platform_mipi_csis mipi_csis_platdata = {		static struct s5p_platform_mipi_csis mipi_csis_platdata = {
	.clk_rate = 166000000UL,		.clk_rate = 166000000UL,
	.lanes = 2,		.lanes = 2,
	.alignment = 32,
	.hs_settle = 12,		.hs_settle = 12,
	.phy_enable = s5p_csis_phy_enable,
	};		};

	#define GPIO_CAM_LEVEL_EN(n) EXYNOS4_GPE4(n + 3)		#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,		.board_info = &m5mols_board_info,
	.i2c_bus_num = 0,		.i2c_bus_num = 0,
	.clk_frequency = 24000000UL,		.clk_frequency = 24000000UL,
	.csi_data_align = 32,
	},		},
	};		};