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

Update the 3.10 rasperry patches by rebasing raspberry/rpi-3.10-y
against linux-stable/v3.10.49.

Signed-off-by: Florian Fainelli <florian@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42678 3c298f89-4303-0410-b956-a3cf2f4a3e73

1 files changed, 21 insertions, 10 deletions

diff --git a/target/linux/brcm2708/patches-3.10/0136-V4L2-Add-support-for-frame-rate-control.patch b/target/linux/brcm2708/patches-3.10/0136-V4L2-Add-support-for-frame-rate-control.patch
index 36897db1c0..3c971dec66 100644
--- a/target/linux/brcm2708/patches-3.10/0136-V4L2-Add-support-for-frame-rate-control.patch
+++ b/target/linux/brcm2708/patches-3.10/0136-V4L2-Add-support-for-frame-rate-control.patch
@@ -1,7 +1,7 @@
-From 980348ac7301c266ddbed9256ad9835cbda6e719 Mon Sep 17 00:00:00 2001
+From 4991eec9f8b1cd048c8df5fcb8da8f5046ed444f Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dsteve@broadcom.com>
 Date: Fri, 13 Dec 2013 15:54:13 +0000
-Subject: [PATCH 136/174] V4L2: Add support for frame rate control.
+Subject: [PATCH 136/196] V4L2: Add support for frame rate control.
 
 Add support for frame rate (or time per frame as V4L2
 inverts it) control via s_parm.
@@ -14,9 +14,11 @@ Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
  drivers/media/platform/bcm2835/mmal-parameters.h |   5 +
  4 files changed, 116 insertions(+), 13 deletions(-)
 
+diff --git a/drivers/media/platform/bcm2835/bcm2835-camera.c b/drivers/media/platform/bcm2835/bcm2835-camera.c
+index 2743074..8c38d03 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-camera.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-camera.c
-@@ -55,6 +55,15 @@ MODULE_PARM_DESC(bcm2835_v4l2_debug, "De
+@@ -55,6 +55,15 @@ MODULE_PARM_DESC(bcm2835_v4l2_debug, "Debug level 0-2");
  
  static struct bm2835_mmal_dev *gdev;	/* global device data */
  
@@ -32,7 +34,7 @@ Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
  /* video formats */
  static struct mmal_fmt formats[] = {
  	{
-@@ -869,8 +878,10 @@ static int mmal_setup_components(struct
+@@ -869,8 +878,10 @@ static int mmal_setup_components(struct bm2835_mmal_dev *dev,
  	camera_port->es.video.crop.y = 0;
  	camera_port->es.video.crop.width = f->fmt.pix.width;
  	camera_port->es.video.crop.height = f->fmt.pix.height;
@@ -45,7 +47,7 @@ Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
  
  	ret = vchiq_mmal_port_set_format(dev->instance, camera_port);
  
-@@ -1064,6 +1075,90 @@ static int vidioc_s_fmt_vid_cap(struct f
+@@ -1064,6 +1075,90 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
  	return ret;
  }
  
@@ -136,7 +138,7 @@ Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
  static const struct v4l2_ioctl_ops camera0_ioctl_ops = {
  	/* overlay */
  	.vidioc_enum_fmt_vid_overlay = vidioc_enum_fmt_vid_overlay,
-@@ -1092,6 +1187,9 @@ static const struct v4l2_ioctl_ops camer
+@@ -1092,6 +1187,9 @@ static const struct v4l2_ioctl_ops camera0_ioctl_ops = {
  	.vidioc_querybuf = vb2_ioctl_querybuf,
  	.vidioc_qbuf = vb2_ioctl_qbuf,
  	.vidioc_dqbuf = vb2_ioctl_dqbuf,
@@ -146,7 +148,7 @@ Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
  	.vidioc_streamon = vb2_ioctl_streamon,
  	.vidioc_streamoff = vb2_ioctl_streamoff,
  
-@@ -1184,8 +1282,10 @@ static int __init mmal_init(struct bm283
+@@ -1184,8 +1282,10 @@ static int __init mmal_init(struct bm2835_mmal_dev *dev)
  	format->es->video.crop.y = 0;
  	format->es->video.crop.width = 1024;
  	format->es->video.crop.height = 768;
@@ -159,7 +161,7 @@ Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
  
  	format =
  	    &dev->component[MMAL_COMPONENT_CAMERA]->
-@@ -1200,8 +1300,10 @@ static int __init mmal_init(struct bm283
+@@ -1200,8 +1300,10 @@ static int __init mmal_init(struct bm2835_mmal_dev *dev)
  	format->es->video.crop.y = 0;
  	format->es->video.crop.width = 1024;
  	format->es->video.crop.height = 768;
@@ -172,7 +174,7 @@ Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
  
  	format =
  	    &dev->component[MMAL_COMPONENT_CAMERA]->
-@@ -1222,6 +1324,7 @@ static int __init mmal_init(struct bm283
+@@ -1222,6 +1324,7 @@ static int __init mmal_init(struct bm2835_mmal_dev *dev)
  	dev->capture.height = format->es->video.height;
  	dev->capture.fmt = &formats[0];
  	dev->capture.encode_component = NULL;
@@ -180,6 +182,8 @@ Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
  
  	/* get the preview component ready */
  	ret = vchiq_mmal_component_init(
+diff --git a/drivers/media/platform/bcm2835/bcm2835-camera.h b/drivers/media/platform/bcm2835/bcm2835-camera.h
+index a53c3bd..0f29b1a 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-camera.h
 +++ b/drivers/media/platform/bcm2835/bcm2835-camera.h
 @@ -32,9 +32,6 @@ enum {
@@ -200,9 +204,11 @@ Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
  
  		/* H264 encode bitrate */
  		int         encode_bitrate;
+diff --git a/drivers/media/platform/bcm2835/controls.c b/drivers/media/platform/bcm2835/controls.c
+index 7cc97c8..e965ca3 100644
 --- a/drivers/media/platform/bcm2835/controls.c
 +++ b/drivers/media/platform/bcm2835/controls.c
-@@ -152,10 +152,7 @@ static int ctrl_set_rational(struct bm28
+@@ -152,10 +152,7 @@ static int ctrl_set_rational(struct bm2835_mmal_dev *dev,
  		      struct v4l2_ctrl *ctrl,
  		      const struct bm2835_mmal_v4l2_ctrl *mmal_ctrl)
  {
@@ -214,6 +220,8 @@ Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
  	struct vchiq_mmal_port *control;
  
  	control = &dev->component[MMAL_COMPONENT_CAMERA]->control;
+diff --git a/drivers/media/platform/bcm2835/mmal-parameters.h b/drivers/media/platform/bcm2835/mmal-parameters.h
+index b3d2c39..0f2bd50 100644
 --- a/drivers/media/platform/bcm2835/mmal-parameters.h
 +++ b/drivers/media/platform/bcm2835/mmal-parameters.h
 @@ -164,6 +164,11 @@ enum mmal_parameter_camera_type {
@@ -228,3 +236,6 @@ Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
  enum mmal_parameter_camera_config_timestamp_mode {
  	MMAL_PARAM_TIMESTAMP_MODE_ZERO = 0, /* Always timestamp frames as 0 */
  	MMAL_PARAM_TIMESTAMP_MODE_RAW_STC,  /* Use the raw STC value
+-- 
+1.9.1
+