brcm2708: update 3.10 patches with raspberrypi/rpi-3.10.y of 27 Apr. 2014

[openwrt/svn-archive/archive.git] / target / linux / brcm2708 / patches-3.10 / 0135-V4L2-Add-flicker-avoidance-controls.patch

diff --git a/target/linux/brcm2708/patches-3.10/0135-V4L2-Add-flicker-avoidance-controls.patch b/target/linux/brcm2708/patches-3.10/0135-V4L2-Add-flicker-avoidance-controls.patch
index b67a8bafc765746d3444bec0e5448d78317f8e81..fcbe95f615327c49b10dca8e5a80d2de0a040a3c 100644 (file)
--- a/target/linux/brcm2708/patches-3.10/0135-V4L2-Add-flicker-avoidance-controls.patch
+++ b/target/linux/brcm2708/patches-3.10/0135-V4L2-Add-flicker-avoidance-controls.patch
@@ -1,7 +1,7 @@
-From 9d80a4ce15c265530d8372a3577748123e365ee3 Mon Sep 17 00:00:00 2001
+From 7158cb41bff61dc6e3aee5b243ba0d6fbafe35bc Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dsteve@broadcom.com>
 Date: Mon, 9 Dec 2013 16:40:24 +0000
-Subject: [PATCH 135/174] V4L2: Add flicker avoidance controls
+Subject: [PATCH 135/196] V4L2: Add flicker avoidance controls
 
 Add support for V4L2_CID_POWER_LINE_FREQUENCY to set flicker
 avoidance frequencies.
@@ -13,6 +13,8 @@ Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
  drivers/media/platform/bcm2835/mmal-parameters.h |  8 +++++
  3 files changed, 51 insertions(+), 1 deletion(-)
 
+diff --git a/drivers/media/platform/bcm2835/bcm2835-camera.h b/drivers/media/platform/bcm2835/bcm2835-camera.h
+index 5640492..a53c3bd 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-camera.h
 +++ b/drivers/media/platform/bcm2835/bcm2835-camera.h
 @@ -15,7 +15,7 @@
@@ -24,6 +26,8 @@ Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
  
  enum {
        MMAL_COMPONENT_CAMERA = 0,
+diff --git a/drivers/media/platform/bcm2835/controls.c b/drivers/media/platform/bcm2835/controls.c
+index 92863f7..7cc97c8 100644
 --- a/drivers/media/platform/bcm2835/controls.c
 +++ b/drivers/media/platform/bcm2835/controls.c
 @@ -56,6 +56,13 @@ static const s64 iso_qmenu[] = {
@@ -40,7 +44,7 @@ Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
  /* Supported video encode modes */
  static const s64 bitrate_mode_qmenu[] = {
        (s64)V4L2_MPEG_VIDEO_BITRATE_MODE_VBR,
-@@ -373,6 +380,35 @@ static int ctrl_set_metering_mode(struct
+@@ -373,6 +380,35 @@ static int ctrl_set_metering_mode(struct bm2835_mmal_dev *dev,
                                             &u32_value, sizeof(u32_value));
  }
  
@@ -76,7 +80,7 @@ Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
  static int ctrl_set_awb_mode(struct bm2835_mmal_dev *dev,
                      struct v4l2_ctrl *ctrl,
                      const struct bm2835_mmal_v4l2_ctrl *mmal_ctrl)
-@@ -706,6 +742,12 @@ static const struct bm2835_mmal_v4l2_ctr
+@@ -706,6 +742,12 @@ static const struct bm2835_mmal_v4l2_ctrl v4l2_ctrls[V4L2_CTRL_COUNT] = {
                30, 1, NULL,
                MMAL_PARAMETER_JPEG_Q_FACTOR, &ctrl_set_image_encode_output
        },
@@ -89,6 +93,8 @@ Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
  };
  
  int bm2835_mmal_set_all_camera_controls(struct bm2835_mmal_dev *dev)
+diff --git a/drivers/media/platform/bcm2835/mmal-parameters.h b/drivers/media/platform/bcm2835/mmal-parameters.h
+index d8aace5..b3d2c39 100644
 --- a/drivers/media/platform/bcm2835/mmal-parameters.h
 +++ b/drivers/media/platform/bcm2835/mmal-parameters.h
 @@ -271,6 +271,14 @@ enum mmal_parameter_imagefx {
@@ -106,3 +112,6 @@ Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
  /** Manner of video rate control */
  enum mmal_parameter_rate_control_mode {
        MMAL_VIDEO_RATECONTROL_DEFAULT,
+-- 
+1.9.1
+