V4L/DVB (11207): pvrusb2: Add composite and s-video input support for OnAir devices

[safe/jmp/linux-2.6] / drivers / media / video / pvrusb2 / pvrusb2-hdw.c

diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index 7c66779..e357721 100644 (file)
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -38,6 +38,7 @@
 #include "pvrusb2-wm8775.h"
 #include "pvrusb2-video-v4l.h"
 #include "pvrusb2-cx2584x-v4l.h"
+#include "pvrusb2-cs53l32a.h"
 #include "pvrusb2-audio.h"
 
 #define TV_MIN_FREQ     55250000L
@@ -116,6 +117,7 @@ static const pvr2_subdev_update_func pvr2_module_update_functions[] = {
        [PVR2_CLIENT_ID_SAA7115] = pvr2_saa7115_subdev_update,
        [PVR2_CLIENT_ID_MSP3400] = pvr2_msp3400_subdev_update,
        [PVR2_CLIENT_ID_CX25840] = pvr2_cx25840_subdev_update,
+       [PVR2_CLIENT_ID_CS53L32A] = pvr2_cs53l32a_subdev_update,
 };
 
 static const char *module_names[] = {
@@ -123,6 +125,7 @@ static const char *module_names[] = {
        [PVR2_CLIENT_ID_CX25840] = "cx25840",
        [PVR2_CLIENT_ID_SAA7115] = "saa7115",
        [PVR2_CLIENT_ID_TUNER] = "tuner",
+       [PVR2_CLIENT_ID_DEMOD] = "tuner",
        [PVR2_CLIENT_ID_CS53L32A] = "cs53l32a",
        [PVR2_CLIENT_ID_WM8775] = "wm8775",
 };
@@ -130,6 +133,7 @@ static const char *module_names[] = {
 
 static const unsigned char *module_i2c_addresses[] = {
        [PVR2_CLIENT_ID_TUNER] = "\x60\x61\x62\x63",
+       [PVR2_CLIENT_ID_DEMOD] = "\x43",
        [PVR2_CLIENT_ID_MSP3400] = "\x40",
        [PVR2_CLIENT_ID_SAA7115] = "\x21",
        [PVR2_CLIENT_ID_WM8775] = "\x1b",