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

Commit 09ff0340 authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Mauro Carvalho Chehab
Browse files

[media] s5p-fimc: Remove unused platform data structure fields 



alignment, fixed_phy_vdd and phy_enable fields are now unused
so removed them. The data alignment is now derived directly
from media bus pixel code, phy_enable callback has been replaced
with direct function call and fixed_phy_vdd was dropped in commit
438df3eb
"[media] s5p-csis: Handle all available power supplies".

Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent ccbfd1d4

include/linux/platform_data/mipi-csis.h

+4 −11
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2010-2011 Samsung Electronics Co., Ltd.

 *

 * S5P series MIPI CSI slave device support

 * Samsung S5P/Exynos SoC series MIPI CSIS device support

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as
@@ -15,19 +15,12 @@ 
 * struct s5p_platform_mipi_csis - platform data for S5P MIPI-CSIS driver

 * @clk_rate:    bus clock frequency

 * @lanes:       number of data lanes used

 * @alignment: data alignment in bits

 * @hs_settle:   HS-RX settle time

 * @fixed_phy_vdd: false to enable external D-PHY regulator management in the

 *		   driver or true in case this regulator has no enable function

 * @phy_enable: pointer to a callback controlling D-PHY enable/reset

 */

struct s5p_platform_mipi_csis {

	unsigned long clk_rate;

	u8 lanes;

	u8 alignment;

	u8 hs_settle;

	bool fixed_phy_vdd;

	int (*phy_enable)(struct platform_device *pdev, bool on);

};



/**

include/media/s5p_fimc.h

+0 −2
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 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)

 * @clk_id: index of the SoC peripheral clock for sensors
@@ -40,7 +39,6 @@ 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;