rpms/kernel/devel kernel.spec, 1.1452, 1.1453 linux-2.6-v4l-dvb-update.patch, 1.10, 1.11

[Mauro Carvalho Chehab]

Author: mchehab

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14190

Modified Files:
	kernel.spec linux-2.6-v4l-dvb-update.patch 
Log Message:
More 30 V4L/DVB patches applied at linux-next.

This time, adds the cafe_ccic conversion to v4l2 subdev model, and applies
some fixes at the drivers.

Also, removes the patch that fixes v4l merge conflicts, since the correponding
changes were incorporated at the main v4l-dvb patches.

V4L/DVB (11098): v4l2-common: remove incorrect MODULE test
V4L/DVB (11100): au8522: fix compilation warning.
V4L/DVB (11103): gspca - main: May have isochronous transfers on altsetting 0
V4L/DVB (11104): gspca - ov534: Bad frame pointer after adding the last packet
V4L/DVB (11105): gspca - ov534: Adjust the packet scan function
V4L/DVB (11106): gspca - ov534: New sensor ov965x and re-enable the webcam 06f8
:3003
V4L/DVB (11108): get_dvb_firmware: Add option to download firmware for cx231xx
V4L/DVB (11109): au0828: Fix compilation when VIDEO_ADV_DEBUG = n
V4L/DVB (11110): au8522/au0828: Fix Kconfig dependencies
V4L/DVB (11111a): MAINTAINERS: Drop references to deprecated video4linux list
V4L/DVB (11111): dvb_dummy_fe: Fix compilation breakage
V4L/DVB (11112): v4l2-subdev: add support for TRY_FMT, ENUM_FMT and G/S_PARM.
V4L/DVB (11113): ov7670: convert to v4l2_subdev
V4L/DVB (11114): cafe_ccic: convert to v4l2_device.
V4L/DVB (11115): cafe_ccic: use v4l2_subdev to talk to the ov7670 sensor.
V4L/DVB (11116): ov7670: cleanup and remove legacy code.
V4L/DVB (11117): ov7670: add support to get/set registers
V4L/DVB (11118): cafe_ccic: replace debugfs with g/s_register ioctls.
V4L/DVB (11120): cafe_ccic: stick in a comment with a request for test results
V4L/DVB (11124): Add support for ProVideo PV-183 to bttv




Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1452
retrieving revision 1.1453
diff -u -r1.1452 -r1.1453
--- kernel.spec	19 Mar 2009 22:31:11 -0000	1.1452
+++ kernel.spec	20 Mar 2009 07:36:33 -0000	1.1453
@@ -681,7 +681,6 @@
 Patch2899: linux-2.6-v4l-dvb-fixes.patch
 Patch2900: linux-2.6-v4l-dvb-update.patch
 Patch2901: linux-2.6-v4l-dvb-experimental.patch
-Patch2904: v4l-build-fixes.patch
 
 # fs fixes
 Patch2920: linux-2.6-ext4-flush-on-close.patch
@@ -1229,7 +1228,6 @@
 ApplyPatch linux-2.6-v4l-dvb-fixes.patch
 ApplyPatch linux-2.6-v4l-dvb-update.patch
 ApplyPatch linux-2.6-v4l-dvb-experimental.patch
-ApplyPatch v4l-build-fixes.patch
 
 # revert 8b249b6856f16f09b0e5b79ce5f4d435e439b9d6
 ApplyPatch revert-fix-modules_install-via-nfs.patch
@@ -1819,6 +1817,9 @@
 # and build.
 
 %changelog
+* Thu Mar 19 2009 Mauro Carvalho Chehab <mchehab at redhat.com>
+- update v4l-dvb to reflect changes at linux-next
+
 * Thu Mar 19 2009 Matthew Garrett <mjg at redhat.com>
 - linux-2.6-acpi-video-didl-intel-outputs.patch
    don't attempt to re-register the backlight device on resume

linux-2.6-v4l-dvb-update.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.10 -r 1.11 linux-2.6-v4l-dvb-update.patch
Index: linux-2.6-v4l-dvb-update.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-v4l-dvb-update.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- linux-2.6-v4l-dvb-update.patch	19 Mar 2009 01:55:34 -0000	1.10
+++ linux-2.6-v4l-dvb-update.patch	20 Mar 2009 07:36:33 -0000	1.11
@@ -9,6 +9,9 @@
       V4L/DVB (10639): gspca - sq905: New subdriver.
       V4L/DVB (10829): Support alternate resolutions for sq905
 
+Alan McIvor (1):
+      V4L/DVB (11124): Add support for ProVideo PV-183 to bttv
+
 Alexey Klimov (18):
       V4L/DVB (10316): v4l/dvb: use usb_make_path in usb-radio drivers
       V4L/DVB (10324): em28xx: Correct mailing list
@@ -161,7 +164,7 @@
       V4L/DVB (11026): sh-mobile-ceu-camera: set field to the value, configured at open()
       V4L/DVB (11027): soc-camera: configure drivers with a default format at probe time
 
-Hans Verkuil (132):
+Hans Verkuil (142):
       V4L/DVB (10231): v4l2-subdev: add v4l2_ext_controls support
       V4L/DVB (10244): v4l2: replace a few snprintfs with strlcpy
       V4L/DVB (10246): saa6752hs: convert to v4l2_subdev.
@@ -294,6 +297,16 @@
       V4L/DVB (11051): v4l-dvb: replace remaining references to the old mailinglist.
       V4L/DVB (11052): bt819: remove an unused header
       V4L/DVB (11053): saa7134: set v4l2_dev field of video_device
+      V4L/DVB (11098): v4l2-common: remove incorrect MODULE test
+      V4L/DVB (11100): au8522: fix compilation warning.
+      V4L/DVB (11112): v4l2-subdev: add support for TRY_FMT, ENUM_FMT and G/S_PARM.
+      V4L/DVB (11113): ov7670: convert to v4l2_subdev
+      V4L/DVB (11114): cafe_ccic: convert to v4l2_device.
+      V4L/DVB (11115): cafe_ccic: use v4l2_subdev to talk to the ov7670 sensor.
+      V4L/DVB (11116): ov7670: cleanup and remove legacy code.
+      V4L/DVB (11117): ov7670: add support to get/set registers
+      V4L/DVB (11118): cafe_ccic: replace debugfs with g/s_register ioctls.
+      V4L/DVB (11120): cafe_ccic: stick in a comment with a request for test results
 
 Hans Werner (1):
       V4L/DVB (10392): lnbp21: documentation about the system register
@@ -329,7 +342,7 @@
       V4L/DVB (11096): V4L2 Driver for the Hauppauge HD PVR usb capture device
       V4L/DVB (11097): use video_ioctl2 as ioctl handler directly
 
-Jean Delvare (7):
+Jean Delvare (8):
       V4L/DVB (10867): vino: fold i2c-algo-sgi code into vino.
       V4L/DVB (10931): zoran: Drop the lock_norm module parameter
       V4L/DVB (10932): zoran: Don't frighten users with failed buffer allocation
@@ -337,8 +350,9 @@
       V4L/DVB (10939): ir-kbd-i2c: Prevent general protection fault on rmmod
       V4L/DVB (10940): saa6588: Prevent general protection fault on rmmod
       V4L/DVB (10943): cx88: Prevent general protection fault on rmmod
+      V4L/DVB (11111a): MAINTAINERS: Drop references to deprecated video4linux list
 
-Jean-Francois Moine (60):
+Jean-Francois Moine (64):
       V4L/DVB (10332): gspca - main: Version change.
       V4L/DVB (10333): gspca - main and many subdrivers: Remove the epaddr variable.
       V4L/DVB (10337): gspca - common: Simplify the debug macros.
@@ -399,6 +413,10 @@
       V4L/DVB (10788): gspca - vc032x: Bad matrix for sensor mi1310_soc.
       V4L/DVB (11039): gspca - most jpeg subdrivers: Change the JPEG header creation.
       V4L/DVB (11040): gspca - most jpeg subdrivers: Have the JPEG quality settable.
+      V4L/DVB (11103): gspca - main: May have isochronous transfers on altsetting 0
+      V4L/DVB (11104): gspca - ov534: Bad frame pointer after adding the last packet
+      V4L/DVB (11105): gspca - ov534: Adjust the packet scan function
+      V4L/DVB (11106): gspca - ov534: New sensor ov965x and re-enable the webcam 06f8:3003
 
 Jochen Friedrich (2):
       V4L/DVB (10452): Add Freescale MC44S803 tuner driver
@@ -450,7 +468,7 @@
       V4L/DVB (10823): saa7134: add DVB support for Avermedia A700 cards
       V4L/DVB (10948): flexcop-pci: Print a message in case the new stream watchdog detects a problem
 
-Mauro Carvalho Chehab (38):
+Mauro Carvalho Chehab (42):
       V4L/DVB (10211): vivi: Implements 4 inputs on vivi
       V4L/DVB (10298): remove err macro from few usb devices
       V4L/DVB (10305): videobuf-vmalloc: Fix: videobuf memory were never freed
@@ -488,6 +506,10 @@
       V4L/DVB (10907): avoid loading the entire videodev.h header on V4L2 drivers
       V4L/DVB (10951): xc5000: Fix CodingStyle errors introduced by the last patch
       V4L/DVB (10908): videobuf-core: also needs a minimal subset of V4L1 header
+      V4L/DVB (11108): get_dvb_firmware: Add option to download firmware for cx231xx
+      V4L/DVB (11109): au0828: Fix compilation when VIDEO_ADV_DEBUG = n
+      V4L/DVB (11110): au8522/au0828: Fix Kconfig dependencies
+      V4L/DVB (11111): dvb_dummy_fe: Fix compilation breakage
       Merge branch 'next' of ../devel into Fedora
 
 Michael Krufky (35):
@@ -659,8 +681,41 @@
 sebastian.blanes at gmail.com (1):
       V4L/DVB (10824): Add "Sony PlayTV" to dibcom driver
 
+diff --git a/Documentation/dvb/get_dvb_firmware b/Documentation/dvb/get_dvb_firmware
+index f2e908d..72455b6 100644
+--- a/Documentation/dvb/get_dvb_firmware
++++ b/Documentation/dvb/get_dvb_firmware
+@@ -25,7 +25,7 @@ use IO::Handle;
+ 		"tda10046lifeview", "av7110", "dec2000t", "dec2540t",
+ 		"dec3000s", "vp7041", "dibusb", "nxt2002", "nxt2004",
+ 		"or51211", "or51132_qam", "or51132_vsb", "bluebird",
+-		"opera1");
++		"opera1", "cx231xx");
+ 
+ # Check args
+ syntax() if (scalar(@ARGV) != 1);
+@@ -345,6 +345,19 @@ sub or51211 {
+     $fwfile;
+ }
+ 
++sub cx231xx {
++    my $fwfile = "v4l-cx231xx-avcore-01.fw";
++    my $url = "http://linuxtv.org/downloads/firmware/$fwfile";
++    my $hash = "7d3bb956dc9df0eafded2b56ba57cc42";
++
++    checkstandard();
++
++    wgetfile($fwfile, $url);
++    verify($fwfile, $hash);
++
++    $fwfile;
++}
++
+ sub or51132_qam {
+     my $fwfile = "dvb-fe-or51132-qam.fw";
+     my $url = "http://linuxtv.org/downloads/firmware/$fwfile";
 diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
-index 5ddbe35..67ad81f 100644
+index 20d3b94..6e5b914 100644
 --- a/Documentation/feature-removal-schedule.txt
 +++ b/Documentation/feature-removal-schedule.txt
 @@ -37,10 +37,10 @@ Who:	Pavel Machek <pavel at suse.cz>
@@ -694,7 +749,7 @@
  'f'	00-1F	linux/ext2_fs.h
  'h'	00-7F				Charon filesystem
 diff --git a/Documentation/video4linux/CARDLIST.bttv b/Documentation/video4linux/CARDLIST.bttv
-index 0d93fa1..e177504 100644
+index 0d93fa1..f11c583 100644
 --- a/Documentation/video4linux/CARDLIST.bttv
 +++ b/Documentation/video4linux/CARDLIST.bttv
 @@ -135,7 +135,7 @@
@@ -706,13 +761,14 @@
  138 -> Prolink Pixelview PV-BT878P+ (Rev.2E)
  139 -> Prolink PixelView PlayTV MPEG2 PV-M4900
  140 -> Osprey 440                                          [0070:ff07]
-@@ -154,3 +154,6 @@
+@@ -154,3 +154,7 @@
  153 -> PHYTEC VD-012 (bt878)
  154 -> PHYTEC VD-012-X1 (bt878)
  155 -> PHYTEC VD-012-X2 (bt878)
 +156 -> IVCE-8784                                           [0000:f050,0001:f050,0002:f050,0003:f050]
 +157 -> Geovision GV-800(S) (master)                        [800a:763d]
 +158 -> Geovision GV-800(S) (slave)                         [800b:763d,800c:763d,800d:763d]
++159 -> ProVideo PV183                                      [1830:1540,1831:1540,1832:1540,1833:1540,1834:1540,1835:1540,1836:1540,1837:1540]
 diff --git a/Documentation/video4linux/CARDLIST.cx23885 b/Documentation/video4linux/CARDLIST.cx23885
 index 35ea130..91aa3c0 100644
 --- a/Documentation/video4linux/CARDLIST.cx23885
@@ -1242,6 +1298,26 @@
  0x0a17  0x004e   Pentax          Optio 50
  0x041e  0x405d   Creative        DiVi CAM 516
 +0x08ca  0x2102   Aiptek          DV T300
+diff --git a/MAINTAINERS b/MAINTAINERS
+index 5d460c9..b41a4dc 100644
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -1040,7 +1040,6 @@ BTTV VIDEO4LINUX DRIVER
+ P:	Mauro Carvalho Chehab
+ M:	mchehab at infradead.org
+ L:	linux-media at vger.kernel.org
+-L:	video4linux-list at redhat.com
+ W:	http://linuxtv.org
+ T:	git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
+ S:	Maintained
+@@ -4746,7 +4745,6 @@ VIDEO FOR LINUX (V4L)
+ P:	Mauro Carvalho Chehab
+ M:	mchehab at infradead.org
+ L:	linux-media at vger.kernel.org
+-L:	video4linux-list at redhat.com
+ W:	http://linuxtv.org
+ T:	git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
+ S:	Maintained
 diff --git a/arch/arm/mach-pxa/pcm990-baseboard.c b/arch/arm/mach-pxa/pcm990-baseboard.c
 index 34841c7..fd8f786 100644
 --- a/arch/arm/mach-pxa/pcm990-baseboard.c
@@ -1375,10 +1451,10 @@
 +
 +#endif
 diff --git a/arch/sh/boards/board-ap325rxa.c b/arch/sh/boards/board-ap325rxa.c
-index 72da416..3bdf199 100644
+index 15b6d45..5188adc 100644
 --- a/arch/sh/boards/board-ap325rxa.c
 +++ b/arch/sh/boards/board-ap325rxa.c
-@@ -298,7 +298,8 @@ static struct platform_device camera_device = {
+@@ -299,7 +299,8 @@ static struct platform_device camera_device = {
[...5965 lines suppressed...]
+ 	BUG_ON(!dev);
+-#ifdef MODULE
++
+ 	if (module_name)
+ 		request_module(module_name);
+-#endif
++
+ 	/* Setup the i2c board info with the device type and
+ 	   the device address. */
+ 	memset(&info, 0, sizeof(info));
 @@ -927,11 +814,11 @@ struct v4l2_subdev *v4l2_i2c_new_subdev(struct i2c_adapter *adapter,
  	   We need better support from the kernel so that we
  	   can easily wait for the load to finish. */
@@ -80859,6 +85262,19 @@
  }
  EXPORT_SYMBOL_GPL(v4l2_i2c_new_subdev);
  
+@@ -958,10 +850,10 @@ struct v4l2_subdev *v4l2_i2c_new_probed_subdev(struct i2c_adapter *adapter,
+ 	struct i2c_board_info info;
+ 
+ 	BUG_ON(!dev);
+-#ifdef MODULE
++
+ 	if (module_name)
+ 		request_module(module_name);
+-#endif
++
+ 	/* Setup the i2c board info with the device type and
+ 	   the device address. */
+ 	memset(&info, 0, sizeof(info));
 @@ -974,11 +866,11 @@ struct v4l2_subdev *v4l2_i2c_new_probed_subdev(struct i2c_adapter *adapter,
  	   We need better support from the kernel so that we
  	   can easily wait for the load to finish. */
@@ -81569,7 +85985,7 @@
  
  	if (is_ext_ctrl) {
 diff --git a/drivers/media/video/v4l2-subdev.c b/drivers/media/video/v4l2-subdev.c
-index 2120880..923ec8d 100644
+index 2120880..dc88167 100644
 --- a/drivers/media/video/v4l2-subdev.c
 +++ b/drivers/media/video/v4l2-subdev.c
 @@ -33,6 +33,12 @@ int v4l2_subdev_command(struct v4l2_subdev *sd, unsigned cmd, void *arg)
@@ -81585,7 +86001,17 @@
  	case VIDIOC_QUERYMENU:
  		return v4l2_subdev_call(sd, core, querymenu, arg);
  	case VIDIOC_LOG_STATUS:
-@@ -98,6 +104,10 @@ int v4l2_subdev_command(struct v4l2_subdev *sd, unsigned cmd, void *arg)
+@@ -92,16 +98,28 @@ int v4l2_subdev_command(struct v4l2_subdev *sd, unsigned cmd, void *arg)
+ 		return v4l2_subdev_call(sd, video, g_vbi_data, arg);
+ 	case VIDIOC_G_SLICED_VBI_CAP:
+ 		return v4l2_subdev_call(sd, video, g_sliced_vbi_cap, arg);
++	case VIDIOC_ENUM_FMT:
++		return v4l2_subdev_call(sd, video, enum_fmt, arg);
++	case VIDIOC_TRY_FMT:
++		return v4l2_subdev_call(sd, video, try_fmt, arg);
+ 	case VIDIOC_S_FMT:
+ 		return v4l2_subdev_call(sd, video, s_fmt, arg);
+ 	case VIDIOC_G_FMT:
  		return v4l2_subdev_call(sd, video, g_fmt, arg);
  	case VIDIOC_INT_S_STD_OUTPUT:
  		return v4l2_subdev_call(sd, video, s_std_output, *(v4l2_std_id *)arg);
@@ -81596,6 +86022,14 @@
  	case VIDIOC_STREAMON:
  		return v4l2_subdev_call(sd, video, s_stream, 1);
  	case VIDIOC_STREAMOFF:
+ 		return v4l2_subdev_call(sd, video, s_stream, 0);
++	case VIDIOC_S_PARM:
++		return v4l2_subdev_call(sd, video, s_parm, arg);
++	case VIDIOC_G_PARM:
++		return v4l2_subdev_call(sd, video, g_parm, arg);
+ 
+ 	default:
+ 		return v4l2_subdev_call(sd, core, ioctl, cmd, arg);
 diff --git a/drivers/media/video/videobuf-dma-contig.c b/drivers/media/video/videobuf-dma-contig.c
 index 31944b1..6109fb5 100644
 --- a/drivers/media/video/videobuf-dma-contig.c
@@ -94291,7 +98725,7 @@
  
  extern unsigned long soc_camera_apply_sensor_flags(struct soc_camera_link *icl,
 diff --git a/include/media/v4l2-chip-ident.h b/include/media/v4l2-chip-ident.h
-index 9aaf652..ca2aa6d 100644
+index 9aaf652..1be461a 100644
 --- a/include/media/v4l2-chip-ident.h
 +++ b/include/media/v4l2-chip-ident.h
 @@ -37,10 +37,8 @@ enum {
@@ -94306,7 +98740,7 @@
  	V4L2_IDENT_SAA7113 = 103,
  	V4L2_IDENT_SAA7114 = 104,
  	V4L2_IDENT_SAA7115 = 105,
-@@ -63,30 +61,91 @@ enum {
+@@ -63,44 +61,96 @@ enum {
  	V4L2_IDENT_OV7720 = 251,
  	V4L2_IDENT_OV7725 = 252,
  
@@ -94393,12 +98827,48 @@
  	/* module wm8775: just ident 8775 */
  	V4L2_IDENT_WM8775 = 8775,
  
+-	/* module tw9910: just ident 9910 */
+-	V4L2_IDENT_TW9910 = 9910,
+-
+-	/* module cs53132a: just ident 53132 */
+-	V4L2_IDENT_CS53l32A = 53132,
+-
+-	/* module upd64031a: just ident 64031 */
+-	V4L2_IDENT_UPD64031A = 64031,
 +	/* module tda9840: just ident 9840 */
 +	V4L2_IDENT_TDA9840 = 9840,
+ 
+-	/* module upd64083: just ident 64083 */
+-	V4L2_IDENT_UPD64083 = 64083,
++	/* module cafe_ccic, just ident 8801 */
++	V4L2_IDENT_CAFE = 8801,
+ 
+-	/* module m52790: just ident 52790 */
+-	V4L2_IDENT_M52790 = 52790,
++	/* module tw9910: just ident 9910 */
++	V4L2_IDENT_TW9910 = 9910,
+ 
+ 	/* module msp3400: reserved range 34000-34999 and 44000-44999 */
+ 	V4L2_IDENT_MSPX4XX  = 34000, /* generic MSPX4XX identifier, only
+@@ -178,6 +228,18 @@ enum {
+ 	V4L2_IDENT_MT9V022IX7ATC	= 45010, /* No way to detect "normal" I77ATx */
+ 	V4L2_IDENT_MT9V022IX7ATM	= 45015, /* and "lead free" IA7ATx chips */
+ 	V4L2_IDENT_MT9T031		= 45020,
++
++	/* module cs53132a: just ident 53132 */
++	V4L2_IDENT_CS53l32A = 53132,
++
++	/* module upd64031a: just ident 64031 */
++	V4L2_IDENT_UPD64031A = 64031,
++
++	/* module upd64083: just ident 64083 */
++	V4L2_IDENT_UPD64083 = 64083,
 +
- 	/* module tw9910: just ident 9910 */
- 	V4L2_IDENT_TW9910 = 9910,
++	/* module m52790: just ident 52790 */
++	V4L2_IDENT_M52790 = 52790,
+ };
  
+ #endif
 diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h
 index 95e74f1..3a69056 100644
 --- a/include/media/v4l2-common.h
@@ -94573,7 +99043,7 @@
  				    int id, const char *name);
  /* Prints the ioctl in a human-readable format */
 diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
-index 37b09e5..1b97a2c 100644
+index 37b09e5..d7a72d2 100644
 --- a/include/media/v4l2-subdev.h
 +++ b/include/media/v4l2-subdev.h
 @@ -78,6 +78,9 @@ struct v4l2_subdev_core_ops {
@@ -94586,16 +99056,24 @@
  	int (*querymenu)(struct v4l2_subdev *sd, struct v4l2_querymenu *qm);
  	long (*ioctl)(struct v4l2_subdev *sd, unsigned int cmd, void *arg);
  #ifdef CONFIG_VIDEO_ADV_DEBUG
-@@ -112,6 +115,8 @@ struct v4l2_subdev_video_ops {
+@@ -112,9 +115,15 @@ struct v4l2_subdev_video_ops {
  	int (*g_vbi_data)(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_data *vbi_data);
  	int (*g_sliced_vbi_cap)(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_cap *cap);
  	int (*s_std_output)(struct v4l2_subdev *sd, v4l2_std_id std);
 +	int (*querystd)(struct v4l2_subdev *sd, v4l2_std_id *std);
 +	int (*g_input_status)(struct v4l2_subdev *sd, u32 *status);
  	int (*s_stream)(struct v4l2_subdev *sd, int enable);
- 	int (*s_fmt)(struct v4l2_subdev *sd, struct v4l2_format *fmt);
+-	int (*s_fmt)(struct v4l2_subdev *sd, struct v4l2_format *fmt);
++	int (*enum_fmt)(struct v4l2_subdev *sd, struct v4l2_fmtdesc *fmtdesc);
  	int (*g_fmt)(struct v4l2_subdev *sd, struct v4l2_format *fmt);
-@@ -132,7 +137,7 @@ struct v4l2_subdev_ops {
++	int (*try_fmt)(struct v4l2_subdev *sd, struct v4l2_format *fmt);
++	int (*s_fmt)(struct v4l2_subdev *sd, struct v4l2_format *fmt);
++	int (*g_parm)(struct v4l2_subdev *sd, struct v4l2_streamparm *param);
++	int (*s_parm)(struct v4l2_subdev *sd, struct v4l2_streamparm *param);
+ };
+ 
+ struct v4l2_subdev_ops {
+@@ -132,7 +141,7 @@ struct v4l2_subdev_ops {
  struct v4l2_subdev {
  	struct list_head list;
  	struct module *owner;
@@ -94604,7 +99082,7 @@
  	const struct v4l2_subdev_ops *ops;
  	/* name must be unique */
  	char name[V4L2_SUBDEV_NAME_SIZE];
-@@ -171,7 +176,7 @@ static inline void v4l2_subdev_init(struct v4l2_subdev *sd,
+@@ -171,7 +180,7 @@ static inline void v4l2_subdev_init(struct v4l2_subdev *sd,
  	/* ops->core MUST be set */
  	BUG_ON(!ops || !ops->core);
  	sd->ops = ops;
@@ -94613,7 +99091,7 @@
  	sd->name[0] = '\0';
  	sd->grp_id = 0;
  	sd->priv = NULL;
-@@ -186,4 +191,9 @@ static inline void v4l2_subdev_init(struct v4l2_subdev *sd,
+@@ -186,4 +195,9 @@ static inline void v4l2_subdev_init(struct v4l2_subdev *sd,
  	(!(sd) ? -ENODEV : (((sd) && (sd)->ops->o && (sd)->ops->o->f) ?	\
  		(sd)->ops->o->f((sd) , ##args) : -ENOIOCTLCMD))