From: Sergio Aguirre <saaguirre@xxxxxx>
OMAP: CAM: ISP: Fix Silicon Revision check
This patch fixes the silicon revision checking method for the latest
method
Signed-off-by: Sergio Aguirre <saaguirre@xxxxxx>
---
drivers/media/video/isp/isp.c | 4 ++--
drivers/media/video/isp/ispccdc.c | 2 +-
drivers/media/video/isp/ispmmu.c | 4 ++--
drivers/media/video/isp/isppreview.c | 4 ++--
drivers/media/video/isp/ispresizer.c | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
Index: omapkernel/drivers/media/video/isp/isp.c
===================================================================
--- omapkernel.orig/drivers/media/video/isp/isp.c 2008-10-14 10:22:33.000000000 -0500
+++ omapkernel/drivers/media/video/isp/isp.c 2008-10-14 11:03:27.000000000 -0500
@@ -696,7 +696,7 @@
omap_writel(ISPMMU_AUTOIDLE | (ISPMMU_SIDLEMODE_SMARTIDLE <<
ISPMMU_SIDLEMODE_SHIFT),
ISPMMU_SYSCONFIG);
- if (is_sil_rev_equal_to(OMAP3430_REV_ES1_0)) {
+ if (system_rev == OMAP3430_REV_ES1_0) {
omap_writel(ISPCSI1_AUTOIDLE |
(ISPCSI1_MIDLEMODE_SMARTSTANDBY <<
ISPCSI1_MIDLEMODE_SHIFT),
@@ -717,7 +717,7 @@
omap_writel(ISPMMU_AUTOIDLE |
(ISPMMU_SIDLEMODE_NOIDLE << ISPMMU_SIDLEMODE_SHIFT),
ISPMMU_SYSCONFIG);
- if (is_sil_rev_equal_to(OMAP3430_REV_ES1_0)) {
+ if (system_rev == OMAP3430_REV_ES1_0) {
omap_writel(ISPCSI1_AUTOIDLE |
(ISPCSI1_MIDLEMODE_FORCESTANDBY <<
ISPCSI1_MIDLEMODE_SHIFT),
Index: omapkernel/drivers/media/video/isp/ispccdc.c
===================================================================
--- omapkernel.orig/drivers/media/video/isp/ispccdc.c 2008-10-14 10:22:33.000000000 -0500
+++ omapkernel/drivers/media/video/isp/ispccdc.c 2008-10-14 11:03:27.000000000 -0500
@@ -751,7 +751,7 @@
bclamp_val |= bclamp.obstpixel << ISPCCDC_CLAMP_OBST_SHIFT;
omap_writel(bclamp_val, ISPCCDC_CLAMP);
} else {
- if (is_sil_rev_less_than(OMAP3430_REV_ES2_0))
+ if (system_rev < OMAP3430_REV_ES2_0)
if ((ispccdc_obj.syncif_ipmod == YUV16) ||
(ispccdc_obj.syncif_ipmod == YUV8) ||
((omap_readl(ISPCCDC_REC656IF) &
Index: omapkernel/drivers/media/video/isp/ispmmu.c
===================================================================
--- omapkernel.orig/drivers/media/video/isp/ispmmu.c 2008-10-14 10:22:33.000000000 -0500
+++ omapkernel/drivers/media/video/isp/ispmmu.c 2008-10-14 11:03:27.000000000 -0500
@@ -211,7 +211,7 @@
l2_page_cache_p, l2_page_cache,
L2P_TABLES_SIZE);
- if (is_sil_rev_less_than(OMAP3430_REV_ES2_0))
+ if (system_rev < OMAP3430_REV_ES2_0)
l2_mapattr_obj.endianism = B_ENDIAN;
else
l2_mapattr_obj.endianism = L_ENDIAN;
@@ -616,7 +616,7 @@
DPRINTK_ISPMMU("TTB allocated at p = 0x%x, v = 0x%x, size = 0x%x\n",
ttb_p, (u32)ttb, ttb_aligned_size);
- if (is_sil_rev_less_than(OMAP3430_REV_ES2_0))
+ if (system_rev < OMAP3430_REV_ES2_0)
l1_mapattr_obj.endianism = B_ENDIAN;
else
l1_mapattr_obj.endianism = L_ENDIAN;
Index: omapkernel/drivers/media/video/isp/isppreview.c
===================================================================
--- omapkernel.orig/drivers/media/video/isp/isppreview.c 2008-10-14 10:22:33.000000000 -0500
+++ omapkernel/drivers/media/video/isp/isppreview.c 2008-10-14 11:03:27.000000000 -0500
@@ -1441,7 +1441,7 @@
"width < 16 or height < 32 \n");
return -EINVAL;
}
- if (is_sil_rev_equal_to(OMAP3430_REV_ES1_0))
+ if (system_rev == OMAP3430_REV_ES1_0)
max_out = ISPPRV_MAXOUTPUT_WIDTH;
else
max_out = ISPPRV_MAXOUTPUT_WIDTH_ES2;
@@ -1808,7 +1808,7 @@
ispprev_obj.prev_inuse = 0;
mutex_init(&ispprev_obj.ispprev_mutex);
- if (is_sil_rev_equal_to(OMAP3430_REV_ES2_0)) {
+ if (system_rev > OMAP3430_REV_ES1_0) {
flr_wbal_coef0 = 0x23;
flr_wbal_coef1 = 0x20;
flr_wbal_coef2 = 0x20;
Index: omapkernel/drivers/media/video/isp/ispresizer.c
===================================================================
--- omapkernel.orig/drivers/media/video/isp/ispresizer.c 2008-10-14 10:22:33.000000000 -0500
+++ omapkernel/drivers/media/video/isp/ispresizer.c 2008-10-14 11:03:27.000000000 -0500
@@ -353,7 +353,7 @@
if (*output_h < 2)
*output_h = 2;
- if (is_sil_rev_equal_to(OMAP3430_REV_ES1_0)) {
+ if (system_rev == OMAP3430_REV_ES1_0) {
max_in_otf = MAX_IN_WIDTH_ONTHEFLY_MODE;
max_out_7tap = MAX_7TAP_VRSZ_OUTWIDTH;
} else {
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
