Commit 878cf2a5 authored by Dmitry Belimov's avatar Dmitry Belimov Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (8021): Beholder's cards description 



Split the Beholder M6 family to different models. Because M6 hasn`t RDS, M63
has chip with AC3 codec, M6 Extra has other type of HF module.
Add correct data for support MPEG encoder.

Signed-off-by: default avatarBeholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 37df96d3

Documentation/video4linux/CARDLIST.saa7134

+3 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ 
127 -> Beholder BeholdTV 507 FM/RDS / BeholdTV 509 FM [0000:5071,0000:507B,5ace:5070,5ace:5090]

128 -> Beholder BeholdTV Columbus TVFM          [0000:5201]

129 -> Beholder BeholdTV 607 / BeholdTV 609     [5ace:6070,5ace:6071,5ace:6072,5ace:6073,5ace:6090,5ace:6091,5ace:6092,5ace:6093]

130 -> Beholder BeholdTV M6 / BeholdTV M6 Extra [5ace:6190,5ace:6193,5ace:6191]

130 -> Beholder BeholdTV M6                     [5ace:6190]

131 -> Twinhan Hybrid DTV-DVB 3056 PCI          [1822:0022]

132 -> Genius TVGO AM11MCE

133 -> NXP Snake DVB-S reference design
@@ -141,3 +141,5 @@ 
140 -> Avermedia DVB-S Pro A700                 [1461:a7a1]

141 -> Avermedia DVB-S Hybrid+FM A700           [1461:a7a2]

142 -> Beholder BeholdTV H6                     [5ace:6290]

143 -> Beholder BeholdTV M63                    [5ace:6191]

144 -> Beholder BeholdTV M6 Extra               [5ace:6193]

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

+88 −7
Original line number Diff line number Diff line
@@ -3940,7 +3940,8 @@ struct saa7134_board saa7134_boards[] = { 
	[SAA7134_BOARD_BEHOLD_M6] = {

		/* Igor Kuznetsov <igk@igk.ru> */

		/* Andrey Melnikoff <temnota@kmv.ru> */

		.name           = "Beholder BeholdTV M6 / BeholdTV M6 Extra",

		/* Beholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com> */

		.name           = "Beholder BeholdTV M6",

		.audio_clock    = 0x00187de7,

		.tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,

		.radio_type     = UNSET,
@@ -3966,6 +3967,84 @@ struct saa7134_board saa7134_boards[] = { 
			.amux = LINE2,

		},

		.mpeg  = SAA7134_MPEG_EMPRESS,

		.video_out = CCIR656,

		.vid_port_opts  = (SET_T_CODE_POLARITY_NON_INVERTED |

					SET_CLOCK_NOT_DELAYED |

					SET_CLOCK_INVERTED |

					SET_VSYNC_OFF),

	},

	[SAA7134_BOARD_BEHOLD_M63] = {

		/* Igor Kuznetsov <igk@igk.ru> */

		/* Andrey Melnikoff <temnota@kmv.ru> */

		/* Beholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com> */

		.name           = "Beholder BeholdTV M63",

		.audio_clock    = 0x00187de7,

		.tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,

		.radio_type     = UNSET,

		.tuner_addr     = ADDR_UNSET,

		.radio_addr     = ADDR_UNSET,

		.tda9887_conf   = TDA9887_PRESENT,

		.inputs         = { {

			.name = name_tv,

			.vmux = 3,

			.amux = TV,

			.tv   = 1,

		}, {

			.name = name_comp1,

			.vmux = 1,

			.amux = LINE1,

		}, {

			.name = name_svideo,

			.vmux = 8,

			.amux = LINE1,

		} },

		.radio = {

			.name = name_radio,

			.amux = LINE2,

		},

		.mpeg  = SAA7134_MPEG_EMPRESS,

		.video_out = CCIR656,

		.vid_port_opts  = (SET_T_CODE_POLARITY_NON_INVERTED |

					SET_CLOCK_NOT_DELAYED |

					SET_CLOCK_INVERTED |

					SET_VSYNC_OFF),

	},

	[SAA7134_BOARD_BEHOLD_M6_EXTRA] = {

		/* Igor Kuznetsov <igk@igk.ru> */

		/* Andrey Melnikoff <temnota@kmv.ru> */

		/* Beholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com> */

		.name           = "Beholder BeholdTV M6 Extra",

		.audio_clock    = 0x00187de7,

		/* FIXME: Must be PHILIPS_FM1216ME_MK5*/

		.tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,

		.radio_type     = UNSET,

		.tuner_addr     = ADDR_UNSET,

		.radio_addr     = ADDR_UNSET,

		.tda9887_conf   = TDA9887_PRESENT,

		.inputs         = { {

			.name = name_tv,

			.vmux = 3,

			.amux = TV,

			.tv   = 1,

		}, {

			.name = name_comp1,

			.vmux = 1,

			.amux = LINE1,

		}, {

			.name = name_svideo,

			.vmux = 8,

			.amux = LINE1,

		} },

		.radio = {

			.name = name_radio,

			.amux = LINE2,

		},

		.mpeg  = SAA7134_MPEG_EMPRESS,

		.video_out = CCIR656,

		.vid_port_opts  = (SET_T_CODE_POLARITY_NON_INVERTED |

					SET_CLOCK_NOT_DELAYED |

					SET_CLOCK_INVERTED |

					SET_VSYNC_OFF),

	},

	[SAA7134_BOARD_TWINHAN_DTV_DVB_3056] = {

		.name           = "Twinhan Hybrid DTV-DVB 3056 PCI",
@@ -5226,13 +5305,13 @@ struct pci_device_id saa7134_pci_tbl[] = { 
		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,

		.subvendor    = 0x5ace,

		.subdevice    = 0x6193,

		.driver_data  = SAA7134_BOARD_BEHOLD_M6,

		.driver_data  = SAA7134_BOARD_BEHOLD_M6_EXTRA,

	}, {

		.vendor       = PCI_VENDOR_ID_PHILIPS,

		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,

		.subvendor    = 0x5ace,

		.subdevice    = 0x6191,

		.driver_data  = SAA7134_BOARD_BEHOLD_M6,

		.driver_data  = SAA7134_BOARD_BEHOLD_M63,

	},{

		.vendor       = PCI_VENDOR_ID_PHILIPS,

		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
@@ -5601,6 +5680,8 @@ int saa7134_board_init1(struct saa7134_dev *dev) 
	case SAA7134_BOARD_HAUPPAUGE_HVR1110:

	case SAA7134_BOARD_BEHOLD_607_9FM:

	case SAA7134_BOARD_BEHOLD_M6:

	case SAA7134_BOARD_BEHOLD_M63:

	case SAA7134_BOARD_BEHOLD_M6_EXTRA:

		dev->has_remote = SAA7134_REMOTE_I2C;

		break;

	case SAA7134_BOARD_AVERMEDIA_A169_B:

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

+2 −0
Original line number Diff line number Diff line
@@ -540,6 +540,8 @@ void saa7134_set_i2c_ir(struct saa7134_dev *dev, struct IR_i2c *ir) 
		break;

	case SAA7134_BOARD_BEHOLD_607_9FM:

	case SAA7134_BOARD_BEHOLD_M6:

	case SAA7134_BOARD_BEHOLD_M63:

	case SAA7134_BOARD_BEHOLD_M6_EXTRA:

	case SAA7134_BOARD_BEHOLD_H6:

		snprintf(ir->c.name, sizeof(ir->c.name), "BeholdTV");

		ir->get_key   = get_key_beholdm6xx;

drivers/media/video/saa7134/saa7134.h

+2 −1
Original line number Diff line number Diff line
@@ -264,7 +264,8 @@ struct saa7134_format { 
#define SAA7134_BOARD_AVERMEDIA_A700_PRO    140

#define SAA7134_BOARD_AVERMEDIA_A700_HYBRID 141

#define SAA7134_BOARD_BEHOLD_H6      142



#define SAA7134_BOARD_BEHOLD_M63      143

#define SAA7134_BOARD_BEHOLD_M6_EXTRA    144



#define SAA7134_MAXBOARDS 8

#define SAA7134_INPUT_MAX 8