Commit bb65242a authored by Mike Isely's avatar Mike Isely Committed by Mauro Carvalho Chehab

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: default avatarMike Isely <isely@pobox.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent defeb0b9
...@@ -50,6 +50,7 @@ static const struct pvr2_device_client_desc pvr2_cli_29xxx[] = { ...@@ -50,6 +50,7 @@ static const struct pvr2_device_client_desc pvr2_cli_29xxx[] = {
{ .module_id = PVR2_CLIENT_ID_SAA7115 }, { .module_id = PVR2_CLIENT_ID_SAA7115 },
{ .module_id = PVR2_CLIENT_ID_MSP3400 }, { .module_id = PVR2_CLIENT_ID_MSP3400 },
{ .module_id = PVR2_CLIENT_ID_TUNER }, { .module_id = PVR2_CLIENT_ID_TUNER },
{ .module_id = PVR2_CLIENT_ID_DEMOD },
}; };
static const char *pvr2_fw1_names_29xxx[] = { static const char *pvr2_fw1_names_29xxx[] = {
...@@ -81,6 +82,7 @@ static const struct pvr2_device_client_desc pvr2_cli_24xxx[] = { ...@@ -81,6 +82,7 @@ static const struct pvr2_device_client_desc pvr2_cli_24xxx[] = {
{ .module_id = PVR2_CLIENT_ID_CX25840 }, { .module_id = PVR2_CLIENT_ID_CX25840 },
{ .module_id = PVR2_CLIENT_ID_TUNER }, { .module_id = PVR2_CLIENT_ID_TUNER },
{ .module_id = PVR2_CLIENT_ID_WM8775 }, { .module_id = PVR2_CLIENT_ID_WM8775 },
{ .module_id = PVR2_CLIENT_ID_DEMOD },
}; };
static const char *pvr2_fw1_names_24xxx[] = { static const char *pvr2_fw1_names_24xxx[] = {
......
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
#define PVR2_CLIENT_ID_TUNER 4 #define PVR2_CLIENT_ID_TUNER 4
#define PVR2_CLIENT_ID_CS53L32A 5 #define PVR2_CLIENT_ID_CS53L32A 5
#define PVR2_CLIENT_ID_WM8775 6 #define PVR2_CLIENT_ID_WM8775 6
#define PVR2_CLIENT_ID_DEMOD 7
struct pvr2_device_client_desc { struct pvr2_device_client_desc {
/* One ovr PVR2_CLIENT_ID_xxxx */ /* One ovr PVR2_CLIENT_ID_xxxx */
......
...@@ -123,6 +123,7 @@ static const char *module_names[] = { ...@@ -123,6 +123,7 @@ static const char *module_names[] = {
[PVR2_CLIENT_ID_CX25840] = "cx25840", [PVR2_CLIENT_ID_CX25840] = "cx25840",
[PVR2_CLIENT_ID_SAA7115] = "saa7115", [PVR2_CLIENT_ID_SAA7115] = "saa7115",
[PVR2_CLIENT_ID_TUNER] = "tuner", [PVR2_CLIENT_ID_TUNER] = "tuner",
[PVR2_CLIENT_ID_DEMOD] = "tuner",
[PVR2_CLIENT_ID_CS53L32A] = "cs53l32a", [PVR2_CLIENT_ID_CS53L32A] = "cs53l32a",
[PVR2_CLIENT_ID_WM8775] = "wm8775", [PVR2_CLIENT_ID_WM8775] = "wm8775",
}; };
...@@ -130,6 +131,7 @@ static const char *module_names[] = { ...@@ -130,6 +131,7 @@ static const char *module_names[] = {
static const unsigned char *module_i2c_addresses[] = { static const unsigned char *module_i2c_addresses[] = {
[PVR2_CLIENT_ID_TUNER] = "\x60\x61\x62\x63", [PVR2_CLIENT_ID_TUNER] = "\x60\x61\x62\x63",
[PVR2_CLIENT_ID_DEMOD] = "\x43",
[PVR2_CLIENT_ID_MSP3400] = "\x40", [PVR2_CLIENT_ID_MSP3400] = "\x40",
[PVR2_CLIENT_ID_SAA7115] = "\x21", [PVR2_CLIENT_ID_SAA7115] = "\x21",
[PVR2_CLIENT_ID_WM8775] = "\x1b", [PVR2_CLIENT_ID_WM8775] = "\x1b",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment