V4L/DVB (11604): saa7134: split Behold`s card entries to properly identify the model (84d728c3) · Commits · e / devices / android_kernel_fairphone_FP4

Documentation/video4linux/CARDLIST.saa7134

+13 −3

Original line number	Original line	Diff line number	Diff line
	@@ -124,10 +124,10 @@
	123 -> Beholder BeholdTV 407 [0000:4070]		123 -> Beholder BeholdTV 407 [0000:4070]
	124 -> Beholder BeholdTV 407 FM [0000:4071]		124 -> Beholder BeholdTV 407 FM [0000:4071]
	125 -> Beholder BeholdTV 409 [0000:4090]		125 -> Beholder BeholdTV 409 [0000:4090]
	126 -> Beholder BeholdTV 505 FM/RDS [0000:5051,0000:505B,5ace:5050]		126 -> Beholder BeholdTV 505 FM [5ace:5050]
	127 -> Beholder BeholdTV 507 FM/RDS / BeholdTV 509 FM [0000:5071,0000:507B,5ace:5070,5ace:5090]		127 -> Beholder BeholdTV 507 FM / BeholdTV 509 FM [5ace:5070,5ace:5090]
	128 -> Beholder BeholdTV Columbus TVFM [0000:5201]		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]		129 -> Beholder BeholdTV 607 FM [5ace:6070]
	130 -> Beholder BeholdTV M6 [5ace:6190]		130 -> Beholder BeholdTV M6 [5ace:6190]
	131 -> Twinhan Hybrid DTV-DVB 3056 PCI [1822:0022]		131 -> Twinhan Hybrid DTV-DVB 3056 PCI [1822:0022]
	132 -> Genius TVGO AM11MCE		132 -> Genius TVGO AM11MCE
	@@ -157,3 +157,13 @@
	156 -> Hauppauge WinTV-HVR1110r3 [0070:6707,0070:6709,0070:670a]		156 -> Hauppauge WinTV-HVR1110r3 [0070:6707,0070:6709,0070:670a]
	157 -> Avermedia AVerTV Studio 507UA [1461:a11b]		157 -> Avermedia AVerTV Studio 507UA [1461:a11b]
	158 -> AVerMedia Cardbus TV/Radio (E501R) [1461:b7e9]		158 -> AVerMedia Cardbus TV/Radio (E501R) [1461:b7e9]
			159 -> Beholder BeholdTV 505 RDS [0000:505B]
			160 -> Beholder BeholdTV 507 RDS [0000:5071]
			161 -> Beholder BeholdTV 507 RDS [0000:507B]
			162 -> Beholder BeholdTV 607 FM [5ace:6071]
			163 -> Beholder BeholdTV 609 FM [5ace:6090]
			164 -> Beholder BeholdTV 609 FM [5ace:6091]
			165 -> Beholder BeholdTV 607 RDS [5ace:6072]
			166 -> Beholder BeholdTV 607 RDS [5ace:6073]
			167 -> Beholder BeholdTV 609 RDS [5ace:6092]
			168 -> Beholder BeholdTV 609 RDS [5ace:6093]

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

+317 −24

Original line number	Original line	Diff line number	Diff line
	@@ -4039,7 +4039,7 @@ struct saa7134_board saa7134_boards[] = {
	[SAA7134_BOARD_BEHOLD_505FM] = {		[SAA7134_BOARD_BEHOLD_505FM] = {
	/* Beholder Intl. Ltd. 2008 */		/* Beholder Intl. Ltd. 2008 */
	/Dmitry Belimov <d.belimov@gmail.com> /		/Dmitry Belimov <d.belimov@gmail.com> /
	.name = "Beholder BeholdTV 505 FM/RDS",		.name = "Beholder BeholdTV 505 FM",
	.audio_clock = 0x00200000,		.audio_clock = 0x00200000,
	.tuner_type = TUNER_PHILIPS_FM1216ME_MK3,		.tuner_type = TUNER_PHILIPS_FM1216ME_MK3,
	.radio_type = UNSET,		.radio_type = UNSET,
	@@ -4070,10 +4070,104 @@ struct saa7134_board saa7134_boards[] = {
	.amux = LINE2,		.amux = LINE2,
	},		},
	},		},
			[SAA7134_BOARD_BEHOLD_505RDS] = {
			/* Beholder Intl. Ltd. 2008 */
			/Dmitry Belimov <d.belimov@gmail.com> /
			.name = "Beholder BeholdTV 505 RDS",
			.audio_clock = 0x00200000,
			.tuner_type = TUNER_PHILIPS_FM1216ME_MK3, /* FIXME to MK5 */
			.radio_type = UNSET,
			.tuner_addr = ADDR_UNSET,
			.radio_addr = ADDR_UNSET,
			.tda9887_conf = TDA9887_PRESENT,
			.gpiomask = 0x00008000,
			.inputs = {{
			.name = name_tv,
			.vmux = 3,
			.amux = LINE2,
			.tv = 1,
			},{
			.name = name_comp1,
			.vmux = 1,
			.amux = LINE1,
			},{
			.name = name_svideo,
			.vmux = 8,
			.amux = LINE1,
			}},
			.mute = {
			.name = name_mute,
			.amux = LINE1,
			},
			.radio = {
			.name = name_radio,
			.amux = LINE2,
			},
			},
	[SAA7134_BOARD_BEHOLD_507_9FM] = {		[SAA7134_BOARD_BEHOLD_507_9FM] = {
	/* Beholder Intl. Ltd. 2008 */		/* Beholder Intl. Ltd. 2008 */
	/Dmitry Belimov <d.belimov@gmail.com> /		/Dmitry Belimov <d.belimov@gmail.com> /
	.name = "Beholder BeholdTV 507 FM/RDS / BeholdTV 509 FM",		.name = "Beholder BeholdTV 507 FM / BeholdTV 509 FM",
			.audio_clock = 0x00187de7,
			.tuner_type = TUNER_PHILIPS_FM1216ME_MK3,
			.radio_type = UNSET,
			.tuner_addr = ADDR_UNSET,
			.radio_addr = ADDR_UNSET,
			.tda9887_conf = TDA9887_PRESENT,
			.gpiomask = 0x00008000,
			.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,
			},
			},
			[SAA7134_BOARD_BEHOLD_507RDS_MK5] = {
			/* Beholder Intl. Ltd. 2008 */
			/Dmitry Belimov <d.belimov@gmail.com> /
			.name = "Beholder BeholdTV 507 RDS",
			.audio_clock = 0x00187de7,
			.tuner_type = TUNER_PHILIPS_FM1216ME_MK3, /* FIXME to MK5 */
			.radio_type = UNSET,
			.tuner_addr = ADDR_UNSET,
			.radio_addr = ADDR_UNSET,
			.tda9887_conf = TDA9887_PRESENT,
			.gpiomask = 0x00008000,
			.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,
			},
			},
			[SAA7134_BOARD_BEHOLD_507RDS_MK3] = {
			/* Beholder Intl. Ltd. 2008 */
			/Dmitry Belimov <d.belimov@gmail.com> /
			.name = "Beholder BeholdTV 507 RDS",
	.audio_clock = 0x00187de7,		.audio_clock = 0x00187de7,
	.tuner_type = TUNER_PHILIPS_FM1216ME_MK3,		.tuner_type = TUNER_PHILIPS_FM1216ME_MK3,
	.radio_type = UNSET,		.radio_type = UNSET,
	@@ -4134,9 +4228,37 @@ struct saa7134_board saa7134_boards[] = {
	.gpio = 0x000A8000,		.gpio = 0x000A8000,
	},		},
	},		},
	[SAA7134_BOARD_BEHOLD_607_9FM] = {		[SAA7134_BOARD_BEHOLD_607FM_MK3] = {
			/* Andrey Melnikoff <temnota@kmv.ru> */
			.name = "Beholder BeholdTV 607 FM",
			.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,
			},
			},
			[SAA7134_BOARD_BEHOLD_609FM_MK3] = {
	/* Andrey Melnikoff <temnota@kmv.ru> */		/* Andrey Melnikoff <temnota@kmv.ru> */
	.name = "Beholder BeholdTV 607 / BeholdTV 609",		.name = "Beholder BeholdTV 609 FM",
	.audio_clock = 0x00187de7,		.audio_clock = 0x00187de7,
	.tuner_type = TUNER_PHILIPS_FM1216ME_MK3,		.tuner_type = TUNER_PHILIPS_FM1216ME_MK3,
	.radio_type = UNSET,		.radio_type = UNSET,
	@@ -4162,6 +4284,174 @@ struct saa7134_board saa7134_boards[] = {
	.amux = LINE2,		.amux = LINE2,
	},		},
	},		},
			[SAA7134_BOARD_BEHOLD_607FM_MK5] = {
			/* Andrey Melnikoff <temnota@kmv.ru> */
			.name = "Beholder BeholdTV 607 FM",
			.audio_clock = 0x00187de7,
			.tuner_type = TUNER_PHILIPS_FM1216ME_MK3, /* FIXME to MK5 */
			.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,
			},
			},
			[SAA7134_BOARD_BEHOLD_609FM_MK5] = {
			/* Andrey Melnikoff <temnota@kmv.ru> */
			.name = "Beholder BeholdTV 609 FM",
			.audio_clock = 0x00187de7,
			.tuner_type = TUNER_PHILIPS_FM1216ME_MK3, /* FIXME to MK5 */
			.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,
			},
			},
			[SAA7134_BOARD_BEHOLD_607RDS_MK3] = {
			/* Andrey Melnikoff <temnota@kmv.ru> */
			.name = "Beholder BeholdTV 607 RDS",
			.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,
			},
			},
			[SAA7134_BOARD_BEHOLD_609RDS_MK3] = {
			/* Andrey Melnikoff <temnota@kmv.ru> */
			.name = "Beholder BeholdTV 609 RDS",
			.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,
			},
			},
			[SAA7134_BOARD_BEHOLD_607RDS_MK5] = {
			/* Andrey Melnikoff <temnota@kmv.ru> */
			.name = "Beholder BeholdTV 607 RDS",
			.audio_clock = 0x00187de7,
			.tuner_type = TUNER_PHILIPS_FM1216ME_MK3, /* FIXME to MK5 */
			.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,
			},
			},
			[SAA7134_BOARD_BEHOLD_609RDS_MK5] = {
			/* Andrey Melnikoff <temnota@kmv.ru> */
			.name = "Beholder BeholdTV 609 RDS",
			.audio_clock = 0x00187de7,
			.tuner_type = TUNER_PHILIPS_FM1216ME_MK3, /* FIXME to MK5 */
			.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,
			},
			},
	[SAA7134_BOARD_BEHOLD_M6] = {		[SAA7134_BOARD_BEHOLD_M6] = {
	/* Igor Kuznetsov <igk@igk.ru> */		/* Igor Kuznetsov <igk@igk.ru> */
	/* Andrey Melnikoff <temnota@kmv.ru> */		/* Andrey Melnikoff <temnota@kmv.ru> */
	@@ -4242,8 +4532,7 @@ struct saa7134_board saa7134_boards[] = {
	/* Beholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com> */		/* Beholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com> */
	.name = "Beholder BeholdTV M6 Extra",		.name = "Beholder BeholdTV M6 Extra",
	.audio_clock = 0x00187de7,		.audio_clock = 0x00187de7,
	/* FIXME: Must be PHILIPS_FM1216ME_MK5*/		.tuner_type = TUNER_PHILIPS_FM1216ME_MK3, /* FIXME to MK5 */
	.tuner_type = TUNER_PHILIPS_FM1216ME_MK3,
	.radio_type = UNSET,		.radio_type = UNSET,
	.tuner_addr = ADDR_UNSET,		.tuner_addr = ADDR_UNSET,
	.radio_addr = ADDR_UNSET,		.radio_addr = ADDR_UNSET,
	@@ -5727,18 +6016,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
	.subvendor = 0x0000,		.subvendor = 0x0000,
	.subdevice = 0x4090,		.subdevice = 0x4090,
	.driver_data = SAA7134_BOARD_BEHOLD_409,		.driver_data = SAA7134_BOARD_BEHOLD_409,
	},{
	.vendor = PCI_VENDOR_ID_PHILIPS,
	.device = PCI_DEVICE_ID_PHILIPS_SAA7130,
	.subvendor = 0x0000,
	.subdevice = 0x5051,
	.driver_data = SAA7134_BOARD_BEHOLD_505FM,
	},{		},{
	.vendor = PCI_VENDOR_ID_PHILIPS,		.vendor = PCI_VENDOR_ID_PHILIPS,
	.device = PCI_DEVICE_ID_PHILIPS_SAA7130,		.device = PCI_DEVICE_ID_PHILIPS_SAA7130,
	.subvendor = 0x0000,		.subvendor = 0x0000,
	.subdevice = 0x505B,		.subdevice = 0x505B,
	.driver_data = SAA7134_BOARD_BEHOLD_505FM,		.driver_data = SAA7134_BOARD_BEHOLD_505RDS,
	},{		},{
	.vendor = PCI_VENDOR_ID_PHILIPS,		.vendor = PCI_VENDOR_ID_PHILIPS,
	.device = PCI_DEVICE_ID_PHILIPS_SAA7130,		.device = PCI_DEVICE_ID_PHILIPS_SAA7130,
	@@ -5750,13 +6033,13 @@ struct pci_device_id saa7134_pci_tbl[] = {
	.device = PCI_DEVICE_ID_PHILIPS_SAA7133,		.device = PCI_DEVICE_ID_PHILIPS_SAA7133,
	.subvendor = 0x0000,		.subvendor = 0x0000,
	.subdevice = 0x5071,		.subdevice = 0x5071,
	.driver_data = SAA7134_BOARD_BEHOLD_507_9FM,		.driver_data = SAA7134_BOARD_BEHOLD_507RDS_MK3,
	},{		},{
	.vendor = PCI_VENDOR_ID_PHILIPS,		.vendor = PCI_VENDOR_ID_PHILIPS,
	.device = PCI_DEVICE_ID_PHILIPS_SAA7133,		.device = PCI_DEVICE_ID_PHILIPS_SAA7133,
	.subvendor = 0x0000,		.subvendor = 0x0000,
	.subdevice = 0x507B,		.subdevice = 0x507B,
	.driver_data = SAA7134_BOARD_BEHOLD_507_9FM,		.driver_data = SAA7134_BOARD_BEHOLD_507RDS_MK5,
	},{		},{
	.vendor = PCI_VENDOR_ID_PHILIPS,		.vendor = PCI_VENDOR_ID_PHILIPS,
	.device = PCI_DEVICE_ID_PHILIPS_SAA7134,		.device = PCI_DEVICE_ID_PHILIPS_SAA7134,
	@@ -5780,49 +6063,49 @@ struct pci_device_id saa7134_pci_tbl[] = {
	.device = PCI_DEVICE_ID_PHILIPS_SAA7134,		.device = PCI_DEVICE_ID_PHILIPS_SAA7134,
	.subvendor = 0x5ace,		.subvendor = 0x5ace,
	.subdevice = 0x6070,		.subdevice = 0x6070,
	.driver_data = SAA7134_BOARD_BEHOLD_607_9FM,		.driver_data = SAA7134_BOARD_BEHOLD_607FM_MK3,
	},{		},{
	.vendor = PCI_VENDOR_ID_PHILIPS,		.vendor = PCI_VENDOR_ID_PHILIPS,
	.device = PCI_DEVICE_ID_PHILIPS_SAA7134,		.device = PCI_DEVICE_ID_PHILIPS_SAA7134,
	.subvendor = 0x5ace,		.subvendor = 0x5ace,
	.subdevice = 0x6071,		.subdevice = 0x6071,
	.driver_data = SAA7134_BOARD_BEHOLD_607_9FM,		.driver_data = SAA7134_BOARD_BEHOLD_607FM_MK5,
	},{		},{
	.vendor = PCI_VENDOR_ID_PHILIPS,		.vendor = PCI_VENDOR_ID_PHILIPS,
	.device = PCI_DEVICE_ID_PHILIPS_SAA7134,		.device = PCI_DEVICE_ID_PHILIPS_SAA7134,
	.subvendor = 0x5ace,		.subvendor = 0x5ace,
	.subdevice = 0x6072,		.subdevice = 0x6072,
	.driver_data = SAA7134_BOARD_BEHOLD_607_9FM,		.driver_data = SAA7134_BOARD_BEHOLD_607RDS_MK3,
	},{		},{
	.vendor = PCI_VENDOR_ID_PHILIPS,		.vendor = PCI_VENDOR_ID_PHILIPS,
	.device = PCI_DEVICE_ID_PHILIPS_SAA7134,		.device = PCI_DEVICE_ID_PHILIPS_SAA7134,
	.subvendor = 0x5ace,		.subvendor = 0x5ace,
	.subdevice = 0x6073,		.subdevice = 0x6073,
	.driver_data = SAA7134_BOARD_BEHOLD_607_9FM,		.driver_data = SAA7134_BOARD_BEHOLD_607RDS_MK5,
	},{		},{
	.vendor = PCI_VENDOR_ID_PHILIPS,		.vendor = PCI_VENDOR_ID_PHILIPS,
	.device = PCI_DEVICE_ID_PHILIPS_SAA7133,		.device = PCI_DEVICE_ID_PHILIPS_SAA7133,
	.subvendor = 0x5ace,		.subvendor = 0x5ace,
	.subdevice = 0x6090,		.subdevice = 0x6090,
	.driver_data = SAA7134_BOARD_BEHOLD_607_9FM,		.driver_data = SAA7134_BOARD_BEHOLD_609FM_MK3,
	},{		},{
	.vendor = PCI_VENDOR_ID_PHILIPS,		.vendor = PCI_VENDOR_ID_PHILIPS,
	.device = PCI_DEVICE_ID_PHILIPS_SAA7133,		.device = PCI_DEVICE_ID_PHILIPS_SAA7133,
	.subvendor = 0x5ace,		.subvendor = 0x5ace,
	.subdevice = 0x6091,		.subdevice = 0x6091,
	.driver_data = SAA7134_BOARD_BEHOLD_607_9FM,		.driver_data = SAA7134_BOARD_BEHOLD_609FM_MK5,
	},{		},{
	.vendor = PCI_VENDOR_ID_PHILIPS,		.vendor = PCI_VENDOR_ID_PHILIPS,
	.device = PCI_DEVICE_ID_PHILIPS_SAA7133,		.device = PCI_DEVICE_ID_PHILIPS_SAA7133,
	.subvendor = 0x5ace,		.subvendor = 0x5ace,
	.subdevice = 0x6092,		.subdevice = 0x6092,
	.driver_data = SAA7134_BOARD_BEHOLD_607_9FM,		.driver_data = SAA7134_BOARD_BEHOLD_609RDS_MK3,
	},{		},{
	.vendor = PCI_VENDOR_ID_PHILIPS,		.vendor = PCI_VENDOR_ID_PHILIPS,
	.device = PCI_DEVICE_ID_PHILIPS_SAA7133,		.device = PCI_DEVICE_ID_PHILIPS_SAA7133,
	.subvendor = 0x5ace,		.subvendor = 0x5ace,
	.subdevice = 0x6093,		.subdevice = 0x6093,
	.driver_data = SAA7134_BOARD_BEHOLD_607_9FM,		.driver_data = SAA7134_BOARD_BEHOLD_609RDS_MK5,
	},{		},{
	.vendor = PCI_VENDOR_ID_PHILIPS,		.vendor = PCI_VENDOR_ID_PHILIPS,
	.device = PCI_DEVICE_ID_PHILIPS_SAA7133,		.device = PCI_DEVICE_ID_PHILIPS_SAA7133,
	@@ -6226,7 +6509,10 @@ int saa7134_board_init1(struct saa7134_dev *dev)
	case SAA7134_BOARD_BEHOLD_407FM:		case SAA7134_BOARD_BEHOLD_407FM:
	case SAA7134_BOARD_BEHOLD_409:		case SAA7134_BOARD_BEHOLD_409:
	case SAA7134_BOARD_BEHOLD_505FM:		case SAA7134_BOARD_BEHOLD_505FM:
			case SAA7134_BOARD_BEHOLD_505RDS:
	case SAA7134_BOARD_BEHOLD_507_9FM:		case SAA7134_BOARD_BEHOLD_507_9FM:
			case SAA7134_BOARD_BEHOLD_507RDS_MK3:
			case SAA7134_BOARD_BEHOLD_507RDS_MK5:
	case SAA7134_BOARD_GENIUS_TVGO_A11MCE:		case SAA7134_BOARD_GENIUS_TVGO_A11MCE:
	case SAA7134_BOARD_REAL_ANGEL_220:		case SAA7134_BOARD_REAL_ANGEL_220:
	case SAA7134_BOARD_KWORLD_PLUS_TV_ANALOG:		case SAA7134_BOARD_KWORLD_PLUS_TV_ANALOG:
	@@ -6347,7 +6633,14 @@ int saa7134_board_init1(struct saa7134_dev *dev)
	case SAA7134_BOARD_UPMOST_PURPLE_TV:		case SAA7134_BOARD_UPMOST_PURPLE_TV:
	case SAA7134_BOARD_MSI_TVATANYWHERE_PLUS:		case SAA7134_BOARD_MSI_TVATANYWHERE_PLUS:
	case SAA7134_BOARD_HAUPPAUGE_HVR1110:		case SAA7134_BOARD_HAUPPAUGE_HVR1110:
	case SAA7134_BOARD_BEHOLD_607_9FM:		case SAA7134_BOARD_BEHOLD_607FM_MK3:
			case SAA7134_BOARD_BEHOLD_607FM_MK5:
			case SAA7134_BOARD_BEHOLD_609FM_MK3:
			case SAA7134_BOARD_BEHOLD_609FM_MK5:
			case SAA7134_BOARD_BEHOLD_607RDS_MK3:
			case SAA7134_BOARD_BEHOLD_607RDS_MK5:
			case SAA7134_BOARD_BEHOLD_609RDS_MK3:
			case SAA7134_BOARD_BEHOLD_609RDS_MK5:
	case SAA7134_BOARD_BEHOLD_M6:		case SAA7134_BOARD_BEHOLD_M6:
	case SAA7134_BOARD_BEHOLD_M63:		case SAA7134_BOARD_BEHOLD_M63:
	case SAA7134_BOARD_BEHOLD_M6_EXTRA:		case SAA7134_BOARD_BEHOLD_M6_EXTRA:

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

+11 −1

Original line number	Original line	Diff line number	Diff line
	@@ -507,7 +507,10 @@ int saa7134_input_init1(struct saa7134_dev *dev)
	case SAA7134_BOARD_BEHOLD_407FM:		case SAA7134_BOARD_BEHOLD_407FM:
	case SAA7134_BOARD_BEHOLD_409:		case SAA7134_BOARD_BEHOLD_409:
	case SAA7134_BOARD_BEHOLD_505FM:		case SAA7134_BOARD_BEHOLD_505FM:
			case SAA7134_BOARD_BEHOLD_505RDS:
	case SAA7134_BOARD_BEHOLD_507_9FM:		case SAA7134_BOARD_BEHOLD_507_9FM:
			case SAA7134_BOARD_BEHOLD_507RDS_MK3:
			case SAA7134_BOARD_BEHOLD_507RDS_MK5:
	ir_codes = ir_codes_manli;		ir_codes = ir_codes_manli;
	mask_keycode = 0x003f00;		mask_keycode = 0x003f00;
	mask_keyup = 0x004000;		mask_keyup = 0x004000;
	@@ -714,7 +717,14 @@ void saa7134_set_i2c_ir(struct saa7134_dev dev, struct IR_i2c ir)
	ir->get_key = get_key_hvr1110;		ir->get_key = get_key_hvr1110;
	ir->ir_codes = ir_codes_hauppauge_new;		ir->ir_codes = ir_codes_hauppauge_new;
	break;		break;
	case SAA7134_BOARD_BEHOLD_607_9FM:		case SAA7134_BOARD_BEHOLD_607FM_MK3:
			case SAA7134_BOARD_BEHOLD_607FM_MK5:
			case SAA7134_BOARD_BEHOLD_609FM_MK3:
			case SAA7134_BOARD_BEHOLD_609FM_MK5:
			case SAA7134_BOARD_BEHOLD_607RDS_MK3:
			case SAA7134_BOARD_BEHOLD_607RDS_MK5:
			case SAA7134_BOARD_BEHOLD_609RDS_MK3:
			case SAA7134_BOARD_BEHOLD_609RDS_MK5:
	case SAA7134_BOARD_BEHOLD_M6:		case SAA7134_BOARD_BEHOLD_M6:
	case SAA7134_BOARD_BEHOLD_M63:		case SAA7134_BOARD_BEHOLD_M63:
	case SAA7134_BOARD_BEHOLD_M6_EXTRA:		case SAA7134_BOARD_BEHOLD_M6_EXTRA:

drivers/media/video/saa7134/saa7134.h

+11 −1

Original line number	Original line	Diff line number	Diff line
	@@ -252,7 +252,7 @@ struct saa7134_format {
	#define SAA7134_BOARD_BEHOLD_505FM 126		#define SAA7134_BOARD_BEHOLD_505FM 126
	#define SAA7134_BOARD_BEHOLD_507_9FM 127		#define SAA7134_BOARD_BEHOLD_507_9FM 127
	#define SAA7134_BOARD_BEHOLD_COLUMBUS_TVFM 128		#define SAA7134_BOARD_BEHOLD_COLUMBUS_TVFM 128
	#define SAA7134_BOARD_BEHOLD_607_9FM 129		#define SAA7134_BOARD_BEHOLD_607FM_MK3 129
	#define SAA7134_BOARD_BEHOLD_M6 130		#define SAA7134_BOARD_BEHOLD_M6 130
	#define SAA7134_BOARD_TWINHAN_DTV_DVB_3056 131		#define SAA7134_BOARD_TWINHAN_DTV_DVB_3056 131
	#define SAA7134_BOARD_GENIUS_TVGO_A11MCE 132		#define SAA7134_BOARD_GENIUS_TVGO_A11MCE 132
	@@ -282,6 +282,16 @@ struct saa7134_format {
	#define SAA7134_BOARD_HAUPPAUGE_HVR1110R3 156		#define SAA7134_BOARD_HAUPPAUGE_HVR1110R3 156
	#define SAA7134_BOARD_AVERMEDIA_STUDIO_507UA 157		#define SAA7134_BOARD_AVERMEDIA_STUDIO_507UA 157
	#define SAA7134_BOARD_AVERMEDIA_CARDBUS_501 158		#define SAA7134_BOARD_AVERMEDIA_CARDBUS_501 158
			#define SAA7134_BOARD_BEHOLD_505RDS 159
			#define SAA7134_BOARD_BEHOLD_507RDS_MK3 160
			#define SAA7134_BOARD_BEHOLD_507RDS_MK5 161
			#define SAA7134_BOARD_BEHOLD_607FM_MK5 162
			#define SAA7134_BOARD_BEHOLD_609FM_MK3 163
			#define SAA7134_BOARD_BEHOLD_609FM_MK5 164
			#define SAA7134_BOARD_BEHOLD_607RDS_MK3 165
			#define SAA7134_BOARD_BEHOLD_607RDS_MK5 166
			#define SAA7134_BOARD_BEHOLD_609RDS_MK3 167
			#define SAA7134_BOARD_BEHOLD_609RDS_MK5 168

	#define SAA7134_MAXBOARDS 32		#define SAA7134_MAXBOARDS 32
	#define SAA7134_INPUT_MAX 8		#define SAA7134_INPUT_MAX 8