diff options
author | Mike Isely <isely@pobox.com> | 2009-03-14 13:09:04 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 11:43:39 -0400 |
commit | bb65242aa374e7ebcd32672bc9a0b890bd9117bb (patch) | |
tree | a3db50f46448558b57e7773f9bf05b3d14dfaf3a /drivers/media/video/pvrusb2 | |
parent | defeb0b94b6acf929e82b66dbc1fcb48b9204c70 (diff) |
V4L/DVB (11206): pvrusb2: Add sub-device for demod
Forgot to include the tda9887 component when moving to v4l2-subdev. I
got fooled because its name is "tuner", the same as the tuner module.
Silly me.
Signed-off-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/pvrusb2')
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-devattr.c | 2 | ||||
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-devattr.h | 1 | ||||
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-hdw.c | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-devattr.c b/drivers/media/video/pvrusb2/pvrusb2-devattr.c index e6c876f3a35a..7483c1746079 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-devattr.c +++ b/drivers/media/video/pvrusb2/pvrusb2-devattr.c | |||
@@ -50,6 +50,7 @@ static const struct pvr2_device_client_desc pvr2_cli_29xxx[] = { | |||
50 | { .module_id = PVR2_CLIENT_ID_SAA7115 }, | 50 | { .module_id = PVR2_CLIENT_ID_SAA7115 }, |
51 | { .module_id = PVR2_CLIENT_ID_MSP3400 }, | 51 | { .module_id = PVR2_CLIENT_ID_MSP3400 }, |
52 | { .module_id = PVR2_CLIENT_ID_TUNER }, | 52 | { .module_id = PVR2_CLIENT_ID_TUNER }, |
53 | { .module_id = PVR2_CLIENT_ID_DEMOD }, | ||
53 | }; | 54 | }; |
54 | 55 | ||
55 | static const char *pvr2_fw1_names_29xxx[] = { | 56 | static const char *pvr2_fw1_names_29xxx[] = { |
@@ -81,6 +82,7 @@ static const struct pvr2_device_client_desc pvr2_cli_24xxx[] = { | |||
81 | { .module_id = PVR2_CLIENT_ID_CX25840 }, | 82 | { .module_id = PVR2_CLIENT_ID_CX25840 }, |
82 | { .module_id = PVR2_CLIENT_ID_TUNER }, | 83 | { .module_id = PVR2_CLIENT_ID_TUNER }, |
83 | { .module_id = PVR2_CLIENT_ID_WM8775 }, | 84 | { .module_id = PVR2_CLIENT_ID_WM8775 }, |
85 | { .module_id = PVR2_CLIENT_ID_DEMOD }, | ||
84 | }; | 86 | }; |
85 | 87 | ||
86 | static const char *pvr2_fw1_names_24xxx[] = { | 88 | static const char *pvr2_fw1_names_24xxx[] = { |
diff --git a/drivers/media/video/pvrusb2/pvrusb2-devattr.h b/drivers/media/video/pvrusb2/pvrusb2-devattr.h index ed9cdedcc71b..13a59c4f9584 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-devattr.h +++ b/drivers/media/video/pvrusb2/pvrusb2-devattr.h | |||
@@ -40,6 +40,7 @@ | |||
40 | #define PVR2_CLIENT_ID_TUNER 4 | 40 | #define PVR2_CLIENT_ID_TUNER 4 |
41 | #define PVR2_CLIENT_ID_CS53L32A 5 | 41 | #define PVR2_CLIENT_ID_CS53L32A 5 |
42 | #define PVR2_CLIENT_ID_WM8775 6 | 42 | #define PVR2_CLIENT_ID_WM8775 6 |
43 | #define PVR2_CLIENT_ID_DEMOD 7 | ||
43 | 44 | ||
44 | struct pvr2_device_client_desc { | 45 | struct pvr2_device_client_desc { |
45 | /* One ovr PVR2_CLIENT_ID_xxxx */ | 46 | /* One ovr PVR2_CLIENT_ID_xxxx */ |
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c index 7c66779b1f42..b8a2d332c6d0 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c +++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c | |||
@@ -123,6 +123,7 @@ static const char *module_names[] = { | |||
123 | [PVR2_CLIENT_ID_CX25840] = "cx25840", | 123 | [PVR2_CLIENT_ID_CX25840] = "cx25840", |
124 | [PVR2_CLIENT_ID_SAA7115] = "saa7115", | 124 | [PVR2_CLIENT_ID_SAA7115] = "saa7115", |
125 | [PVR2_CLIENT_ID_TUNER] = "tuner", | 125 | [PVR2_CLIENT_ID_TUNER] = "tuner", |
126 | [PVR2_CLIENT_ID_DEMOD] = "tuner", | ||
126 | [PVR2_CLIENT_ID_CS53L32A] = "cs53l32a", | 127 | [PVR2_CLIENT_ID_CS53L32A] = "cs53l32a", |
127 | [PVR2_CLIENT_ID_WM8775] = "wm8775", | 128 | [PVR2_CLIENT_ID_WM8775] = "wm8775", |
128 | }; | 129 | }; |
@@ -130,6 +131,7 @@ static const char *module_names[] = { | |||
130 | 131 | ||
131 | static const unsigned char *module_i2c_addresses[] = { | 132 | static const unsigned char *module_i2c_addresses[] = { |
132 | [PVR2_CLIENT_ID_TUNER] = "\x60\x61\x62\x63", | 133 | [PVR2_CLIENT_ID_TUNER] = "\x60\x61\x62\x63", |
134 | [PVR2_CLIENT_ID_DEMOD] = "\x43", | ||
133 | [PVR2_CLIENT_ID_MSP3400] = "\x40", | 135 | [PVR2_CLIENT_ID_MSP3400] = "\x40", |
134 | [PVR2_CLIENT_ID_SAA7115] = "\x21", | 136 | [PVR2_CLIENT_ID_SAA7115] = "\x21", |
135 | [PVR2_CLIENT_ID_WM8775] = "\x1b", | 137 | [PVR2_CLIENT_ID_WM8775] = "\x1b", |