saa7134: Add analog RF tuner support for Avermedia A700 DVB-S Hybrid+FM card

Commit Message

Matthias Schwarzott March 29, 2009, 7:36 p.m. UTC

Hi list!

The attached patch enables the XC2028 analog tuner used on the Avermedia A700 
DVB-S Hybrid+FM card.

Regards
Matthias

Comments

Matthias Schwarzott April 1, 2009, 8:40 a.m. UTC | #1

On Sonntag, 29. März 2009, Matthias Schwarzott wrote:
> Hi list!
>
> The attached patch enables the XC2028 analog tuner used on the Avermedia
> A700 DVB-S Hybrid+FM card.
>
As I only have a A700 DVB-S Pro card without this analog RF tuner, I would 
like to get feedback from owners of Avermedia A700 DVB-S Hybrid+FM cards if 
tv and or radio works fine or not.

Regards
Matthias
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

saa7134: add analog RF tuner support for Avermedia A700 DVB-S Hybrid+FM card

Thanks to panagonov <[e-mail]> for requesting support and testing patches.

Signed-off-by: Matthias Schwarzott <[e-mail]>

Index: v4l-dvb/linux/drivers/media/video/saa7134/saa7134-cards.c
===================================================================
--- v4l-dvb.orig/linux/drivers/media/video/saa7134/saa7134-cards.c
+++ v4l-dvb/linux/drivers/media/video/saa7134/saa7134-cards.c
@@ -4546,12 +4546,17 @@  struct saa7134_board saa7134_boards[] = 
 		/* Matthias Schwarzott <[e-mail]> */
 		.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,
@@ -4560,6 +4565,10 @@  struct saa7134_board saa7134_boards[] = 
 			.vmux = 6,
 			.amux = LINE1,
 		} },
+		.radio = {
+			.name = name_radio,
+			.amux = TV,
+		},
 	},
 	[SAA7134_BOARD_BEHOLD_H6] = {
 		/* Igor Kuznetsov <[e-mail]> */
@@ -5989,6 +5998,11 @@  static int saa7134_xc2028_callback(struc
 			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;
 	}
@@ -6361,10 +6375,6 @@  int saa7134_board_init1(struct saa7134_d
 		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);
@@ -6428,6 +6438,7 @@  static void saa7134_tuner_setup(struct s
 		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: