On 01/30/2013 06:23 PM, Sylwester Nawrocki wrote:
Newer Exynos4 SoC are equipped with a local camera ISP that
controls external raw image sensor directly. Such sensors
can be connected through FIMC-LITEn (and MIPI-CSISn) IPs to
the ISP, which then feeds image data to the FIMCn IP. Thus
there can be two busses associated with an image source
(sensor). Rename struct s5p_fimc_isp_info describing external
image sensor (video decoder) to struct fimc_source_info to
avoid confusion. bus_type is split into fimc_bus_type and
sensor_bus_type. The bus type enumeration is extended to
include both FIMC Writeback input types.
The bus_type enumeration and the data structure name in the
board files are modified according to the above changes.
Cc: Kukjin Kim kgene@samsung.com
Cc: linux-samsung-...@vger.kernel.org
Signed-off-by: Sylwester Nawrocki s.nawro...@samsung.com
Signed-off-by: Kyungmin Park kyungmin.p...@samsung.com
Kukjin, can I please have your ack on this patch so it can be
merged through the media tree ?
--
Thanks,
Sylwester
---
arch/arm/mach-exynos/mach-nuri.c|8 ++--
arch/arm/mach-exynos/mach-universal_c210.c |8 ++--
arch/arm/mach-s5pv210/mach-goni.c |6 +--
drivers/media/platform/s5p-fimc/fimc-lite-reg.c |8 ++--
drivers/media/platform/s5p-fimc/fimc-lite-reg.h |4 +-
drivers/media/platform/s5p-fimc/fimc-mdevice.c | 16
drivers/media/platform/s5p-fimc/fimc-mdevice.h |2 +-
drivers/media/platform/s5p-fimc/fimc-reg.c | 34 +---
drivers/media/platform/s5p-fimc/fimc-reg.h |6 +--
include/media/s5p_fimc.h| 49
++-
10 files changed, 79 insertions(+), 62 deletions(-)
diff --git a/arch/arm/mach-exynos/mach-nuri.c
b/arch/arm/mach-exynos/mach-nuri.c
index 27d4ed8..7c2600e 100644
--- a/arch/arm/mach-exynos/mach-nuri.c
+++ b/arch/arm/mach-exynos/mach-nuri.c
@@ -1209,25 +1209,25 @@ static struct i2c_board_info m5mols_board_info = {
.platform_data = m5mols_platdata,
};
-static struct s5p_fimc_isp_info nuri_camera_sensors[] = {
+static struct fimc_source_info nuri_camera_sensors[] = {
{
.flags = V4L2_MBUS_PCLK_SAMPLE_RISING |
V4L2_MBUS_VSYNC_ACTIVE_LOW,
- .bus_type = FIMC_ITU_601,
+ .fimc_bus_type = FIMC_BUS_TYPE_ITU_601,
.board_info = s5k6aa_board_info,
.clk_frequency = 2400UL,
.i2c_bus_num= 6,
}, {
.flags = V4L2_MBUS_PCLK_SAMPLE_FALLING |
V4L2_MBUS_VSYNC_ACTIVE_LOW,
- .bus_type = FIMC_MIPI_CSI2,
+ .fimc_bus_type = FIMC_BUS_TYPE_MIPI_CSI2,
.board_info = m5mols_board_info,
.clk_frequency = 2400UL,
},
};
static struct s5p_platform_fimc fimc_md_platdata = {
- .isp_info = nuri_camera_sensors,
+ .source_info= nuri_camera_sensors,
.num_clients= ARRAY_SIZE(nuri_camera_sensors),
};
diff --git a/arch/arm/mach-exynos/mach-universal_c210.c
b/arch/arm/mach-exynos/mach-universal_c210.c
index 9e3340f..c09290a 100644
--- a/arch/arm/mach-exynos/mach-universal_c210.c
+++ b/arch/arm/mach-exynos/mach-universal_c210.c
@@ -988,12 +988,12 @@ static struct i2c_board_info m5mols_board_info = {
.platform_data = m5mols_platdata,
};
-static struct s5p_fimc_isp_info universal_camera_sensors[] = {
+static struct fimc_source_info universal_camera_sensors[] = {
{
.mux_id = 0,
.flags = V4L2_MBUS_PCLK_SAMPLE_FALLING |
V4L2_MBUS_VSYNC_ACTIVE_LOW,
- .bus_type = FIMC_ITU_601,
+ .fimc_bus_type = FIMC_BUS_TYPE_ITU_601,
.board_info = s5k6aa_board_info,
.i2c_bus_num= 0,
.clk_frequency = 2400UL,
@@ -1001,7 +1001,7 @@ static struct s5p_fimc_isp_info
universal_camera_sensors[] = {
.mux_id = 0,
.flags = V4L2_MBUS_PCLK_SAMPLE_FALLING |
V4L2_MBUS_VSYNC_ACTIVE_LOW,
- .bus_type = FIMC_MIPI_CSI2,
+ .fimc_bus_type = FIMC_BUS_TYPE_MIPI_CSI2,
.board_info = m5mols_board_info,
.i2c_bus_num= 0,
.clk_frequency = 2400UL,
@@ -1009,7 +1009,7 @@ static struct s5p_fimc_isp_info
universal_camera_sensors[] = {
};
static struct s5p_platform_fimc fimc_md_platdata = {
- .isp_info = universal_camera_sensors,
+ .source_info= universal_camera_sensors,
.num_clients= ARRAY_SIZE(universal_camera_sensors),
};
diff --git a/arch/arm/mach-s5pv210/mach-goni.c
b/arch/arm/mach-s5pv210/mach-goni.c
index c72b310..423f6b6 100644
---
