aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/gspca/spca561.c6
-rw-r--r--include/linux/videodev2.h1
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/media/video/gspca/spca561.c b/drivers/media/video/gspca/spca561.c
index a94e6270115..dbd1648a655 100644
--- a/drivers/media/video/gspca/spca561.c
+++ b/drivers/media/video/gspca/spca561.c
@@ -98,8 +98,8 @@ static struct ctrl sd_ctrls[] = {
};
static struct cam_mode sif_mode[] = {
- {V4L2_PIX_FMT_SPCA561, 160, 120, 3},
- {V4L2_PIX_FMT_SPCA561, 176, 144, 2},
+ {V4L2_PIX_FMT_SGBRG8, 160, 120, 3},
+ {V4L2_PIX_FMT_SGBRG8, 176, 144, 2},
{V4L2_PIX_FMT_SPCA561, 320, 240, 1},
{V4L2_PIX_FMT_SPCA561, 352, 288, 0},
};
@@ -808,7 +808,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
gspca_frame_add(gspca_dev, FIRST_PACKET,
frame, data, len);
} else {
- /*fixme: which format?*/
+ /* raw bayer (with a header, which we skip) */
data += 20;
len -= 20;
gspca_frame_add(gspca_dev, FIRST_PACKET,
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index 43a6c81a53e..577f1563479 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -310,6 +310,7 @@ struct v4l2_pix_format
/* see http://www.siliconimaging.com/RGB%20Bayer.htm */
#define V4L2_PIX_FMT_SBGGR8 v4l2_fourcc('B','A','8','1') /* 8 BGBG.. GRGR.. */
+#define V4L2_PIX_FMT_SGBRG8 v4l2_fourcc('G','B','R','G') /* 8 GBGB.. RGRG.. */
#define V4L2_PIX_FMT_SBGGR16 v4l2_fourcc('B','Y','R','2') /* 16 BGBG.. GRGR.. */
/* compressed formats */