diff options
author | Andrzej Pietrasiewicz | 2015-03-09 13:32:46 +0100 |
---|---|---|
committer | Mauro Carvalho Chehab | 2015-04-07 13:14:09 +0200 |
commit | 7c15fd4bf3d367bfc80f76814559f51f75c4d28a (patch) | |
tree | d89f67c200481857672d919be6bd3dee8d99c439 /drivers/media/platform/s5p-jpeg/jpeg-core.h | |
parent | [media] m88ts2022: remove from Makefile (diff) | |
download | kernel-qcow2-linux-7c15fd4bf3d367bfc80f76814559f51f75c4d28a.tar.gz kernel-qcow2-linux-7c15fd4bf3d367bfc80f76814559f51f75c4d28a.tar.xz kernel-qcow2-linux-7c15fd4bf3d367bfc80f76814559f51f75c4d28a.zip |
[media] s5p-jpeg: add 5420 family support
JPEG IP found in Exynos5420 is similar to what is in Exynos3250, but
there are some subtle differences which this patch takes into account.
Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/platform/s5p-jpeg/jpeg-core.h')
-rw-r--r-- | drivers/media/platform/s5p-jpeg/jpeg-core.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.h b/drivers/media/platform/s5p-jpeg/jpeg-core.h index 764b32de326b..7d9a9ed19cea 100644 --- a/drivers/media/platform/s5p-jpeg/jpeg-core.h +++ b/drivers/media/platform/s5p-jpeg/jpeg-core.h @@ -67,10 +67,12 @@ #define SJPEG_SUBSAMPLING_420 0x22 /* Version numbers */ - -#define SJPEG_S5P 1 -#define SJPEG_EXYNOS3250 2 -#define SJPEG_EXYNOS4 3 +enum sjpeg_version { + SJPEG_S5P, + SJPEG_EXYNOS3250, + SJPEG_EXYNOS4, + SJPEG_EXYNOS5420, +}; enum exynos4_jpeg_result { OK_ENC_OR_DEC, @@ -130,6 +132,8 @@ struct s5p_jpeg { struct s5p_jpeg_variant { unsigned int version; unsigned int fmt_ver_flag; + unsigned int hw3250_compat:1; + unsigned int htbl_reinit:1; struct v4l2_m2m_ops *m2m_ops; irqreturn_t (*jpeg_irq)(int irq, void *priv); }; |