aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/ov6650.c
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2010-09-28 06:01:44 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-03-22 03:53:23 -0400
commit076704332ca6da550cbc279918ef8b88b4ac1e45 (patch)
tree0a924fb5817d63f33f329992372d3a4215d10d80 /drivers/media/video/ov6650.c
parent84d0688dfc7eedb2147532bf52ff7073d5c3c7b9 (diff)
[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>
Diffstat (limited to 'drivers/media/video/ov6650.c')
-rw-r--r--drivers/media/video/ov6650.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/video/ov6650.c b/drivers/media/video/ov6650.c
index cf93de988068..fe8e3ebd9ce4 100644
--- a/drivers/media/video/ov6650.c
+++ b/drivers/media/video/ov6650.c
@@ -207,7 +207,7 @@ static enum v4l2_mbus_pixelcode ov6650_codes[] = {
207 V4L2_MBUS_FMT_YVYU8_2X8, 207 V4L2_MBUS_FMT_YVYU8_2X8,
208 V4L2_MBUS_FMT_VYUY8_2X8, 208 V4L2_MBUS_FMT_VYUY8_2X8,
209 V4L2_MBUS_FMT_SBGGR8_1X8, 209 V4L2_MBUS_FMT_SBGGR8_1X8,
210 V4L2_MBUS_FMT_GREY8_1X8, 210 V4L2_MBUS_FMT_Y8_1X8,
211}; 211};
212 212
213static const struct v4l2_queryctrl ov6650_controls[] = { 213static const struct v4l2_queryctrl ov6650_controls[] = {
@@ -800,7 +800,7 @@ static int ov6650_s_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *mf)
800 800
801 /* select color matrix configuration for given color encoding */ 801 /* select color matrix configuration for given color encoding */
802 switch (code) { 802 switch (code) {
803 case V4L2_MBUS_FMT_GREY8_1X8: 803 case V4L2_MBUS_FMT_Y8_1X8:
804 dev_dbg(&client->dev, "pixel format GREY8_1X8\n"); 804 dev_dbg(&client->dev, "pixel format GREY8_1X8\n");
805 coma_mask |= COMA_RGB | COMA_WORD_SWAP | COMA_BYTE_SWAP; 805 coma_mask |= COMA_RGB | COMA_WORD_SWAP | COMA_BYTE_SWAP;
806 coma_set |= COMA_BW; 806 coma_set |= COMA_BW;
@@ -846,7 +846,7 @@ static int ov6650_s_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *mf)
846 } 846 }
847 priv->code = code; 847 priv->code = code;
848 848
849 if (code == V4L2_MBUS_FMT_GREY8_1X8 || 849 if (code == V4L2_MBUS_FMT_Y8_1X8 ||
850 code == V4L2_MBUS_FMT_SBGGR8_1X8) { 850 code == V4L2_MBUS_FMT_SBGGR8_1X8) {
851 coml_mask = COML_ONE_CHANNEL; 851 coml_mask = COML_ONE_CHANNEL;
852 coml_set = 0; 852 coml_set = 0;
@@ -936,8 +936,8 @@ static int ov6650_try_fmt(struct v4l2_subdev *sd,
936 936
937 switch (mf->code) { 937 switch (mf->code) {
938 case V4L2_MBUS_FMT_Y10_1X10: 938 case V4L2_MBUS_FMT_Y10_1X10:
939 mf->code = V4L2_MBUS_FMT_GREY8_1X8; 939 mf->code = V4L2_MBUS_FMT_Y8_1X8;
940 case V4L2_MBUS_FMT_GREY8_1X8: 940 case V4L2_MBUS_FMT_Y8_1X8:
941 case V4L2_MBUS_FMT_YVYU8_2X8: 941 case V4L2_MBUS_FMT_YVYU8_2X8:
942 case V4L2_MBUS_FMT_YUYV8_2X8: 942 case V4L2_MBUS_FMT_YUYV8_2X8:
943 case V4L2_MBUS_FMT_VYUY8_2X8: 943 case V4L2_MBUS_FMT_VYUY8_2X8: