]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
[media] omap3isp: preview: Rename max output sizes defines
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Mon, 3 Oct 2011 10:56:15 +0000 (07:56 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Tue, 20 Dec 2011 11:28:39 +0000 (09:28 -0200)
The maximum preview engine output size depends on the ISP revision, not
the OMAP revision. Rename the macros accordingly.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/omap3isp/isppreview.c

index ccb876fe023f1c1a1257d228b692305c9d6267e3..28a123273a25f8d5f18739931c9cf1b231b092f3 100644 (file)
@@ -116,11 +116,11 @@ static struct omap3isp_prev_csc flr_prev_csc = {
 #define PREV_MIN_IN_HEIGHT     8
 #define PREV_MAX_IN_HEIGHT     16384
 
-#define PREV_MIN_OUT_WIDTH     0
-#define PREV_MIN_OUT_HEIGHT    0
-#define PREV_MAX_OUT_WIDTH     1280
-#define PREV_MAX_OUT_WIDTH_ES2 3300
-#define PREV_MAX_OUT_WIDTH_3630        4096
+#define PREV_MIN_OUT_WIDTH             0
+#define PREV_MIN_OUT_HEIGHT            0
+#define PREV_MAX_OUT_WIDTH_REV_1       1280
+#define PREV_MAX_OUT_WIDTH_REV_2       3300
+#define PREV_MAX_OUT_WIDTH_REV_15      4096
 
 /*
  * Coeficient Tables for the submodules in Preview.
@@ -1306,14 +1306,14 @@ static unsigned int preview_max_out_width(struct isp_prev_device *prev)
 
        switch (isp->revision) {
        case ISP_REVISION_1_0:
-               return PREV_MAX_OUT_WIDTH;
+               return PREV_MAX_OUT_WIDTH_REV_1;
 
        case ISP_REVISION_2_0:
        default:
-               return PREV_MAX_OUT_WIDTH_ES2;
+               return PREV_MAX_OUT_WIDTH_REV_2;
 
        case ISP_REVISION_15_0:
-               return PREV_MAX_OUT_WIDTH_3630;
+               return PREV_MAX_OUT_WIDTH_REV_15;
        }
 }