tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
[media] v4l: Rename V4L2_MBUS_FMT_GREY8_1X8 to V4L2_MBUS_FMT_Y8_1X8
For consistency with the V4L2_MBUS_FMT_Y10_1X10 format.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
authored by
Laurent Pinchart
and committed by
Mauro Carvalho Chehab
07670433
84d0688d
+13
-13
+1
-1
drivers/media/video/mt9m001.c
+1
-1
drivers/media/video/mt9m001.c
···
79
79
static const struct mt9m001_datafmt mt9m001_monochrome_fmts[] = {
80
80
/* Order important - see above */
81
81
{V4L2_MBUS_FMT_Y10_1X10, V4L2_COLORSPACE_JPEG},
82
-
{V4L2_MBUS_FMT_GREY8_1X8, V4L2_COLORSPACE_JPEG},
82
+
{V4L2_MBUS_FMT_Y8_1X8, V4L2_COLORSPACE_JPEG},
83
83
};
84
84
85
85
struct mt9m001 {
+2
-2
drivers/media/video/mt9v022.c
+2
-2
drivers/media/video/mt9v022.c
···
95
95
static const struct mt9v022_datafmt mt9v022_monochrome_fmts[] = {
96
96
/* Order important - see above */
97
97
{V4L2_MBUS_FMT_Y10_1X10, V4L2_COLORSPACE_JPEG},
98
-
{V4L2_MBUS_FMT_GREY8_1X8, V4L2_COLORSPACE_JPEG},
98
+
{V4L2_MBUS_FMT_Y8_1X8, V4L2_COLORSPACE_JPEG},
99
99
};
100
100
101
101
struct mt9v022 {
···
392
392
* icd->try_fmt(), datawidth is from our supported format list
393
393
*/
394
394
switch (mf->code) {
395
-
case V4L2_MBUS_FMT_GREY8_1X8:
395
+
case V4L2_MBUS_FMT_Y8_1X8:
396
396
case V4L2_MBUS_FMT_Y10_1X10:
397
397
if (mt9v022->model != V4L2_IDENT_MT9V022IX7ATM)
398
398
return -EINVAL;
+5
-5
drivers/media/video/ov6650.c
+5
-5
drivers/media/video/ov6650.c
···
207
207
V4L2_MBUS_FMT_YVYU8_2X8,
208
208
V4L2_MBUS_FMT_VYUY8_2X8,
209
209
V4L2_MBUS_FMT_SBGGR8_1X8,
210
-
V4L2_MBUS_FMT_GREY8_1X8,
210
+
V4L2_MBUS_FMT_Y8_1X8,
211
211
};
212
212
213
213
static const struct v4l2_queryctrl ov6650_controls[] = {
···
800
800
801
801
/* select color matrix configuration for given color encoding */
802
802
switch (code) {
803
-
case V4L2_MBUS_FMT_GREY8_1X8:
803
+
case V4L2_MBUS_FMT_Y8_1X8:
804
804
dev_dbg(&client->dev, "pixel format GREY8_1X8\n");
805
805
coma_mask |= COMA_RGB | COMA_WORD_SWAP | COMA_BYTE_SWAP;
806
806
coma_set |= COMA_BW;
···
846
846
}
847
847
priv->code = code;
848
848
849
-
if (code == V4L2_MBUS_FMT_GREY8_1X8 ||
849
+
if (code == V4L2_MBUS_FMT_Y8_1X8 ||
850
850
code == V4L2_MBUS_FMT_SBGGR8_1X8) {
851
851
coml_mask = COML_ONE_CHANNEL;
852
852
coml_set = 0;
···
936
936
937
937
switch (mf->code) {
938
938
case V4L2_MBUS_FMT_Y10_1X10:
939
-
mf->code = V4L2_MBUS_FMT_GREY8_1X8;
940
-
case V4L2_MBUS_FMT_GREY8_1X8:
939
+
mf->code = V4L2_MBUS_FMT_Y8_1X8;
940
+
case V4L2_MBUS_FMT_Y8_1X8:
941
941
case V4L2_MBUS_FMT_YVYU8_2X8:
942
942
case V4L2_MBUS_FMT_YUYV8_2X8:
943
943
case V4L2_MBUS_FMT_VYUY8_2X8:
+3
-3
drivers/media/video/sh_mobile_csi2.c
+3
-3
drivers/media/video/sh_mobile_csi2.c
···
56
56
switch (mf->code) {
57
57
case V4L2_MBUS_FMT_UYVY8_2X8: /* YUV422 */
58
58
case V4L2_MBUS_FMT_YUYV8_1_5X8: /* YUV420 */
59
-
case V4L2_MBUS_FMT_GREY8_1X8: /* RAW8 */
59
+
case V4L2_MBUS_FMT_Y8_1X8: /* RAW8 */
60
60
case V4L2_MBUS_FMT_SBGGR8_1X8:
61
61
case V4L2_MBUS_FMT_SGRBG8_1X8:
62
62
break;
···
67
67
break;
68
68
case SH_CSI2I:
69
69
switch (mf->code) {
70
-
case V4L2_MBUS_FMT_GREY8_1X8: /* RAW8 */
70
+
case V4L2_MBUS_FMT_Y8_1X8: /* RAW8 */
71
71
case V4L2_MBUS_FMT_SBGGR8_1X8:
72
72
case V4L2_MBUS_FMT_SGRBG8_1X8:
73
73
case V4L2_MBUS_FMT_SBGGR10_1X10: /* RAW10 */
···
111
111
case V4L2_MBUS_FMT_RGB565_2X8_BE:
112
112
tmp |= 0x22; /* RGB565 */
113
113
break;
114
-
case V4L2_MBUS_FMT_GREY8_1X8:
114
+
case V4L2_MBUS_FMT_Y8_1X8:
115
115
case V4L2_MBUS_FMT_SBGGR8_1X8:
116
116
case V4L2_MBUS_FMT_SGRBG8_1X8:
117
117
tmp |= 0x2a; /* RAW8 */
+1
-1
drivers/media/video/soc_mediabus.c
+1
-1
drivers/media/video/soc_mediabus.c
+1
-1
include/linux/v4l2-mediabus.h
+1
-1
include/linux/v4l2-mediabus.h