summaryrefslogtreecommitdiff
path: root/drivers/media/platform
diff options
context:
space:
mode:
authorMing Qian <ming.qian@nxp.com>2022-03-17 15:15:46 +0800
committerMing Qian <ming.qian@nxp.com>2022-04-24 11:13:04 +0800
commitcfdfcb965b8819fbc6d108d0a2860e15e75d6527 (patch)
treecb0fa44a5d4ffc2d10c75bdce1c9188e3f571133 /drivers/media/platform
parentf79af546a2b544cd90fdd3af38d6b1b4329393ac (diff)
LF-5669-2: media: imx-jpeg: Correct the name of bgr
change MXC_JPEG_RGB to MXC_JPEG_BGR fix some comments of bgr description Signed-off-by: Ming Qian <ming.qian@nxp.com>
Diffstat (limited to 'drivers/media/platform')
-rw-r--r--drivers/media/platform/imx-jpeg/mxc-jpeg-hw.h4
-rw-r--r--drivers/media/platform/imx-jpeg/mxc-jpeg.c10
2 files changed, 7 insertions, 7 deletions
diff --git a/drivers/media/platform/imx-jpeg/mxc-jpeg-hw.h b/drivers/media/platform/imx-jpeg/mxc-jpeg-hw.h
index ae70d3a0dc24..d838e875616c 100644
--- a/drivers/media/platform/imx-jpeg/mxc-jpeg-hw.h
+++ b/drivers/media/platform/imx-jpeg/mxc-jpeg-hw.h
@@ -102,11 +102,11 @@ enum mxc_jpeg_image_format {
MXC_JPEG_INVALID = -1,
MXC_JPEG_YUV420 = 0x0, /* 2 Plannar, Y=1st plane UV=2nd plane */
MXC_JPEG_YUV422 = 0x1, /* 1 Plannar, YUYV sequence */
- MXC_JPEG_RGB = 0x2, /* RGBRGB packed format */
+ MXC_JPEG_BGR = 0x2, /* BGR packed format */
MXC_JPEG_YUV444 = 0x3, /* 1 Plannar, YUVYUV sequence */
MXC_JPEG_GRAY = 0x4, /* Y8 or Y12 or Single Component */
MXC_JPEG_RESERVED = 0x5,
- MXC_JPEG_ARGB = 0x6,
+ MXC_JPEG_ABGR = 0x6,
};
#include "mxc-jpeg.h"
diff --git a/drivers/media/platform/imx-jpeg/mxc-jpeg.c b/drivers/media/platform/imx-jpeg/mxc-jpeg.c
index 777e15d50814..7f8ec4ecf953 100644
--- a/drivers/media/platform/imx-jpeg/mxc-jpeg.c
+++ b/drivers/media/platform/imx-jpeg/mxc-jpeg.c
@@ -8,7 +8,7 @@
* Baseline and extended sequential jpeg decoding is supported.
* Progressive jpeg decoding is not supported by the IP.
* Supports encode and decode of various formats:
- * YUV444, YUV422, YUV420, RGB, ARGB, Gray
+ * YUV444, YUV422, YUV420, BGR, ABGR, Gray
* YUV420 is the only multi-planar format supported.
* Minimum resolution is 64 x 64, maximum 8192 x 8192.
* To achieve 8192 x 8192, modify in defconfig: CONFIG_CMA_SIZE_MBYTES=320
@@ -73,7 +73,7 @@ static const struct mxc_jpeg_fmt mxc_formats[] = {
.flags = MXC_JPEG_FMT_TYPE_ENC,
},
{
- .name = "RGB", /*RGBRGB packed format*/
+ .name = "BGR", /*BGR packed format*/
.fourcc = V4L2_PIX_FMT_BGR24,
.subsampling = V4L2_JPEG_CHROMA_SUBSAMPLING_444,
.nc = 3,
@@ -85,7 +85,7 @@ static const struct mxc_jpeg_fmt mxc_formats[] = {
.precision = 8,
},
{
- .name = "ARGB", /* ARGBARGB packed format */
+ .name = "ABGR", /* ABGR packed format */
.fourcc = V4L2_PIX_FMT_ABGR32,
.subsampling = V4L2_JPEG_CHROMA_SUBSAMPLING_444,
.nc = 4,
@@ -421,9 +421,9 @@ static enum mxc_jpeg_image_format mxc_jpeg_fourcc_to_imgfmt(u32 fourcc)
case V4L2_PIX_FMT_YUV24:
return MXC_JPEG_YUV444;
case V4L2_PIX_FMT_BGR24:
- return MXC_JPEG_RGB;
+ return MXC_JPEG_BGR;
case V4L2_PIX_FMT_ABGR32:
- return MXC_JPEG_ARGB;
+ return MXC_JPEG_ABGR;
default:
return MXC_JPEG_INVALID;
}