V4L/DVB (10758): cx18: Convert I2C devices to v4l2_subdevices

This is a major perturbation to cx18 I2C device handling to convert it to the
v4l2_device/subdeivce framework.  This change breaks GPIO audio multiplexer
control for the time being.  It will be fixed in a coming change.

Signed-off-by: Andy Walls <awalls@radix.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/media/video/cx18/cx18-cards.h b/drivers/media/video/cx18/cx18-cards.h
index f8ee29f102d4..bd7f9556f18c 100644
--- a/drivers/media/video/cx18/cx18-cards.h
+++ b/drivers/media/video/cx18/cx18-cards.h
@@ -22,12 +22,12 @@
  */
 
 /* hardware flags */
-#define CX18_HW_TUNER     (1 << 0)
-#define CX18_HW_TVEEPROM  (1 << 1)
-#define CX18_HW_CS5345    (1 << 2)
-#define CX18_HW_GPIO      (1 << 3)
-#define CX18_HW_CX23418   (1 << 4)
-#define CX18_HW_DVB       (1 << 5)
+#define CX18_HW_TUNER           (1 << 0)
+#define CX18_HW_TVEEPROM        (1 << 1)
+#define CX18_HW_CS5345          (1 << 2)
+#define CX18_HW_DVB             (1 << 3)
+#define CX18_HW_418_AV          (1 << 4)
+#define CX18_HW_GPIO_AUDIO_MUX  (1 << 5)
 
 /* video inputs */
 #define CX18_CARD_INPUT_VID_TUNER       1
@@ -121,7 +121,7 @@ struct cx18_card {
         char *comment;
         u32 v4l2_capabilities;
         u32 hw_audio_ctrl;      /* hardware used for the V4L2 controls (only
-                                   1 dev allowed) */
+                                   1 dev allowed currently) */
         u32 hw_muxer;           /* hardware used to multiplex audio input */
         u32 hw_all;             /* all hardware used by the board */
         struct cx18_card_video_input video_inputs[CX18_CARD_MAX_VIDEO_INPUTS];