mirror of
https://github.com/torvalds/linux.git
synced 2024-11-26 22:21:42 +00:00
V4L/DVB (7762): ivtv: fix tuner detection for PAL-N/Nc
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Hans Verkuil
Mauro Carvalho Chehab
parent
2968e31361
commit
a0bdd273a2
@ -40,6 +40,8 @@
|
||||
#define MSP_MONO MSP_INPUT(MSP_IN_MONO, MSP_IN_TUNER1, \
|
||||
MSP_DSP_IN_SCART, MSP_DSP_IN_SCART)
|
||||
|
||||
#define V4L2_STD_NOT_MN (V4L2_STD_PAL|V4L2_STD_SECAM)
|
||||
|
||||
/* usual i2c tuner addresses to probe */
|
||||
static struct ivtv_card_tuner_i2c ivtv_i2c_std = {
|
||||
.radio = { I2C_CLIENT_END },
|
||||
@ -298,7 +300,7 @@ static const struct ivtv_card ivtv_card_mpg600 = {
|
||||
.gpio_audio_detect = { .mask = 0x0900, .stereo = 0x0100 },
|
||||
.tuners = {
|
||||
/* The PAL tuner is confirmed */
|
||||
{ .std = V4L2_STD_625_50, .tuner = TUNER_PHILIPS_FQ1216ME },
|
||||
{ .std = V4L2_STD_NOT_MN, .tuner = TUNER_PHILIPS_FQ1216ME },
|
||||
{ .std = V4L2_STD_ALL, .tuner = TUNER_PHILIPS_FQ1286 },
|
||||
},
|
||||
.pci_list = ivtv_pci_mpg600,
|
||||
@ -339,7 +341,7 @@ static const struct ivtv_card ivtv_card_mpg160 = {
|
||||
.lang1 = 0x0004, .lang2 = 0x0000, .both = 0x0008 },
|
||||
.gpio_audio_detect = { .mask = 0x0900, .stereo = 0x0100 },
|
||||
.tuners = {
|
||||
{ .std = V4L2_STD_625_50, .tuner = TUNER_PHILIPS_FQ1216ME },
|
||||
{ .std = V4L2_STD_NOT_MN, .tuner = TUNER_PHILIPS_FQ1216ME },
|
||||
{ .std = V4L2_STD_ALL, .tuner = TUNER_PHILIPS_FQ1286 },
|
||||
},
|
||||
.pci_list = ivtv_pci_mpg160,
|
||||
@ -375,7 +377,7 @@ static const struct ivtv_card ivtv_card_pg600 = {
|
||||
{ IVTV_CARD_INPUT_LINE_IN1, CX25840_AUDIO_SERIAL },
|
||||
},
|
||||
.tuners = {
|
||||
{ .std = V4L2_STD_625_50, .tuner = TUNER_PHILIPS_FQ1216ME },
|
||||
{ .std = V4L2_STD_NOT_MN, .tuner = TUNER_PHILIPS_FQ1216ME },
|
||||
{ .std = V4L2_STD_ALL, .tuner = TUNER_PHILIPS_FQ1286 },
|
||||
},
|
||||
.pci_list = ivtv_pci_pg600,
|
||||
@ -416,7 +418,7 @@ static const struct ivtv_card ivtv_card_avc2410 = {
|
||||
on the country/region setting of the user to decide which tuner
|
||||
is available. */
|
||||
.tuners = {
|
||||
{ .std = V4L2_STD_625_50, .tuner = TUNER_PHILIPS_FM1216ME_MK3 },
|
||||
{ .std = V4L2_STD_NOT_MN, .tuner = TUNER_PHILIPS_FM1216ME_MK3 },
|
||||
{ .std = V4L2_STD_ALL - V4L2_STD_NTSC_M_JP,
|
||||
.tuner = TUNER_PHILIPS_FM1236_MK3 },
|
||||
{ .std = V4L2_STD_NTSC_M_JP, .tuner = TUNER_PHILIPS_FQ1286 },
|
||||
@ -490,7 +492,7 @@ static const struct ivtv_card ivtv_card_tg5000tv = {
|
||||
.gpio_video_input = { .mask = 0x0030, .tuner = 0x0000,
|
||||
.composite = 0x0010, .svideo = 0x0020 },
|
||||
.tuners = {
|
||||
{ .std = V4L2_STD_525_60, .tuner = TUNER_PHILIPS_FQ1286 },
|
||||
{ .std = V4L2_STD_525_60|V4L2_STD_MN, .tuner = TUNER_PHILIPS_FQ1286 },
|
||||
},
|
||||
.pci_list = ivtv_pci_tg5000tv,
|
||||
.i2c = &ivtv_i2c_std,
|
||||
@ -521,7 +523,7 @@ static const struct ivtv_card ivtv_card_va2000 = {
|
||||
{ IVTV_CARD_INPUT_AUD_TUNER, MSP_TUNER },
|
||||
},
|
||||
.tuners = {
|
||||
{ .std = V4L2_STD_525_60, .tuner = TUNER_PHILIPS_FQ1286 },
|
||||
{ .std = V4L2_STD_525_60|V4L2_STD_MN, .tuner = TUNER_PHILIPS_FQ1286 },
|
||||
},
|
||||
.pci_list = ivtv_pci_va2000,
|
||||
.i2c = &ivtv_i2c_std,
|
||||
@ -565,7 +567,7 @@ static const struct ivtv_card ivtv_card_cx23416gyc = {
|
||||
.gpio_audio_freq = { .mask = 0xc000, .f32000 = 0x0000,
|
||||
.f44100 = 0x4000, .f48000 = 0x8000 },
|
||||
.tuners = {
|
||||
{ .std = V4L2_STD_625_50, .tuner = TUNER_PHILIPS_FM1216ME_MK3 },
|
||||
{ .std = V4L2_STD_NOT_MN, .tuner = TUNER_PHILIPS_FM1216ME_MK3 },
|
||||
{ .std = V4L2_STD_ALL, .tuner = TUNER_PHILIPS_FM1236_MK3 },
|
||||
},
|
||||
.pci_list = ivtv_pci_cx23416gyc,
|
||||
@ -597,7 +599,7 @@ static const struct ivtv_card ivtv_card_cx23416gyc_nogr = {
|
||||
.gpio_audio_freq = { .mask = 0xc000, .f32000 = 0x0000,
|
||||
.f44100 = 0x4000, .f48000 = 0x8000 },
|
||||
.tuners = {
|
||||
{ .std = V4L2_STD_625_50, .tuner = TUNER_PHILIPS_FM1216ME_MK3 },
|
||||
{ .std = V4L2_STD_NOT_MN, .tuner = TUNER_PHILIPS_FM1216ME_MK3 },
|
||||
{ .std = V4L2_STD_ALL, .tuner = TUNER_PHILIPS_FM1236_MK3 },
|
||||
},
|
||||
.i2c = &ivtv_i2c_std,
|
||||
@ -627,7 +629,7 @@ static const struct ivtv_card ivtv_card_cx23416gyc_nogrycs = {
|
||||
.gpio_audio_freq = { .mask = 0xc000, .f32000 = 0x0000,
|
||||
.f44100 = 0x4000, .f48000 = 0x8000 },
|
||||
.tuners = {
|
||||
{ .std = V4L2_STD_625_50, .tuner = TUNER_PHILIPS_FM1216ME_MK3 },
|
||||
{ .std = V4L2_STD_NOT_MN, .tuner = TUNER_PHILIPS_FM1216ME_MK3 },
|
||||
{ .std = V4L2_STD_ALL, .tuner = TUNER_PHILIPS_FM1236_MK3 },
|
||||
},
|
||||
.i2c = &ivtv_i2c_std,
|
||||
@ -667,7 +669,7 @@ static const struct ivtv_card ivtv_card_gv_mvprx = {
|
||||
.gpio_audio_input = { .mask = 0xffff, .tuner = 0x0200, .linein = 0x0300 },
|
||||
.tuners = {
|
||||
/* This card has the Panasonic VP27 tuner */
|
||||
{ .std = V4L2_STD_525_60, .tuner = TUNER_PANASONIC_VP27 },
|
||||
{ .std = V4L2_STD_525_60|V4L2_STD_MN, .tuner = TUNER_PANASONIC_VP27 },
|
||||
},
|
||||
.pci_list = ivtv_pci_gv_mvprx,
|
||||
.i2c = &ivtv_i2c_std,
|
||||
@ -704,7 +706,7 @@ static const struct ivtv_card ivtv_card_gv_mvprx2e = {
|
||||
.gpio_audio_input = { .mask = 0xffff, .tuner = 0x0200, .linein = 0x0300 },
|
||||
.tuners = {
|
||||
/* This card has the Panasonic VP27 tuner */
|
||||
{ .std = V4L2_STD_525_60, .tuner = TUNER_PANASONIC_VP27 },
|
||||
{ .std = V4L2_STD_525_60|V4L2_STD_MN, .tuner = TUNER_PANASONIC_VP27 },
|
||||
},
|
||||
.pci_list = ivtv_pci_gv_mvprx2e,
|
||||
.i2c = &ivtv_i2c_std,
|
||||
@ -739,7 +741,7 @@ static const struct ivtv_card ivtv_card_gotview_pci_dvd = {
|
||||
.gpio_init = { .direction = 0xf000, .initial_value = 0xA000 },
|
||||
.tuners = {
|
||||
/* This card has a Philips FQ1216ME MK3 tuner */
|
||||
{ .std = V4L2_STD_625_50, .tuner = TUNER_PHILIPS_FM1216ME_MK3 },
|
||||
{ .std = V4L2_STD_NOT_MN, .tuner = TUNER_PHILIPS_FM1216ME_MK3 },
|
||||
},
|
||||
.pci_list = ivtv_pci_gotview_pci_dvd,
|
||||
.i2c = &ivtv_i2c_std,
|
||||
@ -778,7 +780,7 @@ static const struct ivtv_card ivtv_card_gotview_pci_dvd2 = {
|
||||
.gpio_audio_input = { .mask = 0x0800, .tuner = 0, .linein = 0, .radio = 0x0800 },
|
||||
.tuners = {
|
||||
/* This card has a Philips FQ1216ME MK5 tuner */
|
||||
{ .std = V4L2_STD_625_50, .tuner = TUNER_PHILIPS_FM1216ME_MK3 },
|
||||
{ .std = V4L2_STD_NOT_MN, .tuner = TUNER_PHILIPS_FM1216ME_MK3 },
|
||||
},
|
||||
.pci_list = ivtv_pci_gotview_pci_dvd2,
|
||||
.i2c = &ivtv_i2c_std,
|
||||
@ -856,7 +858,7 @@ static const struct ivtv_card ivtv_card_dctmvtvp1 = {
|
||||
.gpio_video_input = { .mask = 0x0030, .tuner = 0x0000,
|
||||
.composite = 0x0010, .svideo = 0x0020},
|
||||
.tuners = {
|
||||
{ .std = V4L2_STD_525_60, .tuner = TUNER_PHILIPS_FQ1286 },
|
||||
{ .std = V4L2_STD_525_60|V4L2_STD_MN, .tuner = TUNER_PHILIPS_FQ1286 },
|
||||
},
|
||||
.pci_list = ivtv_pci_dctmvtvp1,
|
||||
.i2c = &ivtv_i2c_std,
|
||||
@ -992,7 +994,7 @@ static const struct ivtv_card ivtv_card_aver_pvr150 = {
|
||||
.gpio_audio_input = { .mask = 0x0800, .tuner = 0, .linein = 0, .radio = 0x0800 },
|
||||
.tuners = {
|
||||
/* This card has a Partsnic PTI-5NF05 tuner */
|
||||
{ .std = V4L2_STD_525_60, .tuner = TUNER_TCL_2002N },
|
||||
{ .std = V4L2_STD_525_60|V4L2_STD_MN, .tuner = TUNER_TCL_2002N },
|
||||
},
|
||||
.pci_list = ivtv_pci_aver_pvr150,
|
||||
.i2c = &ivtv_i2c_radio,
|
||||
@ -1060,7 +1062,7 @@ static const struct ivtv_card ivtv_card_asus_falcon2 = {
|
||||
},
|
||||
.radio_input = { IVTV_CARD_INPUT_AUD_TUNER, CX25840_AUDIO_SERIAL, M52790_IN_TUNER },
|
||||
.tuners = {
|
||||
{ .std = V4L2_STD_525_60, .tuner = TUNER_PHILIPS_FM1236_MK3 },
|
||||
{ .std = V4L2_STD_525_60|V4L2_STD_MN, .tuner = TUNER_PHILIPS_FM1236_MK3 },
|
||||
},
|
||||
.pci_list = ivtv_pci_asus_falcon2,
|
||||
.i2c = &ivtv_i2c_std,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user