diff options
author | Hans de Goede <hdegoede@redhat.com> | 2012-07-02 14:29:56 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-07-30 17:41:06 -0400 |
commit | a8931d5948cdd55f899f107c61f375d34a580304 (patch) | |
tree | f04260cc2e13c4aaf499492279d0b3e6e6fea264 | |
parent | 9a3dafe43125e88a8a365a1fe81fdd8df0eb5eee (diff) |
[media] gscpa_spca561: Add brightness control for rev12a cams
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/video/gspca/spca561.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/drivers/media/video/gspca/spca561.c b/drivers/media/video/gspca/spca561.c index 7ea5e9112b2f..cfe71dd6747d 100644 --- a/drivers/media/video/gspca/spca561.c +++ b/drivers/media/video/gspca/spca561.c | |||
@@ -463,16 +463,21 @@ static int sd_init_72a(struct gspca_dev *gspca_dev) | |||
463 | return 0; | 463 | return 0; |
464 | } | 464 | } |
465 | 465 | ||
466 | /* rev 72a only */ | ||
467 | static void setbrightness(struct gspca_dev *gspca_dev, s32 val) | 466 | static void setbrightness(struct gspca_dev *gspca_dev, s32 val) |
468 | { | 467 | { |
468 | struct sd *sd = (struct sd *) gspca_dev; | ||
469 | struct usb_device *dev = gspca_dev->dev; | 469 | struct usb_device *dev = gspca_dev->dev; |
470 | __u16 reg; | ||
470 | 471 | ||
471 | /* offsets for white balance */ | 472 | if (sd->chip_revision == Rev012A) |
472 | reg_w_val(dev, 0x8611, val); /* R */ | 473 | reg = 0x8610; |
473 | reg_w_val(dev, 0x8612, val); /* Gr */ | 474 | else |
474 | reg_w_val(dev, 0x8613, val); /* B */ | 475 | reg = 0x8611; |
475 | reg_w_val(dev, 0x8614, val); /* Gb */ | 476 | |
477 | reg_w_val(dev, reg + 0, val); /* R */ | ||
478 | reg_w_val(dev, reg + 1, val); /* Gr */ | ||
479 | reg_w_val(dev, reg + 2, val); /* B */ | ||
480 | reg_w_val(dev, reg + 3, val); /* Gb */ | ||
476 | } | 481 | } |
477 | 482 | ||
478 | static void setwhite(struct gspca_dev *gspca_dev, s32 white, s32 contrast) | 483 | static void setwhite(struct gspca_dev *gspca_dev, s32 white, s32 contrast) |
@@ -815,6 +820,8 @@ static int sd_init_controls_12a(struct gspca_dev *gspca_dev) | |||
815 | v4l2_ctrl_new_std(hdl, &sd_ctrl_ops, | 820 | v4l2_ctrl_new_std(hdl, &sd_ctrl_ops, |
816 | V4L2_CID_HUE, 1, 0x7f, 1, 0x40); | 821 | V4L2_CID_HUE, 1, 0x7f, 1, 0x40); |
817 | v4l2_ctrl_new_std(hdl, &sd_ctrl_ops, | 822 | v4l2_ctrl_new_std(hdl, &sd_ctrl_ops, |
823 | V4L2_CID_BRIGHTNESS, -128, 127, 1, 0); | ||
824 | v4l2_ctrl_new_std(hdl, &sd_ctrl_ops, | ||
818 | V4L2_CID_EXPOSURE, 1, EXPOSURE_MAX, 1, 700); | 825 | V4L2_CID_EXPOSURE, 1, EXPOSURE_MAX, 1, 700); |
819 | v4l2_ctrl_new_std(hdl, &sd_ctrl_ops, | 826 | v4l2_ctrl_new_std(hdl, &sd_ctrl_ops, |
820 | V4L2_CID_GAIN, 0, 255, 1, 63); | 827 | V4L2_CID_GAIN, 0, 255, 1, 63); |