[OMAPZOOM,3/3] ISP: Remove unneeded Previewer offset settings.

Commit Message

Dominic Curran Feb. 26, 2009, 10:40 p.m. UTC

From: Dominic Curran <[e-mail]>
Subject: [OMAPZOOM][PATCH 3/3] ISP: Remove unneeded Previewer offset settings.

Before this patch set the component order was controlled by chnaging offsets in 
the Previewer module.
This was rather unsatifactory because output component order from CCDC differed 
depending on sensor.

The 2nd patch in this series fixes this and causes the CCDC output component 
order to be consistent for all sensors regardless of the input order.

This means that input component order is always the same for Previewer, and 
therefore there is no need to compensate for different offsets in Previewer.

This patch removed the Preveiwer offset compensation from the board file, whic is 
now unnecessary.


Signed-off-by: Dominic Curran <[e-mail]>
---
 arch/arm/mach-omap2/board-3430sdp.c |    6 ------
 arch/arm/mach-omap2/board-ldp.c     |    2 --
 arch/arm/mach-omap2/board-zoom2.c   |    2 --
 drivers/media/video/isp/isp.c       |    1 -
 drivers/media/video/isp/isp.h       |    2 --
 5 files changed, 13 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

Index: omapzoom04/arch/arm/mach-omap2/board-3430sdp.c
===================================================================
--- omapzoom04.orig/arch/arm/mach-omap2/board-3430sdp.c
+++ omapzoom04/arch/arm/mach-omap2/board-3430sdp.c
@@ -657,8 +657,6 @@  static struct isp_interface_config mt9p0
 	.strobe = 0x0,
 	.prestrobe = 0x0,
 	.shutter = 0x0,
-	.prev_sph = 2,
-	.prev_slv = 0,
 	.wenlog = ISPCCDC_CFG_WENLOG_OR,
 	.dcsub = 42,
 	.raw_fmt_in = ISPCCDC_INPUT_FMT_GR_BG,
@@ -782,8 +780,6 @@  static struct isp_interface_config ov364
 	.strobe = 0x0,
 	.prestrobe = 0x0,
 	.shutter = 0x0,
-	.prev_sph = 2,
-	.prev_slv = 0,
 	.wenlog = ISPCCDC_CFG_WENLOG_AND,
 	.dcsub = OV3640_BLACK_LEVEL_10BIT,
 	.raw_fmt_in = ISPCCDC_INPUT_FMT_BG_GR,
@@ -992,8 +988,6 @@  static struct isp_interface_config imx04
 	.strobe 		= 0x0,
 	.prestrobe 		= 0x0,
 	.shutter 		= 0x0,
-	.prev_sph 		= 2,
-	.prev_slv 		= 0,
 	.wenlog 		= ISPCCDC_CFG_WENLOG_OR,
 	.dcsub 			= IMX046_BLACK_LEVEL_AVG,
 	.raw_fmt_in		= ISPCCDC_INPUT_FMT_RG_GB,
Index: omapzoom04/arch/arm/mach-omap2/board-ldp.c
===================================================================
--- omapzoom04.orig/arch/arm/mach-omap2/board-ldp.c
+++ omapzoom04/arch/arm/mach-omap2/board-ldp.c
@@ -622,8 +622,6 @@  static struct isp_interface_config ov364
 	.strobe = 0x0,
 	.prestrobe = 0x0,
 	.shutter = 0x0,
-	.prev_sph = 2,
-	.prev_slv = 0,
 	.wenlog = ISPCCDC_CFG_WENLOG_AND,
 	.dcsub = OV3640_BLACK_LEVEL_10BIT,
 	.raw_fmt_in = ISPCCDC_INPUT_FMT_BG_GR,
Index: omapzoom04/arch/arm/mach-omap2/board-zoom2.c
===================================================================
--- omapzoom04.orig/arch/arm/mach-omap2/board-zoom2.c
+++ omapzoom04/arch/arm/mach-omap2/board-zoom2.c
@@ -368,8 +368,6 @@  static struct isp_interface_config imx04
 	.strobe 		= 0x0,
 	.prestrobe 		= 0x0,
 	.shutter 		= 0x0,
-	.prev_sph 		= 2,
-	.prev_slv 		= 0,
 	.wenlog 		= ISPCCDC_CFG_WENLOG_OR,
 	.dcsub 			= IMX046_BLACK_LEVEL_AVG,
 	.raw_fmt_in		= ISPCCDC_INPUT_FMT_RG_GB,
Index: omapzoom04/drivers/media/video/isp/isp.c
===================================================================
--- omapzoom04.orig/drivers/media/video/isp/isp.c
+++ omapzoom04/drivers/media/video/isp/isp.c
@@ -949,7 +949,6 @@  int isp_configure_interface(struct isp_i
 						ISPCCDC_VDINT);
 
 	/* Set sensor specific fields in CCDC and Previewer module.*/
-	isppreview_set_skip(config->prev_sph, config->prev_slv);
 	ispccdc_set_wenlog(config->wenlog);
 	ispccdc_set_dcsub(config->dcsub);
 	ispccdc_set_crop_offset(config->raw_fmt_in);
Index: omapzoom04/drivers/media/video/isp/isp.h
===================================================================
--- omapzoom04.orig/drivers/media/video/isp/isp.h
+++ omapzoom04/drivers/media/video/isp/isp.h
@@ -202,8 +202,6 @@  struct isp_interface_config {
 	int strobe;
 	int prestrobe;
 	int shutter;
-	u32 prev_sph;
-	u32 prev_slv;
 	u32 wenlog;
 	u32 dcsub;
 	enum ispccdc_raw_fmt raw_fmt_in;