Skip to content

L
linux
Commit 792a21b0 authored by Hans de Goede's avatar Hans de Goede Committed by Mauro Carvalho Chehab
Browse files
Options

[media] bttv: Remove unused needs_tvaudio card variable 

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 5c164646
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 77 deletions
drivers/media/video/bt8xx/bttv-cards.c
View file @ 792a21b0
...@@ -371,7 +371,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -371,7 +371,6 @@ struct tvcard bttv_tvcards[] = {
.muxsel = MUXSEL(2, 3, 1, 1), .muxsel = MUXSEL(2, 3, 1, 1),
.gpiomux = { 2, 0, 0, 0 }, .gpiomux = { 2, 0, 0, 0 },
.gpiomute = 10, .gpiomute = 10,
.needs_tvaudio = 1,
.tuner_type = UNSET, .tuner_type = UNSET,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
}, },
...@@ -384,7 +383,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -384,7 +383,6 @@ struct tvcard bttv_tvcards[] = {
.muxsel = MUXSEL(2, 3, 1, 1), .muxsel = MUXSEL(2, 3, 1, 1),
.gpiomux = { 0, 1, 2, 3 }, .gpiomux = { 0, 1, 2, 3 },
.gpiomute = 4, .gpiomute = 4,
.needs_tvaudio = 1,
.tuner_type = UNSET, .tuner_type = UNSET,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
}, },
...@@ -398,7 +396,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -398,7 +396,6 @@ struct tvcard bttv_tvcards[] = {
.gpiomux = { 4, 0, 2, 3 }, .gpiomux = { 4, 0, 2, 3 },
.gpiomute = 1, .gpiomute = 1,
.no_msp34xx = 1, .no_msp34xx = 1,
.needs_tvaudio = 1,
.tuner_type = TUNER_PHILIPS_NTSC, .tuner_type = TUNER_PHILIPS_NTSC,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
.pll = PLL_28, .pll = PLL_28,
...@@ -414,7 +411,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -414,7 +411,6 @@ struct tvcard bttv_tvcards[] = {
.gpiomask = 0, .gpiomask = 0,
.muxsel = MUXSEL(2, 3, 1, 1), .muxsel = MUXSEL(2, 3, 1, 1),
.gpiomux = { 0 }, .gpiomux = { 0 },
.needs_tvaudio = 0,
.tuner_type = TUNER_ABSENT, .tuner_type = TUNER_ABSENT,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
}, },
...@@ -427,7 +423,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -427,7 +423,6 @@ struct tvcard bttv_tvcards[] = {
.muxsel = MUXSEL(2, 3, 1, 0), .muxsel = MUXSEL(2, 3, 1, 0),
.gpiomux = { 0, 1, 0, 1 }, .gpiomux = { 0, 1, 0, 1 },
.gpiomute = 3, .gpiomute = 3,
.needs_tvaudio = 1,
.tuner_type = UNSET, .tuner_type = UNSET,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
}, },
...@@ -440,7 +435,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -440,7 +435,6 @@ struct tvcard bttv_tvcards[] = {
.gpiomask = 0x0f, .gpiomask = 0x0f,
.gpiomux = { 0x0c, 0x04, 0x08, 0x04 }, .gpiomux = { 0x0c, 0x04, 0x08, 0x04 },
/* 0x04 for some cards ?? */ /* 0x04 for some cards ?? */
.needs_tvaudio = 1,
.tuner_type = UNSET, .tuner_type = UNSET,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
.audio_mode_gpio= avermedia_tvphone_audio, .audio_mode_gpio= avermedia_tvphone_audio,
...@@ -454,7 +448,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -454,7 +448,6 @@ struct tvcard bttv_tvcards[] = {
.gpiomask = 0, .gpiomask = 0,
.muxsel = MUXSEL(2, 3, 1, 0, 0), .muxsel = MUXSEL(2, 3, 1, 0, 0),
.gpiomux = { 0 }, .gpiomux = { 0 },
.needs_tvaudio = 1,
.tuner_type = TUNER_ABSENT, .tuner_type = TUNER_ABSENT,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
}, },
...@@ -469,7 +462,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -469,7 +462,6 @@ struct tvcard bttv_tvcards[] = {
.muxsel = MUXSEL(2, 3, 1, 1), .muxsel = MUXSEL(2, 3, 1, 1),
.gpiomux = { 0, 0xc00, 0x800, 0x400 }, .gpiomux = { 0, 0xc00, 0x800, 0x400 },
.gpiomute = 0xc00, .gpiomute = 0xc00,
.needs_tvaudio = 1,
.pll = PLL_28, .pll = PLL_28,
.tuner_type = UNSET, .tuner_type = UNSET,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
...@@ -482,7 +474,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -482,7 +474,6 @@ struct tvcard bttv_tvcards[] = {
.gpiomask = 3, .gpiomask = 3,
.muxsel = MUXSEL(2, 3, 1, 1), .muxsel = MUXSEL(2, 3, 1, 1),
.gpiomux = { 1, 1, 2, 3 }, .gpiomux = { 1, 1, 2, 3 },
.needs_tvaudio = 0,
.pll = PLL_28, .pll = PLL_28,
.tuner_type = TUNER_TEMIC_PAL, .tuner_type = TUNER_TEMIC_PAL,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
...@@ -496,7 +487,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -496,7 +487,6 @@ struct tvcard bttv_tvcards[] = {
.muxsel = MUXSEL(2, 0, 1, 1), .muxsel = MUXSEL(2, 0, 1, 1),
.gpiomux = { 0, 1, 2, 3 }, .gpiomux = { 0, 1, 2, 3 },
.gpiomute = 4, .gpiomute = 4,
.needs_tvaudio = 1,
.pll = PLL_28, .pll = PLL_28,
.tuner_type = UNSET, .tuner_type = UNSET,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
...@@ -510,7 +500,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -510,7 +500,6 @@ struct tvcard bttv_tvcards[] = {
.muxsel = MUXSEL(2, 3, 1, 1), .muxsel = MUXSEL(2, 3, 1, 1),
.gpiomux = { 0x20001,0x10001, 0, 0 }, .gpiomux = { 0x20001,0x10001, 0, 0 },
.gpiomute = 10, .gpiomute = 10,
.needs_tvaudio = 1,
.tuner_type = UNSET, .tuner_type = UNSET,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
}, },
...@@ -524,7 +513,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -524,7 +513,6 @@ struct tvcard bttv_tvcards[] = {
.gpiomask = 15, .gpiomask = 15,
.muxsel = MUXSEL(2, 3, 1, 1), .muxsel = MUXSEL(2, 3, 1, 1),
.gpiomux = { 13, 14, 11, 7 }, .gpiomux = { 13, 14, 11, 7 },
.needs_tvaudio = 1,
.tuner_type = UNSET, .tuner_type = UNSET,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
}, },
...@@ -536,7 +524,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -536,7 +524,6 @@ struct tvcard bttv_tvcards[] = {
.gpiomask = 15, .gpiomask = 15,
.muxsel = MUXSEL(2, 3, 1, 1), .muxsel = MUXSEL(2, 3, 1, 1),
.gpiomux = { 13, 14, 11, 7 }, .gpiomux = { 13, 14, 11, 7 },
.needs_tvaudio = 1,
.msp34xx_alt = 1, .msp34xx_alt = 1,
.pll = PLL_28, .pll = PLL_28,
.tuner_type = TUNER_PHILIPS_PAL, .tuner_type = TUNER_PHILIPS_PAL,
...@@ -553,7 +540,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -553,7 +540,6 @@ struct tvcard bttv_tvcards[] = {
.muxsel = MUXSEL(2, 3, 1, 1), .muxsel = MUXSEL(2, 3, 1, 1),
.gpiomux = { 0, 2, 1, 3 }, /* old: {0, 1, 2, 3, 4} */ .gpiomux = { 0, 2, 1, 3 }, /* old: {0, 1, 2, 3, 4} */
.gpiomute = 4, .gpiomute = 4,
.needs_tvaudio = 1,
.pll = PLL_28, .pll = PLL_28,
.tuner_type = UNSET, .tuner_type = UNSET,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
...@@ -567,7 +553,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -567,7 +553,6 @@ struct tvcard bttv_tvcards[] = {
.muxsel = MUXSEL(2, 3, 1, 1), .muxsel = MUXSEL(2, 3, 1, 1),
.gpiomux = { 0, 0, 1, 0 }, .gpiomux = { 0, 0, 1, 0 },
.gpiomute = 10, .gpiomute = 10,
.needs_tvaudio = 1,
.tuner_type = UNSET, .tuner_type = UNSET,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
}, },
...@@ -583,7 +568,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -583,7 +568,6 @@ struct tvcard bttv_tvcards[] = {
/* 2003-10-20 by "Anton A. Arapov" <arapov@mail.ru> */ /* 2003-10-20 by "Anton A. Arapov" <arapov@mail.ru> */
.gpiomux = { 0x001e00, 0, 0x018000, 0x014000 }, .gpiomux = { 0x001e00, 0, 0x018000, 0x014000 },
.gpiomute = 0x002000, .gpiomute = 0x002000,
.needs_tvaudio = 1,
.pll = PLL_28, .pll = PLL_28,
.tuner_type = UNSET, .tuner_type = UNSET,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
...@@ -597,7 +581,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -597,7 +581,6 @@ struct tvcard bttv_tvcards[] = {
.muxsel = MUXSEL(2, 3, 1, 1, 0), .muxsel = MUXSEL(2, 3, 1, 1, 0),
.gpiomux = { 0x4fa007,0xcfa007,0xcfa007,0xcfa007 }, .gpiomux = { 0x4fa007,0xcfa007,0xcfa007,0xcfa007 },
.gpiomute = 0xcfa007, .gpiomute = 0xcfa007,
.needs_tvaudio = 1,
.tuner_type = UNSET, .tuner_type = UNSET,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
.volume_gpio = winview_volume, .volume_gpio = winview_volume,
...@@ -611,7 +594,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -611,7 +594,6 @@ struct tvcard bttv_tvcards[] = {
.gpiomask = 0, .gpiomask = 0,
.muxsel = MUXSEL(2, 3, 1, 1), .muxsel = MUXSEL(2, 3, 1, 1),
.gpiomux = { 1, 0, 0, 0 }, .gpiomux = { 1, 0, 0, 0 },
.needs_tvaudio = 1,
.tuner_type = UNSET, .tuner_type = UNSET,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
}, },
...@@ -660,7 +642,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -660,7 +642,6 @@ struct tvcard bttv_tvcards[] = {
.muxsel = MUXSEL(2, 3, 1, 1), .muxsel = MUXSEL(2, 3, 1, 1),
.gpiomux = { 0, 1, 0x800, 0x400 }, .gpiomux = { 0, 1, 0x800, 0x400 },
.gpiomute = 0xc00, .gpiomute = 0xc00,
.needs_tvaudio = 1,
.pll = PLL_28, .pll = PLL_28,
.tuner_type = UNSET, .tuner_type = UNSET,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
...@@ -691,7 +672,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -691,7 +672,6 @@ struct tvcard bttv_tvcards[] = {
.muxsel = MUXSEL(2, 3, 1, 1), .muxsel = MUXSEL(2, 3, 1, 1),
.gpiomux = {0x400, 0x400, 0x400, 0x400 }, .gpiomux = {0x400, 0x400, 0x400, 0x400 },
.gpiomute = 0xc00, .gpiomute = 0xc00,
.needs_tvaudio = 1,
.pll = PLL_28, .pll = PLL_28,
.tuner_type = UNSET, .tuner_type = UNSET,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
...@@ -706,7 +686,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -706,7 +686,6 @@ struct tvcard bttv_tvcards[] = {
.muxsel = MUXSEL(2, 3, 1, 1), .muxsel = MUXSEL(2, 3, 1, 1),
.gpiomux = { 0x20000, 0x30000, 0x10000, 0 }, .gpiomux = { 0x20000, 0x30000, 0x10000, 0 },
.gpiomute = 0x40000, .gpiomute = 0x40000,
.needs_tvaudio = 0,
.tuner_type = TUNER_PHILIPS_PAL, .tuner_type = TUNER_PHILIPS_PAL,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
.audio_mode_gpio= terratv_audio, .audio_mode_gpio= terratv_audio,
...@@ -720,7 +699,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -720,7 +699,6 @@ struct tvcard bttv_tvcards[] = {
.muxsel = MUXSEL(2, 0, 1, 1), .muxsel = MUXSEL(2, 0, 1, 1),
.gpiomux = { 0, 1, 2, 3 }, .gpiomux = { 0, 1, 2, 3 },
.gpiomute = 4, .gpiomute = 4,
.needs_tvaudio = 1,
.tuner_type = UNSET, .tuner_type = UNSET,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
}, },
...@@ -748,7 +726,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -748,7 +726,6 @@ struct tvcard bttv_tvcards[] = {
.muxsel = MUXSEL(2, 3, 1, 1), .muxsel = MUXSEL(2, 3, 1, 1),
.gpiomux = { 0x20000, 0x30000, 0x10000, 0x00000 }, .gpiomux = { 0x20000, 0x30000, 0x10000, 0x00000 },
.gpiomute = 0x40000, .gpiomute = 0x40000,
.needs_tvaudio = 0,
.tuner_type = TUNER_PHILIPS_PAL, .tuner_type = TUNER_PHILIPS_PAL,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
.audio_mode_gpio= terratv_audio, .audio_mode_gpio= terratv_audio,
...@@ -793,7 +770,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -793,7 +770,6 @@ struct tvcard bttv_tvcards[] = {
.gpiomask = 0, .gpiomask = 0,
.muxsel = MUXSEL(2, 3, 1, 0, 0), .muxsel = MUXSEL(2, 3, 1, 0, 0),
.gpiomux = { 0 }, .gpiomux = { 0 },
.needs_tvaudio = 1,
.tuner_type = TUNER_ABSENT, .tuner_type = TUNER_ABSENT,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
.muxsel_hook = PXC200_muxsel, .muxsel_hook = PXC200_muxsel,
...@@ -834,7 +810,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -834,7 +810,6 @@ struct tvcard bttv_tvcards[] = {
.gpiomask = 0, .gpiomask = 0,
.muxsel = MUXSEL(2, 3, 1, 1), .muxsel = MUXSEL(2, 3, 1, 1),
.gpiomux = { 0 }, .gpiomux = { 0 },
.needs_tvaudio = 0,
.tuner_type = TUNER_ABSENT, .tuner_type = TUNER_ABSENT,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
}, },
...@@ -847,7 +822,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -847,7 +822,6 @@ struct tvcard bttv_tvcards[] = {
.muxsel = MUXSEL(2, 3, 1, 1), .muxsel = MUXSEL(2, 3, 1, 1),
.gpiomux = { 0x500, 0, 0x300, 0x900 }, .gpiomux = { 0x500, 0, 0x300, 0x900 },
.gpiomute = 0x900, .gpiomute = 0x900,
.needs_tvaudio = 1,
.pll = PLL_28, .pll = PLL_28,
.tuner_type = TUNER_PHILIPS_PAL, .tuner_type = TUNER_PHILIPS_PAL,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
...@@ -874,7 +848,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -874,7 +848,6 @@ struct tvcard bttv_tvcards[] = {
Note: There exists another variant "Winfast 2000" with tv stereo !? Note: There exists another variant "Winfast 2000" with tv stereo !?
Note: eeprom only contains FF and pci subsystem id 107d:6606 Note: eeprom only contains FF and pci subsystem id 107d:6606
*/ */
.needs_tvaudio = 0,
.pll = PLL_28, .pll = PLL_28,
.has_radio = 1, .has_radio = 1,
.tuner_type = TUNER_PHILIPS_PAL, /* default for now, gpio reads BFFF06 for Pal bg+dk */ .tuner_type = TUNER_PHILIPS_PAL, /* default for now, gpio reads BFFF06 for Pal bg+dk */
...@@ -934,7 +907,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -934,7 +907,6 @@ struct tvcard bttv_tvcards[] = {
.muxsel = MUXSEL(2, 3, 1, 0), .muxsel = MUXSEL(2, 3, 1, 0),
.gpiomux = { 0x551400, 0x551200, 0, 0 }, .gpiomux = { 0x551400, 0x551200, 0, 0 },
.gpiomute = 0x551c00, .gpiomute = 0x551c00,
.needs_tvaudio = 1,
.pll = PLL_28, .pll = PLL_28,
.tuner_type = TUNER_PHILIPS_PAL_I, .tuner_type = TUNER_PHILIPS_PAL_I,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
...@@ -949,7 +921,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -949,7 +921,6 @@ struct tvcard bttv_tvcards[] = {
.muxsel = MUXSEL(2, 3, 1, 1), .muxsel = MUXSEL(2, 3, 1, 1),
.gpiomux = { 2, 0xd0001, 0, 0 }, .gpiomux = { 2, 0xd0001, 0, 0 },
.gpiomute = 1, .gpiomute = 1,
.needs_tvaudio = 0,
.pll = PLL_28, .pll = PLL_28,
.tuner_type = UNSET, .tuner_type = UNSET,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
...@@ -966,7 +937,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -966,7 +937,6 @@ struct tvcard bttv_tvcards[] = {
.gpiomux = { 4, 0, 2, 3 }, .gpiomux = { 4, 0, 2, 3 },
.gpiomute = 1, .gpiomute = 1,
.no_msp34xx = 1, .no_msp34xx = 1,
.needs_tvaudio = 1,
.tuner_type = TUNER_PHILIPS_NTSC, .tuner_type = TUNER_PHILIPS_NTSC,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
.pll = PLL_28, .pll = PLL_28,
...@@ -980,7 +950,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -980,7 +950,6 @@ struct tvcard bttv_tvcards[] = {
.gpiomask = 15, .gpiomask = 15,
.muxsel = MUXSEL(2, 3, 1, 1), .muxsel = MUXSEL(2, 3, 1, 1),
.gpiomux = { 13, 4, 11, 7 }, .gpiomux = { 13, 4, 11, 7 },
.needs_tvaudio = 1,
.pll = PLL_28, .pll = PLL_28,
.tuner_type = UNSET, .tuner_type = UNSET,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
...@@ -995,7 +964,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -995,7 +964,6 @@ struct tvcard bttv_tvcards[] = {
.gpiomask = 0, .gpiomask = 0,
.muxsel = MUXSEL(2, 3, 1, 1), .muxsel = MUXSEL(2, 3, 1, 1),
.gpiomux = { 0, 0, 0, 0}, .gpiomux = { 0, 0, 0, 0},
.needs_tvaudio = 1,
.no_msp34xx = 1, .no_msp34xx = 1,
.pll = PLL_28, .pll = PLL_28,
.tuner_type = TUNER_PHILIPS_PAL_I, .tuner_type = TUNER_PHILIPS_PAL_I,
...@@ -1066,7 +1034,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -1066,7 +1034,6 @@ struct tvcard bttv_tvcards[] = {
.muxsel = MUXSEL(2, 3, 1, 1), .muxsel = MUXSEL(2, 3, 1, 1),
.gpiomux = { 0x20000, 0x30000, 0x10000, 0 }, .gpiomux = { 0x20000, 0x30000, 0x10000, 0 },
.gpiomute = 0x40000, .gpiomute = 0x40000,
.needs_tvaudio = 1,
.no_msp34xx = 1, .no_msp34xx = 1,
.pll = PLL_35, .pll = PLL_35,
.tuner_type = TUNER_PHILIPS_PAL_I, .tuner_type = TUNER_PHILIPS_PAL_I,
...@@ -1084,7 +1051,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -1084,7 +1051,6 @@ struct tvcard bttv_tvcards[] = {
.muxsel = MUXSEL(2, 3, 1, 1), .muxsel = MUXSEL(2, 3, 1, 1),
.gpiomux = {2,0,0,0 }, .gpiomux = {2,0,0,0 },
.gpiomute = 1, .gpiomute = 1,
.needs_tvaudio = 1,
.pll = PLL_28, .pll = PLL_28,
.tuner_type = UNSET, .tuner_type = UNSET,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
...@@ -1163,7 +1129,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -1163,7 +1129,6 @@ struct tvcard bttv_tvcards[] = {
MUX2 (mask 0x30000): MUX2 (mask 0x30000):
0,2,3= from MSP34xx 0,2,3= from MSP34xx
1= FM stereo Radio from Tuner */ 1= FM stereo Radio from Tuner */
.needs_tvaudio = 0,
.pll = PLL_28, .pll = PLL_28,
.tuner_type = UNSET, .tuner_type = UNSET,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
...@@ -1179,7 +1144,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -1179,7 +1144,6 @@ struct tvcard bttv_tvcards[] = {
.muxsel = MUXSEL(2, 3, 1, 1), .muxsel = MUXSEL(2, 3, 1, 1),
.gpiomux = { 0, 0, 0x10, 8 }, .gpiomux = { 0, 0, 0x10, 8 },
.gpiomute = 4, .gpiomute = 4,
.needs_tvaudio = 1,
.pll = PLL_28, .pll = PLL_28,
.tuner_type = TUNER_PHILIPS_PAL, .tuner_type = TUNER_PHILIPS_PAL,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
...@@ -1218,7 +1182,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -1218,7 +1182,6 @@ struct tvcard bttv_tvcards[] = {
.muxsel = MUXSEL(2, 3, 1, 0), .muxsel = MUXSEL(2, 3, 1, 0),
.gpiomux = { 2, 0, 0, 0 }, .gpiomux = { 2, 0, 0, 0 },
.gpiomute = 10, .gpiomute = 10,
.needs_tvaudio = 0,
.pll = PLL_28, .pll = PLL_28,
.tuner_type = TUNER_TEMIC_PAL, .tuner_type = TUNER_TEMIC_PAL,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
...@@ -1250,7 +1213,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -1250,7 +1213,6 @@ struct tvcard bttv_tvcards[] = {
.gpiomask = 0, .gpiomask = 0,
.muxsel = MUXSEL(3, 1), .muxsel = MUXSEL(3, 1),
.gpiomux = { 0 }, .gpiomux = { 0 },
.needs_tvaudio = 0,
.no_msp34xx = 1, .no_msp34xx = 1,
.pll = PLL_35, .pll = PLL_35,
.tuner_type = TUNER_ABSENT, .tuner_type = TUNER_ABSENT,
...@@ -1266,7 +1228,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -1266,7 +1228,6 @@ struct tvcard bttv_tvcards[] = {
.muxsel = MUXSEL(2, 3, 1, 1), .muxsel = MUXSEL(2, 3, 1, 1),
.gpiomux = { 0x400, 0x400, 0x400, 0x400 }, .gpiomux = { 0x400, 0x400, 0x400, 0x400 },
.gpiomute = 0x800, .gpiomute = 0x800,
.needs_tvaudio = 1,
.pll = PLL_28, .pll = PLL_28,
.tuner_type = TUNER_TEMIC_4036FY5_NTSC, .tuner_type = TUNER_TEMIC_4036FY5_NTSC,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
...@@ -1312,7 +1273,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -1312,7 +1273,6 @@ struct tvcard bttv_tvcards[] = {
.muxsel = MUXSEL(2, 2), .muxsel = MUXSEL(2, 2),
.gpiomux = { }, .gpiomux = { },
.no_msp34xx = 1, .no_msp34xx = 1,
.needs_tvaudio = 0,
.pll = PLL_28, .pll = PLL_28,
.tuner_type = TUNER_ABSENT, .tuner_type = TUNER_ABSENT,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
...@@ -1329,7 +1289,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -1329,7 +1289,6 @@ struct tvcard bttv_tvcards[] = {
.muxsel = MUXSEL(2, 3, 1, 0), .muxsel = MUXSEL(2, 3, 1, 0),
.gpiomux = { 1, 0, 4, 4 }, .gpiomux = { 1, 0, 4, 4 },
.gpiomute = 9, .gpiomute = 9,
.needs_tvaudio = 0,
.pll = PLL_28, .pll = PLL_28,
.tuner_type = TUNER_PHILIPS_PAL, .tuner_type = TUNER_PHILIPS_PAL,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
...@@ -1379,7 +1338,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -1379,7 +1338,6 @@ struct tvcard bttv_tvcards[] = {
.gpiomute = 0x1800, .gpiomute = 0x1800,
.audio_mode_gpio= fv2000s_audio, .audio_mode_gpio= fv2000s_audio,
.no_msp34xx = 1, .no_msp34xx = 1,
.needs_tvaudio = 1,
.pll = PLL_28, .pll = PLL_28,
.tuner_type = TUNER_PHILIPS_PAL, .tuner_type = TUNER_PHILIPS_PAL,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
...@@ -1393,7 +1351,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -1393,7 +1351,6 @@ struct tvcard bttv_tvcards[] = {
.muxsel = MUXSEL(2, 3, 1, 1), .muxsel = MUXSEL(2, 3, 1, 1),
.gpiomux = { 0x500, 0x500, 0x300, 0x900 }, .gpiomux = { 0x500, 0x500, 0x300, 0x900 },
.gpiomute = 0x900, .gpiomute = 0x900,
.needs_tvaudio = 1,
.pll = PLL_28, .pll = PLL_28,
.tuner_type = TUNER_PHILIPS_PAL, .tuner_type = TUNER_PHILIPS_PAL,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
...@@ -1477,7 +1434,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -1477,7 +1434,6 @@ struct tvcard bttv_tvcards[] = {
.muxsel = MUXSEL(2, 3, 1, 1), .muxsel = MUXSEL(2, 3, 1, 1),
.gpiomux = { 0, 0, 11, 7 }, /* TV and Radio with same GPIO ! */ .gpiomux = { 0, 0, 11, 7 }, /* TV and Radio with same GPIO ! */
.gpiomute = 13, .gpiomute = 13,
.needs_tvaudio = 1,
.pll = PLL_28, .pll = PLL_28,
.tuner_type = TUNER_LG_PAL_I_FM, .tuner_type = TUNER_LG_PAL_I_FM,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
...@@ -1514,7 +1470,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -1514,7 +1470,6 @@ struct tvcard bttv_tvcards[] = {
.muxsel = MUXSEL(2, 3, 1, 1), .muxsel = MUXSEL(2, 3, 1, 1),
.gpiomux = { 0x01, 0x00, 0x03, 0x03 }, .gpiomux = { 0x01, 0x00, 0x03, 0x03 },
.gpiomute = 0x09, .gpiomute = 0x09,
.needs_tvaudio = 1,
.no_msp34xx = 1, .no_msp34xx = 1,
.pll = PLL_28, .pll = PLL_28,
.tuner_type = TUNER_PHILIPS_PAL, .tuner_type = TUNER_PHILIPS_PAL,
...@@ -1540,7 +1495,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -1540,7 +1495,6 @@ struct tvcard bttv_tvcards[] = {
.gpiomask = 0, .gpiomask = 0,
.muxsel = MUXSEL(2, 3, 1, 0, 0), .muxsel = MUXSEL(2, 3, 1, 0, 0),
.gpiomux = { 0 }, .gpiomux = { 0 },
.needs_tvaudio = 0,
.tuner_type = TUNER_ABSENT, .tuner_type = TUNER_ABSENT,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
}, },
...@@ -1567,7 +1521,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -1567,7 +1521,6 @@ struct tvcard bttv_tvcards[] = {
.muxsel = MUXSEL(2, 1, 1), .muxsel = MUXSEL(2, 1, 1),
.gpiomux = { 0, 1, 2, 2 }, .gpiomux = { 0, 1, 2, 2 },
.gpiomute = 4, .gpiomute = 4,
.needs_tvaudio = 0,
.tuner_type = TUNER_PHILIPS_PAL, .tuner_type = TUNER_PHILIPS_PAL,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
.pll = PLL_28, .pll = PLL_28,
...@@ -1597,7 +1550,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -1597,7 +1550,6 @@ struct tvcard bttv_tvcards[] = {
.gpiomask = 0, .gpiomask = 0,
.muxsel = MUXSEL(2, 3, 1, 0), .muxsel = MUXSEL(2, 3, 1, 0),
.gpiomux = { 0 }, .gpiomux = { 0 },
.needs_tvaudio = 0,
.no_msp34xx = 1, .no_msp34xx = 1,
.pll = PLL_28, .pll = PLL_28,
.tuner_type = TUNER_ABSENT, .tuner_type = TUNER_ABSENT,
...@@ -1619,7 +1571,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -1619,7 +1571,6 @@ struct tvcard bttv_tvcards[] = {
* btwincap uses 0x80000/0x80003 * btwincap uses 0x80000/0x80003
*/ */
.gpiomute = 4, .gpiomute = 4,
.needs_tvaudio = 0,
.no_msp34xx = 1, .no_msp34xx = 1,
.pll = PLL_28, .pll = PLL_28,
.tuner_type = TUNER_PHILIPS_PAL, .tuner_type = TUNER_PHILIPS_PAL,
...@@ -1655,7 +1606,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -1655,7 +1606,6 @@ struct tvcard bttv_tvcards[] = {
/* .audio_inputs= 1, */ /* .audio_inputs= 1, */
.svhs = 2, .svhs = 2,
.muxsel = MUXSEL(2, 0, 1, 1), .muxsel = MUXSEL(2, 0, 1, 1),
.needs_tvaudio = 1,
.pll = PLL_28, .pll = PLL_28,
.tuner_type = UNSET, .tuner_type = UNSET,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
...@@ -1875,7 +1825,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -1875,7 +1825,6 @@ struct tvcard bttv_tvcards[] = {
.muxsel = MUXSEL(2, 3, 1, 1), .muxsel = MUXSEL(2, 3, 1, 1),
.gpiomux = { 0, 1, 2, 3}, .gpiomux = { 0, 1, 2, 3},
.gpiomute = 4, .gpiomute = 4,
.needs_tvaudio = 1,
.tuner_type = TUNER_PHILIPS_PAL, .tuner_type = TUNER_PHILIPS_PAL,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
.pll = PLL_28, .pll = PLL_28,
...@@ -1902,7 +1851,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -1902,7 +1851,6 @@ struct tvcard bttv_tvcards[] = {
.gpiomask = 0, .gpiomask = 0,
.muxsel = MUXSEL(2, 3), .muxsel = MUXSEL(2, 3),
.gpiomux = { 0 }, .gpiomux = { 0 },
.needs_tvaudio = 0,
.no_msp34xx = 1, .no_msp34xx = 1,
.pll = PLL_28, .pll = PLL_28,
.tuner_type = TUNER_ABSENT, .tuner_type = TUNER_ABSENT,
...@@ -1920,7 +1868,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -1920,7 +1868,6 @@ struct tvcard bttv_tvcards[] = {
/* Tuner, Radio, external, internal, off, on */ /* Tuner, Radio, external, internal, off, on */
.gpiomux = { 0x08, 0x0f, 0x0a, 0x08 }, .gpiomux = { 0x08, 0x0f, 0x0a, 0x08 },
.gpiomute = 0x0f, .gpiomute = 0x0f,
.needs_tvaudio = 0,
.no_msp34xx = 1, .no_msp34xx = 1,
.pll = PLL_28, .pll = PLL_28,
.tuner_type = TUNER_PHILIPS_NTSC, .tuner_type = TUNER_PHILIPS_NTSC,
...@@ -1936,7 +1883,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -1936,7 +1883,6 @@ struct tvcard bttv_tvcards[] = {
.svhs = 2, .svhs = 2,
.gpiomask = 0x00, .gpiomask = 0x00,
.muxsel = MUXSEL(2, 3, 1, 1), .muxsel = MUXSEL(2, 3, 1, 1),
.needs_tvaudio = 1,
.no_msp34xx = 1, .no_msp34xx = 1,
.pll = PLL_28, .pll = PLL_28,
.tuner_type = TUNER_PHILIPS_PAL, .tuner_type = TUNER_PHILIPS_PAL,
...@@ -2034,7 +1980,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -2034,7 +1980,6 @@ struct tvcard bttv_tvcards[] = {
.gpiomask = 0, .gpiomask = 0,
.muxsel = MUXSEL(2, 3, 1, 0), .muxsel = MUXSEL(2, 3, 1, 0),
.gpiomux = { 0 }, .gpiomux = { 0 },
.needs_tvaudio = 0,
.no_msp34xx = 1, .no_msp34xx = 1,
.pll = PLL_28, .pll = PLL_28,
.tuner_type = TUNER_ABSENT, .tuner_type = TUNER_ABSENT,
...@@ -2049,7 +1994,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -2049,7 +1994,6 @@ struct tvcard bttv_tvcards[] = {
.gpiomask = 0x00, .gpiomask = 0x00,
.muxsel = MUXSEL(2, 3, 1, 0), .muxsel = MUXSEL(2, 3, 1, 0),
.gpiomux = { 0, 0, 0, 0 }, /* card has no audio */ .gpiomux = { 0, 0, 0, 0 }, /* card has no audio */
.needs_tvaudio = 0,
.pll = PLL_28, .pll = PLL_28,
.tuner_type = TUNER_ABSENT, .tuner_type = TUNER_ABSENT,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
...@@ -2062,7 +2006,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -2062,7 +2006,6 @@ struct tvcard bttv_tvcards[] = {
.gpiomask = 0x00, .gpiomask = 0x00,
.muxsel = MUXSEL(2, 3, 1, 1), .muxsel = MUXSEL(2, 3, 1, 1),
.gpiomux = { 0, 0, 0, 0 }, /* card has no audio */ .gpiomux = { 0, 0, 0, 0 }, /* card has no audio */
.needs_tvaudio = 0,
.pll = PLL_28, .pll = PLL_28,
.tuner_type = TUNER_ABSENT, .tuner_type = TUNER_ABSENT,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
...@@ -2079,7 +2022,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -2079,7 +2022,6 @@ struct tvcard bttv_tvcards[] = {
.muxsel = MUXSEL(2, 2, 2, 2, 3, 3, 3, 3, 1, 0), .muxsel = MUXSEL(2, 2, 2, 2, 3, 3, 3, 3, 1, 0),
.muxsel_hook = phytec_muxsel, .muxsel_hook = phytec_muxsel,
.gpiomux = { 0, 0, 0, 0 }, /* card has no audio */ .gpiomux = { 0, 0, 0, 0 }, /* card has no audio */
.needs_tvaudio = 1,
.pll = PLL_28, .pll = PLL_28,
.tuner_type = TUNER_ABSENT, .tuner_type = TUNER_ABSENT,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
...@@ -2094,7 +2036,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -2094,7 +2036,6 @@ struct tvcard bttv_tvcards[] = {
.muxsel = MUXSEL(2, 2, 2, 2, 3, 3, 3, 3, 1, 1), .muxsel = MUXSEL(2, 2, 2, 2, 3, 3, 3, 3, 1, 1),
.muxsel_hook = phytec_muxsel, .muxsel_hook = phytec_muxsel,
.gpiomux = { 0, 0, 0, 0 }, /* card has no audio */ .gpiomux = { 0, 0, 0, 0 }, /* card has no audio */
.needs_tvaudio = 1,
.pll = PLL_28, .pll = PLL_28,
.tuner_type = TUNER_ABSENT, .tuner_type = TUNER_ABSENT,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
...@@ -2118,7 +2059,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -2118,7 +2059,6 @@ struct tvcard bttv_tvcards[] = {
.tuner_type = TUNER_ABSENT, .tuner_type = TUNER_ABSENT,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
.svhs = NO_SVHS, /* card has no svhs */ .svhs = NO_SVHS, /* card has no svhs */
.needs_tvaudio = 0,
.no_msp34xx = 1, .no_msp34xx = 1,
.no_tda7432 = 1, .no_tda7432 = 1,
.gpiomask = 0x00, .gpiomask = 0x00,
...@@ -2168,7 +2108,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -2168,7 +2108,6 @@ struct tvcard bttv_tvcards[] = {
.gpiomask = 3, .gpiomask = 3,
.muxsel = MUXSEL(2, 3, 1, 1), .muxsel = MUXSEL(2, 3, 1, 1),
.gpiomux = { 1, 1, 1, 1 }, .gpiomux = { 1, 1, 1, 1 },
.needs_tvaudio = 1,
.tuner_type = TUNER_PHILIPS_PAL, .tuner_type = TUNER_PHILIPS_PAL,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
.pll = PLL_35, .pll = PLL_35,
...@@ -2210,7 +2149,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -2210,7 +2149,6 @@ struct tvcard bttv_tvcards[] = {
.muxsel = MUXSEL(2, 3, 1, 0), .muxsel = MUXSEL(2, 3, 1, 0),
.no_msp34xx = 1, .no_msp34xx = 1,
.no_tda7432 = 1, .no_tda7432 = 1,
.needs_tvaudio = 0,
.tuner_type = TUNER_ABSENT, .tuner_type = TUNER_ABSENT,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
}, },
...@@ -2222,7 +2160,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -2222,7 +2160,6 @@ struct tvcard bttv_tvcards[] = {
.tuner_type = TUNER_PHILIPS_PAL, .tuner_type = TUNER_PHILIPS_PAL,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
.svhs = 2, .svhs = 2,
.needs_tvaudio = 0,
.gpiomask = 0x68, .gpiomask = 0x68,
.muxsel = MUXSEL(2, 3, 1), .muxsel = MUXSEL(2, 3, 1),
.gpiomux = { 0x68, 0x68, 0x61, 0x61 }, .gpiomux = { 0x68, 0x68, 0x61, 0x61 },
...@@ -2241,7 +2178,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -2241,7 +2178,6 @@ struct tvcard bttv_tvcards[] = {
.muxsel = MUXSEL(2, 3, 1, 1), .muxsel = MUXSEL(2, 3, 1, 1),
.gpiomux = { 0, 1, 2, 2 }, .gpiomux = { 0, 1, 2, 2 },
.gpiomute = 3, .gpiomute = 3,
.needs_tvaudio = 0,
.pll = PLL_28, .pll = PLL_28,
.tuner_type = TUNER_PHILIPS_PAL, .tuner_type = TUNER_PHILIPS_PAL,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
...@@ -2265,7 +2201,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -2265,7 +2201,6 @@ struct tvcard bttv_tvcards[] = {
.muxsel = MUXSEL(2, 2, 2, 2), .muxsel = MUXSEL(2, 2, 2, 2),
.gpiomux = { 0, 0, 0, 0 }, /* card has no audio */ .gpiomux = { 0, 0, 0, 0 }, /* card has no audio */
.pll = PLL_28, .pll = PLL_28,
.needs_tvaudio = 0,
.muxsel_hook = picolo_tetra_muxsel,/*Required as it doesn't follow the classic input selection policy*/ .muxsel_hook = picolo_tetra_muxsel,/*Required as it doesn't follow the classic input selection policy*/
.tuner_type = TUNER_ABSENT, .tuner_type = TUNER_ABSENT,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
...@@ -2358,7 +2293,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -2358,7 +2293,6 @@ struct tvcard bttv_tvcards[] = {
.muxsel = MUXSEL(2, 3, 1, 1), .muxsel = MUXSEL(2, 3, 1, 1),
.gpiomux = { 2, 0, 0, 0 }, .gpiomux = { 2, 0, 0, 0 },
.gpiomute = 10, .gpiomute = 10,
.needs_tvaudio = 0,
.pll = PLL_28, .pll = PLL_28,
.tuner_type = TUNER_PHILIPS_PAL, .tuner_type = TUNER_PHILIPS_PAL,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
...@@ -2405,7 +2339,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -2405,7 +2339,6 @@ struct tvcard bttv_tvcards[] = {
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
.gpiomask = 0x008007, .gpiomask = 0x008007,
.gpiomux = { 0, 0x000001,0,0 }, .gpiomux = { 0, 0x000001,0,0 },
.needs_tvaudio = 1,
.has_radio = 1, .has_radio = 1,
}, },
[BTTV_BOARD_TIBET_CS16] = { [BTTV_BOARD_TIBET_CS16] = {
...@@ -2518,7 +2451,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -2518,7 +2451,6 @@ struct tvcard bttv_tvcards[] = {
.muxsel = MUXSEL(2, 3, 1, 1), .muxsel = MUXSEL(2, 3, 1, 1),
.gpiomux = { 0x001e00, 0, 0x018000, 0x014000 }, .gpiomux = { 0x001e00, 0, 0x018000, 0x014000 },
.gpiomute = 0x002000, .gpiomute = 0x002000,
.needs_tvaudio = 1,
.pll = PLL_28, .pll = PLL_28,
.tuner_type = TUNER_YMEC_TVF66T5_B_DFF, .tuner_type = TUNER_YMEC_TVF66T5_B_DFF,
.tuner_addr = 0xc1 >>1, .tuner_addr = 0xc1 >>1,
...@@ -2534,7 +2466,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -2534,7 +2466,6 @@ struct tvcard bttv_tvcards[] = {
.muxsel = MUXSEL(2, 3, 1, 1), .muxsel = MUXSEL(2, 3, 1, 1),
.gpiomux = { 0, 1, 2, 2 }, .gpiomux = { 0, 1, 2, 2 },
.gpiomute = 3, .gpiomute = 3,
.needs_tvaudio = 0,
.pll = PLL_28, .pll = PLL_28,
.tuner_type = TUNER_TENA_9533_DI, .tuner_type = TUNER_TENA_9533_DI,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
...@@ -2615,7 +2546,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -2615,7 +2546,6 @@ struct tvcard bttv_tvcards[] = {
.muxsel = MUXSEL(2, 3, 1, 1), .muxsel = MUXSEL(2, 3, 1, 1),
.gpiomux = { 2, 0, 0, 0 }, .gpiomux = { 2, 0, 0, 0 },
.gpiomute = 1, .gpiomute = 1,
.needs_tvaudio = 1,
.pll = PLL_28, .pll = PLL_28,
.tuner_type = TUNER_PHILIPS_NTSC, .tuner_type = TUNER_PHILIPS_NTSC,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
...@@ -2714,7 +2644,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -2714,7 +2644,6 @@ struct tvcard bttv_tvcards[] = {
.muxsel = MUXSEL(2, 3, 1, 1), .muxsel = MUXSEL(2, 3, 1, 1),
.gpiomux = { 0x20001,0x10001, 0, 0 }, .gpiomux = { 0x20001,0x10001, 0, 0 },
.gpiomute = 10, .gpiomute = 10,
.needs_tvaudio = 1,
.pll = PLL_28, .pll = PLL_28,
.tuner_type = TUNER_PHILIPS_PAL_I, .tuner_type = TUNER_PHILIPS_PAL_I,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
...@@ -2746,7 +2675,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -2746,7 +2675,6 @@ struct tvcard bttv_tvcards[] = {
.muxsel = MUXSEL(2, 3, 1, 1), .muxsel = MUXSEL(2, 3, 1, 1),
.gpiomux = { 0, 1, 2, 2 }, /* CONTVFMi */ .gpiomux = { 0, 1, 2, 2 }, /* CONTVFMi */
.gpiomute = 3, /* CONTVFMi */ .gpiomute = 3, /* CONTVFMi */
.needs_tvaudio = 0,
.tuner_type = TUNER_PHILIPS_FM1216ME_MK3, /* TCL MK3 */ .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, /* TCL MK3 */
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
.pll = PLL_28, .pll = PLL_28,
...@@ -2785,7 +2713,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -2785,7 +2713,6 @@ struct tvcard bttv_tvcards[] = {
.gpiomask = 0x00, .gpiomask = 0x00,
.muxsel = MUXSEL(0, 2, 3, 1), .muxsel = MUXSEL(0, 2, 3, 1),
.gpiomux = { 0, 0, 0, 0 }, /* card has no audio */ .gpiomux = { 0, 0, 0, 0 }, /* card has no audio */
.needs_tvaudio = 0,
.pll = PLL_28, .pll = PLL_28,
.tuner_type = TUNER_ABSENT, .tuner_type = TUNER_ABSENT,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
...@@ -2799,7 +2726,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -2799,7 +2726,6 @@ struct tvcard bttv_tvcards[] = {
.gpiomask = 0x00, .gpiomask = 0x00,
.muxsel = MUXSEL(2, 3, 1), .muxsel = MUXSEL(2, 3, 1),
.gpiomux = { 0, 0, 0, 0 }, /* card has no audio */ .gpiomux = { 0, 0, 0, 0 }, /* card has no audio */
.needs_tvaudio = 0,
.pll = PLL_28, .pll = PLL_28,
.tuner_type = TUNER_ABSENT, .tuner_type = TUNER_ABSENT,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
...@@ -2813,7 +2739,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -2813,7 +2739,6 @@ struct tvcard bttv_tvcards[] = {
.gpiomask = 0x00, .gpiomask = 0x00,
.muxsel = MUXSEL(3, 2, 1), .muxsel = MUXSEL(3, 2, 1),
.gpiomux = { 0, 0, 0, 0 }, /* card has no audio */ .gpiomux = { 0, 0, 0, 0 }, /* card has no audio */
.needs_tvaudio = 0,
.pll = PLL_28, .pll = PLL_28,
.tuner_type = TUNER_ABSENT, .tuner_type = TUNER_ABSENT,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
...@@ -2877,7 +2802,6 @@ struct tvcard bttv_tvcards[] = { ...@@ -2877,7 +2802,6 @@ struct tvcard bttv_tvcards[] = {
.gpiomask = 0, .gpiomask = 0,
.muxsel = MUXSEL(2, 3), .muxsel = MUXSEL(2, 3),
.gpiomux = { 0 }, .gpiomux = { 0 },
.needs_tvaudio = 0,
.no_msp34xx = 1, .no_msp34xx = 1,
.pll = PLL_28, .pll = PLL_28,
.tuner_type = TUNER_ABSENT, .tuner_type = TUNER_ABSENT,
......
drivers/media/video/bt8xx/bttv.h
View file @ 792a21b0
...@@ -236,7 +236,6 @@ struct tvcard { ...@@ -236,7 +236,6 @@ struct tvcard {
/* i2c audio flags */ /* i2c audio flags */
unsigned int no_msp34xx:1; unsigned int no_msp34xx:1;
unsigned int no_tda7432:1; unsigned int no_tda7432:1;
unsigned int needs_tvaudio:1;
unsigned int msp34xx_alt:1; unsigned int msp34xx_alt:1;
/* Note: currently no card definition needs to mark the presence /* Note: currently no card definition needs to mark the presence
of a RDS saa6588 chip. If this is ever needed, then add a new of a RDS saa6588 chip. If this is ever needed, then add a new
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7