Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8acdbcfd authored by David Bentham's avatar David Bentham Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (9057): saa7134: Hauppauge HVR-1110, support for radio and analog audio in 



The audio switch is at 0x100 and radio on gpio 21.

Tested-by: default avatarThomas Genty <tomlohave@gmail.com>
Signed-off-by: default avatarDavid Bentham <db260179@hotmail.com>
Reviewed-by: default avatarHermann Pitton <hermann-pitton@arcor.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 0975fc68

drivers/media/video/saa7134/saa7134-cards.c

+14 −10
Original line number Original line Diff line number Diff line
@@ -3260,6 +3260,7 @@ struct saa7134_board saa7134_boards[] = { 
	},

	},

	[SAA7134_BOARD_HAUPPAUGE_HVR1110] = {

	[SAA7134_BOARD_HAUPPAUGE_HVR1110] = {

		/* Thomas Genty <tomlohave@gmail.com> */

		/* Thomas Genty <tomlohave@gmail.com> */

		/* David Bentham <db260179@hotmail.com> */

		.name           = "Hauppauge WinTV-HVR1110 DVB-T/Hybrid",

		.name           = "Hauppauge WinTV-HVR1110 DVB-T/Hybrid",

		.audio_clock    = 0x00187de7,

		.audio_clock    = 0x00187de7,

		.tuner_type     = TUNER_PHILIPS_TDA8290,

		.tuner_type     = TUNER_PHILIPS_TDA8290,
@@ -3268,23 +3269,26 @@ struct saa7134_board saa7134_boards[] = { 
		.radio_addr     = ADDR_UNSET,

		.radio_addr     = ADDR_UNSET,

		.tuner_config   = 1,

		.tuner_config   = 1,

		.mpeg           = SAA7134_MPEG_DVB,

		.mpeg           = SAA7134_MPEG_DVB,

		.gpiomask       = 0x0200100,

		.inputs         = {{

		.inputs         = {{

			.name = name_tv,

			.name = name_tv,

			.vmux = 1,

			.vmux = 1,

			.amux = TV,

			.amux = TV,

			.tv   = 1,

			.tv   = 1,

			.gpio = 0x0000100,

		}, {

		}, {

			.name = name_comp1,

			.name = name_comp1,

			.vmux = 3,

			.vmux = 3,

			.amux   = LINE2, /* FIXME: audio doesn't work on svideo/composite */

			.amux = LINE1,

		}, {

		}, {

			.name = name_svideo,

			.name = name_svideo,

			.vmux = 8,

			.vmux = 8,

			.amux   = LINE2, /* FIXME: audio doesn't work on svideo/composite */

			.amux = LINE1,

		} },

		} },

		.radio = {

		.radio = {

			.name = name_radio,

			.name = name_radio,

			.amux = TV,

			.amux = TV,

			.gpio = 0x0200100,

		},

		},

	},

	},

	[SAA7134_BOARD_CINERGY_HT_PCMCIA] = {

	[SAA7134_BOARD_CINERGY_HT_PCMCIA] = {