Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 3ff4ad815c5824ab35375d72ea8fe14fb3230daa

Authored by Hans Verkuil
Committed by Mauro Carvalho Chehab
1 parent 940088a162
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

V4L/DVB (11377): v4l: increase version numbers of drivers converted to v4l2_subdev. 

With all the v4l2_subdev changes that were made to these drivers it is a
good idea to increase the version number of each driver.

It's just the patch level that is increased, except for the zoran and saa7146
drivers where the minor number was increased due to the more substantial
changes that were made to those two drivers.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

Showing 13 changed files with 28 additions and 43 deletions Side-by-side Diff

drivers/media/video/bt8xx/bttvp.h
Diff comments   View file @ 3ff4ad8
... ... @@ -26,7 +26,7 @@
26 26 #define _BTTVP_H_
27 27  
28 28 #include <linux/version.h>
29   -#define BTTV_VERSION_CODE KERNEL_VERSION(0,9,17)
  29 +#define BTTV_VERSION_CODE KERNEL_VERSION(0,9,18)
30 30  
31 31 #include <linux/types.h>
32 32 #include <linux/wait.h>
drivers/media/video/cx23885/cx23885.h
Diff comments   View file @ 3ff4ad8
... ... @@ -37,7 +37,7 @@
37 37 #include <linux/version.h>
38 38 #include <linux/mutex.h>
39 39  
40   -#define CX23885_VERSION_CODE KERNEL_VERSION(0, 0, 1)
  40 +#define CX23885_VERSION_CODE KERNEL_VERSION(0, 0, 2)
41 41  
42 42 #define UNSET (-1U)
43 43  
drivers/media/video/cx88/cx88.h
Diff comments   View file @ 3ff4ad8
... ... @@ -41,7 +41,7 @@
41 41  
42 42 #include <linux/version.h>
43 43 #include <linux/mutex.h>
44   -#define CX88_VERSION_CODE KERNEL_VERSION(0,0,6)
  44 +#define CX88_VERSION_CODE KERNEL_VERSION(0,0,7)
45 45  
46 46 #define UNSET (-1U)
47 47  
drivers/media/video/ivtv/ivtv-driver.c
Diff comments   View file @ 3ff4ad8
... ... @@ -884,12 +884,9 @@
884 884 }
885 885 else if (itv->card->type == IVTV_CARD_GV_MVPRX ||
886 886 itv->card->type == IVTV_CARD_GV_MVPRX2E) {
887   - struct v4l2_crystal_freq crystal_freq;
888   -
889 887 /* The crystal frequency of GVMVPRX is 24.576MHz */
890   - crystal_freq.freq = SAA7115_FREQ_24_576_MHZ;
891   - crystal_freq.flags = SAA7115_FREQ_FL_UCGC;
892   - v4l2_subdev_call(itv->sd_video, video, s_crystal_freq, &crystal_freq);
  888 + v4l2_subdev_call(itv->sd_video, video, s_crystal_freq,
  889 + SAA7115_FREQ_24_576_MHZ, SAA7115_FREQ_FL_UCGC);
893 890 }
894 891  
895 892 if (hw & IVTV_HW_CX25840) {
drivers/media/video/ivtv/ivtv-fileops.c
Diff comments   View file @ 3ff4ad8
... ... @@ -860,12 +860,9 @@
860 860 ivtv_call_all(itv, core, s_std, itv->std);
861 861 /* Select correct audio input (i.e. TV tuner or Line in) */
862 862 ivtv_audio_set_io(itv);
863   - if (itv->hw_flags & IVTV_HW_SAA711X)
864   - {
865   - struct v4l2_crystal_freq crystal_freq;
866   - crystal_freq.freq = SAA7115_FREQ_32_11_MHZ;
867   - crystal_freq.flags = 0;
868   - ivtv_call_hw(itv, IVTV_HW_SAA711X, video, s_crystal_freq, &crystal_freq);
  863 + if (itv->hw_flags & IVTV_HW_SAA711X) {
  864 + ivtv_call_hw(itv, IVTV_HW_SAA711X, video, s_crystal_freq,
  865 + SAA7115_FREQ_32_11_MHZ, 0);
869 866 }
870 867 if (atomic_read(&itv->capturing) > 0) {
871 868 /* Undo video mute */
... ... @@ -956,10 +953,8 @@
956 953 /* Select the correct audio input (i.e. radio tuner) */
957 954 ivtv_audio_set_io(itv);
958 955 if (itv->hw_flags & IVTV_HW_SAA711X) {
959   - struct v4l2_crystal_freq crystal_freq;
960   - crystal_freq.freq = SAA7115_FREQ_32_11_MHZ;
961   - crystal_freq.flags = SAA7115_FREQ_FL_APLL;
962   - ivtv_call_hw(itv, IVTV_HW_SAA711X, video, s_crystal_freq, &crystal_freq);
  956 + ivtv_call_hw(itv, IVTV_HW_SAA711X, video, s_crystal_freq,
  957 + SAA7115_FREQ_32_11_MHZ, SAA7115_FREQ_FL_APLL);
963 958 }
964 959 /* Done! Unmute and continue. */
965 960 ivtv_unmute(itv);
drivers/media/video/saa7115.c
Diff comments   View file @ 3ff4ad8
... ... @@ -1313,17 +1313,16 @@
1313 1313 return 0;
1314 1314 }
1315 1315  
1316   -static int saa711x_s_crystal_freq(struct v4l2_subdev *sd, struct v4l2_crystal_freq *freq)
  1316 +static int saa711x_s_crystal_freq(struct v4l2_subdev *sd, u32 freq, u32 flags)
1317 1317 {
1318 1318 struct saa711x_state *state = to_state(sd);
1319 1319  
1320   - if (freq->freq != SAA7115_FREQ_32_11_MHZ &&
1321   - freq->freq != SAA7115_FREQ_24_576_MHZ)
  1320 + if (freq != SAA7115_FREQ_32_11_MHZ && freq != SAA7115_FREQ_24_576_MHZ)
1322 1321 return -EINVAL;
1323   - state->crystal_freq = freq->freq;
1324   - state->cgcdiv = (freq->flags & SAA7115_FREQ_FL_CGCDIV) ? 3 : 4;
1325   - state->ucgc = (freq->flags & SAA7115_FREQ_FL_UCGC) ? 1 : 0;
1326   - state->apll = (freq->flags & SAA7115_FREQ_FL_APLL) ? 1 : 0;
  1322 + state->crystal_freq = freq;
  1323 + state->cgcdiv = (flags & SAA7115_FREQ_FL_CGCDIV) ? 3 : 4;
  1324 + state->ucgc = (flags & SAA7115_FREQ_FL_UCGC) ? 1 : 0;
  1325 + state->apll = (flags & SAA7115_FREQ_FL_APLL) ? 1 : 0;
1327 1326 saa711x_s_clock_freq(sd, state->audclk_freq);
1328 1327 return 0;
1329 1328 }
drivers/media/video/saa7134/saa7134.h
Diff comments   View file @ 3ff4ad8
... ... @@ -20,7 +20,7 @@
20 20 */
21 21  
22 22 #include <linux/version.h>
23   -#define SAA7134_VERSION_CODE KERNEL_VERSION(0,2,14)
  23 +#define SAA7134_VERSION_CODE KERNEL_VERSION(0,2,15)
24 24  
25 25 #include <linux/pci.h>
26 26 #include <linux/i2c.h>
drivers/media/video/usbvision/usbvision-video.c
Diff comments   View file @ 3ff4ad8
1 1 /*
2   - * USB USBVISION Video device driver 0.9.9
  2 + * USB USBVISION Video device driver 0.9.10
3 3 *
4 4 *
5 5 *
... ... @@ -79,7 +79,7 @@
79 79 #define DRIVER_LICENSE "GPL"
80 80 #define USBVISION_DRIVER_VERSION_MAJOR 0
81 81 #define USBVISION_DRIVER_VERSION_MINOR 9
82   -#define USBVISION_DRIVER_VERSION_PATCHLEVEL 9
  82 +#define USBVISION_DRIVER_VERSION_PATCHLEVEL 10
83 83 #define USBVISION_DRIVER_VERSION KERNEL_VERSION(USBVISION_DRIVER_VERSION_MAJOR,\
84 84 USBVISION_DRIVER_VERSION_MINOR,\
85 85 USBVISION_DRIVER_VERSION_PATCHLEVEL)
drivers/media/video/vino.c
Diff comments   View file @ 3ff4ad8
... ... @@ -60,8 +60,8 @@
60 60 // #define VINO_DEBUG
61 61 // #define VINO_DEBUG_INT
62 62  
63   -#define VINO_MODULE_VERSION "0.0.5"
64   -#define VINO_VERSION_CODE KERNEL_VERSION(0, 0, 5)
  63 +#define VINO_MODULE_VERSION "0.0.6"
  64 +#define VINO_VERSION_CODE KERNEL_VERSION(0, 0, 6)
65 65  
66 66 MODULE_DESCRIPTION("SGI VINO Video4Linux2 driver");
67 67 MODULE_VERSION(VINO_MODULE_VERSION);
drivers/media/video/w9968cf.h
Diff comments   View file @ 3ff4ad8
... ... @@ -134,7 +134,7 @@
134 134  
135 135 #define W9968CF_MODULE_NAME "V4L driver for W996[87]CF JPEG USB " \
136 136 "Dual Mode Camera Chip"
137   -#define W9968CF_MODULE_VERSION "1:1.33-basic"
  137 +#define W9968CF_MODULE_VERSION "1:1.34-basic"
138 138 #define W9968CF_MODULE_AUTHOR "(C) 2002-2004 Luca Risolia"
139 139 #define W9968CF_AUTHOR_EMAIL "<luca.risolia@studio.unibo.it>"
140 140 #define W9968CF_MODULE_LICENSE "GPL"
drivers/media/video/zoran/zoran.h
Diff comments   View file @ 3ff4ad8
... ... @@ -143,8 +143,8 @@
143 143 #ifdef __KERNEL__
144 144  
145 145 #define MAJOR_VERSION 0 /* driver major version */
146   -#define MINOR_VERSION 9 /* driver minor version */
147   -#define RELEASE_VERSION 5 /* release version */
  146 +#define MINOR_VERSION 10 /* driver minor version */
  147 +#define RELEASE_VERSION 0 /* release version */
148 148  
149 149 #define ZORAN_NAME "ZORAN" /* name of the device */
150 150  
include/media/saa7146.h
Diff comments   View file @ 3ff4ad8
... ... @@ -18,7 +18,7 @@
18 18 #include <linux/vmalloc.h> /* for vmalloc() */
19 19 #include <linux/mm.h> /* for vmalloc_to_page() */
20 20  
21   -#define SAA7146_VERSION_CODE 0x000500 /* 0.5.0 */
  21 +#define SAA7146_VERSION_CODE 0x000600 /* 0.6.0 */
22 22  
23 23 #define saa7146_write(sxy,adr,dat) writel((dat),(sxy->mem+(adr)))
24 24 #define saa7146_read(sxy,adr) readl(sxy->mem+(adr))
include/media/v4l2-subdev.h
Diff comments   View file @ 3ff4ad8
... ... @@ -37,12 +37,6 @@
37 37 u32 type; /* VBI service type (V4L2_SLICED_*). 0 if no service found */
38 38 };
39 39  
40   -/* s_crystal_freq */
41   -struct v4l2_crystal_freq {
42   - u32 freq; /* frequency in Hz of the crystal */
43   - u32 flags; /* device specific flags */
44   -};
45   -
46 40 /* Sub-devices are devices that are connected somehow to the main bridge
47 41 device. These devices are usually audio/video muxers/encoders/decoders or
48 42 sensors and webcam controllers.
... ... @@ -194,8 +188,8 @@
194 188 s_std_output: set v4l2_std_id for video OUTPUT devices. This is ignored by
195 189 video input devices.
196 190  
197   - s_crystal_freq: sets the frequency of the crystal used to generate the
198   - clocks. An extra flags field allows device specific configuration
  191 + s_crystal_freq: sets the frequency of the crystal used to generate the
  192 + clocks in Hz. An extra flags field allows device specific configuration
199 193 regarding clock frequency dividers, etc. If not used, then set flags
200 194 to 0. If the frequency is not supported, then -EINVAL is returned.
201 195  
... ... @@ -207,7 +201,7 @@
207 201 */
208 202 struct v4l2_subdev_video_ops {
209 203 int (*s_routing)(struct v4l2_subdev *sd, const struct v4l2_routing *route);
210   - int (*s_crystal_freq)(struct v4l2_subdev *sd, struct v4l2_crystal_freq *freq);
  204 + int (*s_crystal_freq)(struct v4l2_subdev *sd, u32 freq, u32 flags);
211 205 int (*decode_vbi_line)(struct v4l2_subdev *sd, struct v4l2_decode_vbi_line *vbi_line);
212 206 int (*s_vbi_data)(struct v4l2_subdev *sd, const struct v4l2_sliced_vbi_data *vbi_data);
213 207 int (*g_vbi_data)(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_data *vbi_data);