diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2011-10-03 06:56:15 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-12-20 06:28:39 -0500 |
commit | ec0cae7a56033e52e30d614d883b26b790a47d6e (patch) | |
tree | efae99a7608a125eb33a8b5c0af0d1b1033efc06 /drivers/media/video/omap3isp | |
parent | 0d6ac1f8a58836dcca54a42354ff84c52cc0f49a (diff) |
[media] omap3isp: preview: Rename max output sizes defines
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>
Diffstat (limited to 'drivers/media/video/omap3isp')
-rw-r--r-- | drivers/media/video/omap3isp/isppreview.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/media/video/omap3isp/isppreview.c b/drivers/media/video/omap3isp/isppreview.c index ccb876fe023f..28a123273a25 100644 --- a/drivers/media/video/omap3isp/isppreview.c +++ b/drivers/media/video/omap3isp/isppreview.c | |||
@@ -116,11 +116,11 @@ static struct omap3isp_prev_csc flr_prev_csc = { | |||
116 | #define PREV_MIN_IN_HEIGHT 8 | 116 | #define PREV_MIN_IN_HEIGHT 8 |
117 | #define PREV_MAX_IN_HEIGHT 16384 | 117 | #define PREV_MAX_IN_HEIGHT 16384 |
118 | 118 | ||
119 | #define PREV_MIN_OUT_WIDTH 0 | 119 | #define PREV_MIN_OUT_WIDTH 0 |
120 | #define PREV_MIN_OUT_HEIGHT 0 | 120 | #define PREV_MIN_OUT_HEIGHT 0 |
121 | #define PREV_MAX_OUT_WIDTH 1280 | 121 | #define PREV_MAX_OUT_WIDTH_REV_1 1280 |
122 | #define PREV_MAX_OUT_WIDTH_ES2 3300 | 122 | #define PREV_MAX_OUT_WIDTH_REV_2 3300 |
123 | #define PREV_MAX_OUT_WIDTH_3630 4096 | 123 | #define PREV_MAX_OUT_WIDTH_REV_15 4096 |
124 | 124 | ||
125 | /* | 125 | /* |
126 | * Coeficient Tables for the submodules in Preview. | 126 | * Coeficient Tables for the submodules in Preview. |
@@ -1306,14 +1306,14 @@ static unsigned int preview_max_out_width(struct isp_prev_device *prev) | |||
1306 | 1306 | ||
1307 | switch (isp->revision) { | 1307 | switch (isp->revision) { |
1308 | case ISP_REVISION_1_0: | 1308 | case ISP_REVISION_1_0: |
1309 | return PREV_MAX_OUT_WIDTH; | 1309 | return PREV_MAX_OUT_WIDTH_REV_1; |
1310 | 1310 | ||
1311 | case ISP_REVISION_2_0: | 1311 | case ISP_REVISION_2_0: |
1312 | default: | 1312 | default: |
1313 | return PREV_MAX_OUT_WIDTH_ES2; | 1313 | return PREV_MAX_OUT_WIDTH_REV_2; |
1314 | 1314 | ||
1315 | case ISP_REVISION_15_0: | 1315 | case ISP_REVISION_15_0: |
1316 | return PREV_MAX_OUT_WIDTH_3630; | 1316 | return PREV_MAX_OUT_WIDTH_REV_15; |
1317 | } | 1317 | } |
1318 | } | 1318 | } |
1319 | 1319 | ||