forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
V4L/DVB (11386): saa7134: Add analog RF tuner support for Avermedia A…
…700 DVB-S Hybrid+FM card Thanks to panagonov <[email protected]> for requesting support and testing patches. Signed-off-by: Matthias Schwarzott <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
- Loading branch information
Showing
1 changed file
with
16 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4508,12 +4508,17 @@ struct saa7134_board saa7134_boards[] = { | |
| /* Matthias Schwarzott <[email protected]> */ | ||
| .name = "Avermedia DVB-S Hybrid+FM A700", | ||
| .audio_clock = 0x00187de7, | ||
| .tuner_type = TUNER_ABSENT, /* TUNER_XC2028 */ | ||
| .tuner_type = TUNER_XC2028, | ||
| .radio_type = UNSET, | ||
| .tuner_addr = ADDR_UNSET, | ||
| .radio_addr = ADDR_UNSET, | ||
| .mpeg = SAA7134_MPEG_DVB, | ||
| .inputs = { { | ||
| .name = name_tv, | ||
| .vmux = 4, | ||
| .amux = TV, | ||
| .tv = 1, | ||
| }, { | ||
| .name = name_comp, | ||
| .vmux = 1, | ||
| .amux = LINE1, | ||
|
|
@@ -4522,6 +4527,10 @@ struct saa7134_board saa7134_boards[] = { | |
| .vmux = 6, | ||
| .amux = LINE1, | ||
| } }, | ||
| .radio = { | ||
| .name = name_radio, | ||
| .amux = TV, | ||
| }, | ||
| }, | ||
| [SAA7134_BOARD_BEHOLD_H6] = { | ||
| /* Igor Kuznetsov <[email protected]> */ | ||
|
|
@@ -5914,6 +5923,11 @@ static int saa7134_xc2028_callback(struct saa7134_dev *dev, | |
| msleep(10); | ||
| saa7134_set_gpio(dev, 21, 1); | ||
| break; | ||
| case SAA7134_BOARD_AVERMEDIA_A700_HYBRID: | ||
| saa7134_set_gpio(dev, 18, 0); | ||
| msleep(10); | ||
| saa7134_set_gpio(dev, 18, 1); | ||
| break; | ||
| } | ||
| return 0; | ||
| } | ||
|
|
@@ -6259,10 +6273,6 @@ int saa7134_board_init1(struct saa7134_dev *dev) | |
| saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, 0x0c0007cd, 0x0c0007cd); | ||
| break; | ||
| case SAA7134_BOARD_AVERMEDIA_A700_HYBRID: | ||
| printk("%s: %s: hybrid analog/dvb card\n" | ||
| "%s: Sorry, of the analog inputs, only analog s-video and composite " | ||
| "are supported for now.\n", | ||
| dev->name, card(dev).name, dev->name); | ||
| case SAA7134_BOARD_AVERMEDIA_A700_PRO: | ||
| /* write windows gpio values */ | ||
| saa_andorl(SAA7134_GPIO_GPMODE0 >> 2, 0x80040100, 0x80040100); | ||
|
|
@@ -6326,6 +6336,7 @@ static void saa7134_tuner_setup(struct saa7134_dev *dev) | |
| case SAA7134_BOARD_AVERMEDIA_A16D: | ||
| case SAA7134_BOARD_AVERMEDIA_CARDBUS_506: | ||
| case SAA7134_BOARD_AVERMEDIA_M103: | ||
| case SAA7134_BOARD_AVERMEDIA_A700_HYBRID: | ||
| ctl.demod = XC3028_FE_ZARLINK456; | ||
| break; | ||
| default: | ||
|
|
||