Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 2d26698e859994d4febb2d27b055bdc37d8e368e

Authored by Hans Verkuil
Committed by Mauro Carvalho Chehab
1 parent 7f6adeaf2d
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

V4L/DVB (10731): zoran i2c modules: remove i2c autoprobing support. 

Zoran doesn't do autoprobing anymore, so remove support for this from the
i2c modules.

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

Showing 10 changed files with 10 additions and 125 deletions Side-by-side Diff

drivers/media/video/adv7170.c
Diff comments   View file @ 2d26698
... ... @@ -37,20 +37,13 @@
37 37 #include <linux/videodev2.h>
38 38 #include <media/v4l2-device.h>
39 39 #include <media/v4l2-chip-ident.h>
40   -#include <media/v4l2-i2c-drv-legacy.h>
  40 +#include <media/v4l2-i2c-drv.h>
41 41  
42 42 MODULE_DESCRIPTION("Analog Devices ADV7170 video encoder driver");
43 43 MODULE_AUTHOR("Maxim Yevtyushkin");
44 44 MODULE_LICENSE("GPL");
45 45  
46   -static unsigned short normal_i2c[] = {
47   - 0xd4 >> 1, 0xd6 >> 1, /* adv7170 IDs */
48   - 0x54 >> 1, 0x56 >> 1, /* adv7171 IDs */
49   - I2C_CLIENT_END
50   -};
51 46  
52   -I2C_CLIENT_INSMOD;
53   -
54 47 static int debug;
55 48 module_param(debug, int, 0);
56 49 MODULE_PARM_DESC(debug, "Debug level (0-1)");
... ... @@ -271,11 +264,6 @@
271 264 return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_ADV7170, 0);
272 265 }
273 266  
274   -static int adv7170_command(struct i2c_client *client, unsigned cmd, void *arg)
275   -{
276   - return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg);
277   -}
278   -
279 267 /* ----------------------------------------------------------------------- */
280 268  
281 269 static const struct v4l2_subdev_core_ops adv7170_core_ops = {
... ... @@ -348,8 +336,6 @@
348 336  
349 337 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
350 338 .name = "adv7170",
351   - .driverid = I2C_DRIVERID_ADV7170,
352   - .command = adv7170_command,
353 339 .probe = adv7170_probe,
354 340 .remove = adv7170_remove,
355 341 .id_table = adv7170_id,
drivers/media/video/adv7175.c
Diff comments   View file @ 2d26698
... ... @@ -33,7 +33,7 @@
33 33 #include <linux/videodev2.h>
34 34 #include <media/v4l2-device.h>
35 35 #include <media/v4l2-chip-ident.h>
36   -#include <media/v4l2-i2c-drv-legacy.h>
  36 +#include <media/v4l2-i2c-drv.h>
37 37  
38 38 MODULE_DESCRIPTION("Analog Devices ADV7175 video encoder driver");
39 39 MODULE_AUTHOR("Dave Perks");
40 40  
... ... @@ -42,14 +42,7 @@
42 42 #define I2C_ADV7175 0xd4
43 43 #define I2C_ADV7176 0x54
44 44  
45   -static unsigned short normal_i2c[] = {
46   - I2C_ADV7175 >> 1, (I2C_ADV7175 >> 1) + 1,
47   - I2C_ADV7176 >> 1, (I2C_ADV7176 >> 1) + 1,
48   - I2C_CLIENT_END
49   -};
50 45  
51   -I2C_CLIENT_INSMOD;
52   -
53 46 static int debug;
54 47 module_param(debug, int, 0);
55 48 MODULE_PARM_DESC(debug, "Debug level (0-1)");
... ... @@ -309,11 +302,6 @@
309 302 return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_ADV7175, 0);
310 303 }
311 304  
312   -static int adv7175_command(struct i2c_client *client, unsigned cmd, void *arg)
313   -{
314   - return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg);
315   -}
316   -
317 305 /* ----------------------------------------------------------------------- */
318 306  
319 307 static const struct v4l2_subdev_core_ops adv7175_core_ops = {
... ... @@ -387,8 +375,6 @@
387 375  
388 376 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
389 377 .name = "adv7175",
390   - .driverid = I2C_DRIVERID_ADV7175,
391   - .command = adv7175_command,
392 378 .probe = adv7175_probe,
393 379 .remove = adv7175_remove,
394 380 .id_table = adv7175_id,
drivers/media/video/bt819.c
Diff comments   View file @ 2d26698
... ... @@ -38,7 +38,7 @@
38 38 #include <linux/videodev2.h>
39 39 #include <media/v4l2-device.h>
40 40 #include <media/v4l2-chip-ident.h>
41   -#include <media/v4l2-i2c-drv-legacy.h>
  41 +#include <media/v4l2-i2c-drv.h>
42 42  
43 43 MODULE_DESCRIPTION("Brooktree-819 video decoder driver");
44 44 MODULE_AUTHOR("Mike Bernson & Dave Perks");
45 45  
... ... @@ -48,10 +48,7 @@
48 48 module_param(debug, int, 0);
49 49 MODULE_PARM_DESC(debug, "Debug level (0-1)");
50 50  
51   -static unsigned short normal_i2c[] = { 0x8a >> 1, I2C_CLIENT_END };
52 51  
53   -I2C_CLIENT_INSMOD;
54   -
55 52 /* ----------------------------------------------------------------------- */
56 53  
57 54 struct bt819 {
... ... @@ -428,11 +425,6 @@
428 425 return v4l2_chip_ident_i2c_client(client, chip, decoder->ident, 0);
429 426 }
430 427  
431   -static int bt819_command(struct i2c_client *client, unsigned cmd, void *arg)
432   -{
433   - return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg);
434   -}
435   -
436 428 /* ----------------------------------------------------------------------- */
437 429  
438 430 static const struct v4l2_subdev_core_ops bt819_core_ops = {
... ... @@ -537,8 +529,6 @@
537 529  
538 530 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
539 531 .name = "bt819",
540   - .driverid = I2C_DRIVERID_BT819,
541   - .command = bt819_command,
542 532 .probe = bt819_probe,
543 533 .remove = bt819_remove,
544 534 .id_table = bt819_id,
drivers/media/video/bt856.c
Diff comments   View file @ 2d26698
... ... @@ -37,7 +37,7 @@
37 37 #include <linux/videodev2.h>
38 38 #include <media/v4l2-device.h>
39 39 #include <media/v4l2-chip-ident.h>
40   -#include <media/v4l2-i2c-drv-legacy.h>
  40 +#include <media/v4l2-i2c-drv.h>
41 41  
42 42 MODULE_DESCRIPTION("Brooktree-856A video encoder driver");
43 43 MODULE_AUTHOR("Mike Bernson & Dave Perks");
44 44  
... ... @@ -47,10 +47,7 @@
47 47 module_param(debug, int, 0);
48 48 MODULE_PARM_DESC(debug, "Debug level (0-1)");
49 49  
50   -static unsigned short normal_i2c[] = { 0x88 >> 1, I2C_CLIENT_END };
51 50  
52   -I2C_CLIENT_INSMOD;
53   -
54 51 /* ----------------------------------------------------------------------- */
55 52  
56 53 #define BT856_REG_OFFSET 0xDA
... ... @@ -187,11 +184,6 @@
187 184 return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_BT856, 0);
188 185 }
189 186  
190   -static int bt856_command(struct i2c_client *client, unsigned cmd, void *arg)
191   -{
192   - return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg);
193   -}
194   -
195 187 /* ----------------------------------------------------------------------- */
196 188  
197 189 static const struct v4l2_subdev_core_ops bt856_core_ops = {
... ... @@ -270,8 +262,6 @@
270 262  
271 263 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
272 264 .name = "bt856",
273   - .driverid = I2C_DRIVERID_BT856,
274   - .command = bt856_command,
275 265 .probe = bt856_probe,
276 266 .remove = bt856_remove,
277 267 .id_table = bt856_id,
drivers/media/video/bt866.c
Diff comments   View file @ 2d26698
... ... @@ -37,7 +37,7 @@
37 37 #include <linux/videodev2.h>
38 38 #include <media/v4l2-device.h>
39 39 #include <media/v4l2-chip-ident.h>
40   -#include <media/v4l2-i2c-drv-legacy.h>
  40 +#include <media/v4l2-i2c-drv.h>
41 41  
42 42 MODULE_DESCRIPTION("Brooktree-866 video encoder driver");
43 43 MODULE_AUTHOR("Mike Bernson & Dave Perks");
44 44  
... ... @@ -47,10 +47,7 @@
47 47 module_param(debug, int, 0);
48 48 MODULE_PARM_DESC(debug, "Debug level (0-1)");
49 49  
50   -static unsigned short normal_i2c[] = { 0x88 >> 1, I2C_CLIENT_END };
51 50  
52   -I2C_CLIENT_INSMOD;
53   -
54 51 /* ----------------------------------------------------------------------- */
55 52  
56 53 struct bt866 {
... ... @@ -185,11 +182,6 @@
185 182 return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_BT866, 0);
186 183 }
187 184  
188   -static int bt866_command(struct i2c_client *client, unsigned cmd, void *arg)
189   -{
190   - return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg);
191   -}
192   -
193 185 /* ----------------------------------------------------------------------- */
194 186  
195 187 static const struct v4l2_subdev_core_ops bt866_core_ops = {
... ... @@ -232,11 +224,6 @@
232 224 return 0;
233 225 }
234 226  
235   -static int bt866_legacy_probe(struct i2c_adapter *adapter)
236   -{
237   - return adapter->id == I2C_HW_B_ZR36067;
238   -}
239   -
240 227 static const struct i2c_device_id bt866_id[] = {
241 228 { "bt866", 0 },
242 229 { }
243 230  
... ... @@ -245,11 +232,8 @@
245 232  
246 233 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
247 234 .name = "bt866",
248   - .driverid = I2C_DRIVERID_BT866,
249   - .command = bt866_command,
250 235 .probe = bt866_probe,
251 236 .remove = bt866_remove,
252   - .legacy_probe = bt866_legacy_probe,
253 237 .id_table = bt866_id,
254 238 };
drivers/media/video/ks0127.c
Diff comments   View file @ 2d26698
... ... @@ -42,25 +42,18 @@
42 42 #include <linux/videodev2.h>
43 43 #include <media/v4l2-device.h>
44 44 #include <media/v4l2-chip-ident.h>
45   -#include <media/v4l2-i2c-drv-legacy.h>
  45 +#include <media/v4l2-i2c-drv.h>
46 46 #include "ks0127.h"
47 47  
48 48 MODULE_DESCRIPTION("KS0127 video decoder driver");
49 49 MODULE_AUTHOR("Ryan Drake");
50 50 MODULE_LICENSE("GPL");
51 51  
52   -/* Addresses to scan */
  52 +/* Addresses */
53 53 #define I2C_KS0127_ADDON 0xD8
54 54 #define I2C_KS0127_ONBOARD 0xDA
55 55  
56   -static unsigned short normal_i2c[] = {
57   - I2C_KS0127_ADDON >> 1,
58   - I2C_KS0127_ONBOARD >> 1,
59   - I2C_CLIENT_END
60   -};
61 56  
62   -I2C_CLIENT_INSMOD;
63   -
64 57 /* ks0127 control registers */
65 58 #define KS_STAT 0x00
66 59 #define KS_CMDA 0x01
... ... @@ -650,11 +643,6 @@
650 643 return v4l2_chip_ident_i2c_client(client, chip, ks->ident, 0);
651 644 }
652 645  
653   -static int ks0127_command(struct i2c_client *client, unsigned cmd, void *arg)
654   -{
655   - return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg);
656   -}
657   -
658 646 /* ----------------------------------------------------------------------- */
659 647  
660 648 static const struct v4l2_subdev_core_ops ks0127_core_ops = {
... ... @@ -717,11 +705,6 @@
717 705 return 0;
718 706 }
719 707  
720   -static int ks0127_legacy_probe(struct i2c_adapter *adapter)
721   -{
722   - return adapter->id == I2C_HW_B_ZR36067;
723   -}
724   -
725 708 static const struct i2c_device_id ks0127_id[] = {
726 709 { "ks0127", 0 },
727 710 { "ks0127b", 0 },
728 711  
... ... @@ -732,11 +715,8 @@
732 715  
733 716 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
734 717 .name = "ks0127",
735   - .driverid = I2C_DRIVERID_KS0127,
736   - .command = ks0127_command,
737 718 .probe = ks0127_probe,
738 719 .remove = ks0127_remove,
739   - .legacy_probe = ks0127_legacy_probe,
740 720 .id_table = ks0127_id,
741 721 };
drivers/media/video/saa7110.c
Diff comments   View file @ 2d26698
... ... @@ -36,16 +36,13 @@
36 36 #include <linux/videodev2.h>
37 37 #include <media/v4l2-device.h>
38 38 #include <media/v4l2-chip-ident.h>
39   -#include <media/v4l2-i2c-drv-legacy.h>
  39 +#include <media/v4l2-i2c-drv.h>
40 40  
41 41 MODULE_DESCRIPTION("Philips SAA7110 video decoder driver");
42 42 MODULE_AUTHOR("Pauline Middelink");
43 43 MODULE_LICENSE("GPL");
44 44  
45   -static unsigned short normal_i2c[] = { 0x9c >> 1, 0x9e >> 1, I2C_CLIENT_END };
46 45  
47   -I2C_CLIENT_INSMOD;
48   -
49 46 static int debug;
50 47 module_param(debug, int, 0);
51 48 MODULE_PARM_DESC(debug, "Debug level (0-1)");
... ... @@ -410,11 +407,6 @@
410 407 return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_SAA7110, 0);
411 408 }
412 409  
413   -static int saa7110_command(struct i2c_client *client, unsigned cmd, void *arg)
414   -{
415   - return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg);
416   -}
417   -
418 410 /* ----------------------------------------------------------------------- */
419 411  
420 412 static const struct v4l2_subdev_core_ops saa7110_core_ops = {
... ... @@ -518,8 +510,6 @@
518 510  
519 511 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
520 512 .name = "saa7110",
521   - .driverid = I2C_DRIVERID_SAA7110,
522   - .command = saa7110_command,
523 513 .probe = saa7110_probe,
524 514 .remove = saa7110_remove,
525 515 .id_table = saa7110_id,
drivers/media/video/saa7127.c
Diff comments   View file @ 2d26698
... ... @@ -810,7 +810,6 @@
810 810  
811 811 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
812 812 .name = "saa7127",
813   - .driverid = I2C_DRIVERID_SAA7127,
814 813 .probe = saa7127_probe,
815 814 .remove = saa7127_remove,
816 815 .id_table = saa7127_id,
drivers/media/video/saa7185.c
Diff comments   View file @ 2d26698
... ... @@ -33,7 +33,7 @@
33 33 #include <linux/videodev2.h>
34 34 #include <media/v4l2-device.h>
35 35 #include <media/v4l2-chip-ident.h>
36   -#include <media/v4l2-i2c-drv-legacy.h>
  36 +#include <media/v4l2-i2c-drv.h>
37 37  
38 38 MODULE_DESCRIPTION("Philips SAA7185 video encoder driver");
39 39 MODULE_AUTHOR("Dave Perks");
40 40  
... ... @@ -43,10 +43,7 @@
43 43 module_param(debug, int, 0);
44 44 MODULE_PARM_DESC(debug, "Debug level (0-1)");
45 45  
46   -static unsigned short normal_i2c[] = { 0x88 >> 1, I2C_CLIENT_END };
47 46  
48   -I2C_CLIENT_INSMOD;
49   -
50 47 /* ----------------------------------------------------------------------- */
51 48  
52 49 struct saa7185 {
... ... @@ -295,11 +292,6 @@
295 292 return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_SAA7185, 0);
296 293 }
297 294  
298   -static int saa7185_command(struct i2c_client *client, unsigned cmd, void *arg)
299   -{
300   - return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg);
301   -}
302   -
303 295 /* ----------------------------------------------------------------------- */
304 296  
305 297 static const struct v4l2_subdev_core_ops saa7185_core_ops = {
... ... @@ -374,8 +366,6 @@
374 366  
375 367 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
376 368 .name = "saa7185",
377   - .driverid = I2C_DRIVERID_SAA7185B,
378   - .command = saa7185_command,
379 369 .probe = saa7185_probe,
380 370 .remove = saa7185_remove,
381 371 .id_table = saa7185_id,
drivers/media/video/vpx3220.c
Diff comments   View file @ 2d26698
... ... @@ -27,7 +27,7 @@
27 27 #include <linux/videodev2.h>
28 28 #include <media/v4l2-device.h>
29 29 #include <media/v4l2-chip-ident.h>
30   -#include <media/v4l2-i2c-drv-legacy.h>
  30 +#include <media/v4l2-i2c-drv.h>
31 31  
32 32 MODULE_DESCRIPTION("vpx3220a/vpx3216b/vpx3214c video decoder driver");
33 33 MODULE_AUTHOR("Laurent Pinchart");
34 34  
... ... @@ -37,10 +37,7 @@
37 37 module_param(debug, int, 0);
38 38 MODULE_PARM_DESC(debug, "Debug level (0-1)");
39 39  
40   -static unsigned short normal_i2c[] = { 0x86 >> 1, 0x8e >> 1, I2C_CLIENT_END };
41 40  
42   -I2C_CLIENT_INSMOD;
43   -
44 41 #define VPX_TIMEOUT_COUNT 10
45 42  
46 43 /* ----------------------------------------------------------------------- */
... ... @@ -511,11 +508,6 @@
511 508 return v4l2_chip_ident_i2c_client(client, chip, decoder->ident, 0);
512 509 }
513 510  
514   -static int vpx3220_command(struct i2c_client *client, unsigned cmd, void *arg)
515   -{
516   - return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg);
517   -}
518   -
519 511 /* ----------------------------------------------------------------------- */
520 512  
521 513 static const struct v4l2_subdev_core_ops vpx3220_core_ops = {
... ... @@ -626,8 +618,6 @@
626 618  
627 619 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
628 620 .name = "vpx3220",
629   - .driverid = I2C_DRIVERID_VPX3220,
630   - .command = vpx3220_command,
631 621 .probe = vpx3220_probe,
632 622 .remove = vpx3220_remove,
633 623 .id_table = vpx3220_id,