1 files changed, 111 insertions, 12 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 7d7f383b404f..262830da08c8 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -928,27 +928,38 @@ struct saa7134_board saa7134_boards[] = {
                .tuner_addr     = ADDR_UNSET,
                .radio_addr     = ADDR_UNSET,
                .tda9887_conf   = TDA9887_PRESENT,
+                .gpiomask       = 0x03,
                .inputs         = {{
                        .name = name_tv,
                        .vmux = 1,
                        .amux = TV,
                        .tv   = 1,
-                },{
+                        .gpio = 0x00,
+                }, {
                        .name = name_comp1,
-                        .vmux = 0,
-                        .amux = LINE2,
-                },{
-                        .name = name_comp2,
                        .vmux = 3,
-                        .amux = LINE2,
+                        .amux = LINE1,
-                },{
+                        .gpio = 0x02,
+                }, {
+                        .name = name_comp2,
+                        .vmux = 0,
+                        .amux = LINE1,
+                        .gpio = 0x02,
+                }, {
                        .name = name_svideo,
                        .vmux = 8,
-                        .amux = LINE2,
+                        .amux = LINE1,
-                }},
+                        .gpio = 0x02,
+                } },
                .radio = {
                        .name = name_radio,
-                        .amux = LINE2,
+                        .amux = LINE1,
+                        .gpio = 0x01,
+                },
+                .mute  = {
+                        .name = name_mute,
+                        .amux = TV,
+                        .gpio = 0x00,
                },
        },
        [SAA7134_BOARD_BMK_MPEX_TUNER] = {
@@ -3912,6 +3923,74 @@ struct saa7134_board saa7134_boards[] = {
                },
                .mpeg  = SAA7134_MPEG_EMPRESS,
        },
+        [SAA7134_BOARD_TWINHAN_DTV_DVB_3056] = {
+                .name           = "Twinhan Hybrid DTV-DVB 3056 PCI",
+                .audio_clock    = 0x00187de7,
+                .tuner_type     = TUNER_PHILIPS_TDA8290,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .tuner_config   = 2,
+                .mpeg           = SAA7134_MPEG_DVB,
+                .gpiomask       = 0x0200000,
+                .inputs = {{
+                        .name   = name_tv,
+                        .vmux   = 1,
+                        .amux   = TV,
+                        .tv     = 1,
+                }, {
+                        .name   = name_comp1,
+                        .vmux   = 3,
+                        .amux   = LINE1,
+                }, {
+                        .name   = name_svideo,
+                        .vmux   = 8,            /* untested */
+                        .amux   = LINE1,
+                } },
+                .radio = {
+                        .name   = name_radio,
+                        .amux   = TV,
+                        .gpio   = 0x0200000,
+                },
+        },
+        [SAA7134_BOARD_GENIUS_TVGO_A11MCE] = {
+                /* Adrian Pardini <pardo.bsso@gmail.com> */
+                .name           = "Genius TVGO AM11MCE",
+                .audio_clock    = 0x00200000,
+                .tuner_type     = TUNER_TNF_5335MF,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .gpiomask       = 0xf000,
+                .inputs         = {{
+                        .name = name_tv_mono,
+                        .vmux = 1,
+                        .amux = LINE2,
+                        .gpio = 0x0000,
+                        .tv   = 1,
+                }, {
+                        .name = name_comp1,
+                        .vmux = 3,
+                        .amux = LINE1,
+                        .gpio = 0x2000,
+                        .tv = 1
+                }, {
+                        .name = name_svideo,
+                        .vmux = 8,
+                        .amux = LINE1,
+                        .gpio = 0x2000,
+        } },
+                .radio = {
+                        .name = name_radio,
+                        .amux = LINE2,
+                        .gpio = 0x1000,
+                },
+                .mute = {
+                        .name = name_mute,
+                        .amux = LINE2,
+                        .gpio = 0x6000,
+                },
+        },
 };
 const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
@@ -4511,6 +4590,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
        },{
                .vendor       = PCI_VENDOR_ID_PHILIPS,
                .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
+                .subvendor    = 0x5168,
+                .subdevice    = 0x3307, /* FlyDVB-T Hybrid Mini PCI */
+                .driver_data  = SAA7134_BOARD_FLYDVBT_HYBRID_CARDBUS,
+        }, {
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
                .subvendor    = 0x16be,
                .subdevice    = 0x0007,
                .driver_data  = SAA7134_BOARD_MEDION_MD8800_QUADRO,
@@ -4523,6 +4608,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
        },{
                .vendor       = PCI_VENDOR_ID_PHILIPS,
                .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
+                .subvendor    = 0x16be,
+                .subdevice    = 0x000d, /* triple CTX948_V1.1.1 */
+                .driver_data  = SAA7134_BOARD_MEDION_MD8800_QUADRO,
+        }, {
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
                .subvendor    = 0x1461,
                .subdevice    = 0x2c05,
                .driver_data  = SAA7134_BOARD_AVERMEDIA_777,
@@ -4843,7 +4934,13 @@ struct pci_device_id saa7134_pci_tbl[] = {
                .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
                .subvendor    = 0x4e42,
                .subdevice    = 0x3502,
-                .driver_data  = SAA7134_BOARD_FLYDVBT_HYBRID_CARDBUS
+                .driver_data  = SAA7134_BOARD_FLYDVBT_HYBRID_CARDBUS,
+        }, {
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
+                .subvendor    = 0x1822, /*Twinhan Technology Co. Ltd*/
+                .subdevice    = 0x0022,
+                .driver_data  = SAA7134_BOARD_TWINHAN_DTV_DVB_3056,
        },{
                /* --- boards without eeprom + subsystem ID --- */
                .vendor       = PCI_VENDOR_ID_PHILIPS,
@@ -4995,6 +5092,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
        case SAA7134_BOARD_BEHOLD_409:
        case SAA7134_BOARD_BEHOLD_505FM:
        case SAA7134_BOARD_BEHOLD_507_9FM:
+        case SAA7134_BOARD_GENIUS_TVGO_A11MCE:
                dev->has_remote = SAA7134_REMOTE_GPIO;
                break;
        case SAA7134_BOARD_FLYDVBS_LR300:
@@ -5232,7 +5330,8 @@ int saa7134_board_init2(struct saa7134_dev *dev)
        case SAA7134_BOARD_ASUSTeK_P7131_DUAL:
        case SAA7134_BOARD_ASUSTeK_P7131_HYBRID_LNA:
        case SAA7134_BOARD_MEDION_MD8800_QUADRO:
-       case SAA7134_BOARD_AVERMEDIA_SUPER_007:
+        case SAA7134_BOARD_AVERMEDIA_SUPER_007:
+        case SAA7134_BOARD_TWINHAN_DTV_DVB_3056:
                /* this is a hybrid board, initialize to analog mode
                 * and configure firmware eeprom address
                 */

diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c index 7d7f383b404f..262830da08c8 100644 --- a/drivers/media/video/saa7134/saa7134-cards.c +++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -928,27 +928,38 @@ struct saa7134_board saa7134_boards[] = {
928	.tuner_addr = ADDR_UNSET,	928	.tuner_addr = ADDR_UNSET,
929	.radio_addr = ADDR_UNSET,	929	.radio_addr = ADDR_UNSET,
930	.tda9887_conf = TDA9887_PRESENT,	930	.tda9887_conf = TDA9887_PRESENT,
		931	.gpiomask = 0x03,
931	.inputs = {{	932	.inputs = {{
932	.name = name_tv,	933	.name = name_tv,
933	.vmux = 1,	934	.vmux = 1,
934	.amux = TV,	935	.amux = TV,
935	.tv = 1,	936	.tv = 1,
936	},{	937	.gpio = 0x00,
		938	}, {
937	.name = name_comp1,	939	.name = name_comp1,
938	.vmux = 0,
939	.amux = LINE2,
940	},{
941	.name = name_comp2,
942	.vmux = 3,	940	.vmux = 3,
943	.amux = LINE2,	941	.amux = LINE1,
944	},{	942	.gpio = 0x02,
		943	}, {
		944	.name = name_comp2,
		945	.vmux = 0,
		946	.amux = LINE1,
		947	.gpio = 0x02,
		948	}, {
945	.name = name_svideo,	949	.name = name_svideo,
946	.vmux = 8,	950	.vmux = 8,
947	.amux = LINE2,	951	.amux = LINE1,
948	}},	952	.gpio = 0x02,
		953	} },
949	.radio = {	954	.radio = {
950	.name = name_radio,	955	.name = name_radio,
951	.amux = LINE2,	956	.amux = LINE1,
		957	.gpio = 0x01,
		958	},
		959	.mute = {
		960	.name = name_mute,
		961	.amux = TV,
		962	.gpio = 0x00,
952	},	963	},
953	},	964	},
954	[SAA7134_BOARD_BMK_MPEX_TUNER] = {	965	[SAA7134_BOARD_BMK_MPEX_TUNER] = {
@@ -3912,6 +3923,74 @@ struct saa7134_board saa7134_boards[] = {
3912	},	3923	},
3913	.mpeg = SAA7134_MPEG_EMPRESS,	3924	.mpeg = SAA7134_MPEG_EMPRESS,
3914	},	3925	},
		3926	[SAA7134_BOARD_TWINHAN_DTV_DVB_3056] = {
		3927	.name = "Twinhan Hybrid DTV-DVB 3056 PCI",
		3928	.audio_clock = 0x00187de7,
		3929	.tuner_type = TUNER_PHILIPS_TDA8290,
		3930	.radio_type = UNSET,
		3931	.tuner_addr = ADDR_UNSET,
		3932	.radio_addr = ADDR_UNSET,
		3933	.tuner_config = 2,
		3934	.mpeg = SAA7134_MPEG_DVB,
		3935	.gpiomask = 0x0200000,
		3936	.inputs = {{
		3937	.name = name_tv,
		3938	.vmux = 1,
		3939	.amux = TV,
		3940	.tv = 1,
		3941	}, {
		3942	.name = name_comp1,
		3943	.vmux = 3,
		3944	.amux = LINE1,
		3945	}, {
		3946	.name = name_svideo,
		3947	.vmux = 8, /* untested */
		3948	.amux = LINE1,
		3949	} },
		3950	.radio = {
		3951	.name = name_radio,
		3952	.amux = TV,
		3953	.gpio = 0x0200000,
		3954	},
		3955	},
		3956	[SAA7134_BOARD_GENIUS_TVGO_A11MCE] = {
		3957	/* Adrian Pardini <pardo.bsso@gmail.com> */
		3958	.name = "Genius TVGO AM11MCE",
		3959	.audio_clock = 0x00200000,
		3960	.tuner_type = TUNER_TNF_5335MF,
		3961	.radio_type = UNSET,
		3962	.tuner_addr = ADDR_UNSET,
		3963	.radio_addr = ADDR_UNSET,
		3964	.gpiomask = 0xf000,
		3965	.inputs = {{
		3966	.name = name_tv_mono,
		3967	.vmux = 1,
		3968	.amux = LINE2,
		3969	.gpio = 0x0000,
		3970	.tv = 1,
		3971	}, {
		3972	.name = name_comp1,
		3973	.vmux = 3,
		3974	.amux = LINE1,
		3975	.gpio = 0x2000,
		3976	.tv = 1
		3977	}, {
		3978	.name = name_svideo,
		3979	.vmux = 8,
		3980	.amux = LINE1,
		3981	.gpio = 0x2000,
		3982	} },
		3983	.radio = {
		3984	.name = name_radio,
		3985	.amux = LINE2,
		3986	.gpio = 0x1000,
		3987	},
		3988	.mute = {
		3989	.name = name_mute,
		3990	.amux = LINE2,
		3991	.gpio = 0x6000,
		3992	},
		3993	},
3915	};	3994	};
3916		3995
3917	const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);	3996	const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
@@ -4511,6 +4590,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
4511	},{	4590	},{
4512	.vendor = PCI_VENDOR_ID_PHILIPS,	4591	.vendor = PCI_VENDOR_ID_PHILIPS,
4513	.device = PCI_DEVICE_ID_PHILIPS_SAA7133,	4592	.device = PCI_DEVICE_ID_PHILIPS_SAA7133,
		4593	.subvendor = 0x5168,
		4594	.subdevice = 0x3307, /* FlyDVB-T Hybrid Mini PCI */
		4595	.driver_data = SAA7134_BOARD_FLYDVBT_HYBRID_CARDBUS,
		4596	}, {
		4597	.vendor = PCI_VENDOR_ID_PHILIPS,
		4598	.device = PCI_DEVICE_ID_PHILIPS_SAA7133,
4514	.subvendor = 0x16be,	4599	.subvendor = 0x16be,
4515	.subdevice = 0x0007,	4600	.subdevice = 0x0007,
4516	.driver_data = SAA7134_BOARD_MEDION_MD8800_QUADRO,	4601	.driver_data = SAA7134_BOARD_MEDION_MD8800_QUADRO,
@@ -4523,6 +4608,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
4523	},{	4608	},{
4524	.vendor = PCI_VENDOR_ID_PHILIPS,	4609	.vendor = PCI_VENDOR_ID_PHILIPS,
4525	.device = PCI_DEVICE_ID_PHILIPS_SAA7133,	4610	.device = PCI_DEVICE_ID_PHILIPS_SAA7133,
		4611	.subvendor = 0x16be,
		4612	.subdevice = 0x000d, /* triple CTX948_V1.1.1 */
		4613	.driver_data = SAA7134_BOARD_MEDION_MD8800_QUADRO,
		4614	}, {
		4615	.vendor = PCI_VENDOR_ID_PHILIPS,
		4616	.device = PCI_DEVICE_ID_PHILIPS_SAA7133,
4526	.subvendor = 0x1461,	4617	.subvendor = 0x1461,
4527	.subdevice = 0x2c05,	4618	.subdevice = 0x2c05,
4528	.driver_data = SAA7134_BOARD_AVERMEDIA_777,	4619	.driver_data = SAA7134_BOARD_AVERMEDIA_777,
@@ -4843,7 +4934,13 @@ struct pci_device_id saa7134_pci_tbl[] = {
4843	.device = PCI_DEVICE_ID_PHILIPS_SAA7133,	4934	.device = PCI_DEVICE_ID_PHILIPS_SAA7133,
4844	.subvendor = 0x4e42,	4935	.subvendor = 0x4e42,
4845	.subdevice = 0x3502,	4936	.subdevice = 0x3502,
4846	.driver_data = SAA7134_BOARD_FLYDVBT_HYBRID_CARDBUS	4937	.driver_data = SAA7134_BOARD_FLYDVBT_HYBRID_CARDBUS,
		4938	}, {
		4939	.vendor = PCI_VENDOR_ID_PHILIPS,
		4940	.device = PCI_DEVICE_ID_PHILIPS_SAA7133,
		4941	.subvendor = 0x1822, /Twinhan Technology Co. Ltd/
		4942	.subdevice = 0x0022,
		4943	.driver_data = SAA7134_BOARD_TWINHAN_DTV_DVB_3056,
4847	},{	4944	},{
4848	/* --- boards without eeprom + subsystem ID --- */	4945	/* --- boards without eeprom + subsystem ID --- */
4849	.vendor = PCI_VENDOR_ID_PHILIPS,	4946	.vendor = PCI_VENDOR_ID_PHILIPS,
@@ -4995,6 +5092,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
4995	case SAA7134_BOARD_BEHOLD_409:	5092	case SAA7134_BOARD_BEHOLD_409:
4996	case SAA7134_BOARD_BEHOLD_505FM:	5093	case SAA7134_BOARD_BEHOLD_505FM:
4997	case SAA7134_BOARD_BEHOLD_507_9FM:	5094	case SAA7134_BOARD_BEHOLD_507_9FM:
		5095	case SAA7134_BOARD_GENIUS_TVGO_A11MCE:
4998	dev->has_remote = SAA7134_REMOTE_GPIO;	5096	dev->has_remote = SAA7134_REMOTE_GPIO;
4999	break;	5097	break;
5000	case SAA7134_BOARD_FLYDVBS_LR300:	5098	case SAA7134_BOARD_FLYDVBS_LR300:
@@ -5232,7 +5330,8 @@ int saa7134_board_init2(struct saa7134_dev *dev)
5232	case SAA7134_BOARD_ASUSTeK_P7131_DUAL:	5330	case SAA7134_BOARD_ASUSTeK_P7131_DUAL:
5233	case SAA7134_BOARD_ASUSTeK_P7131_HYBRID_LNA:	5331	case SAA7134_BOARD_ASUSTeK_P7131_HYBRID_LNA:
5234	case SAA7134_BOARD_MEDION_MD8800_QUADRO:	5332	case SAA7134_BOARD_MEDION_MD8800_QUADRO:
5235	case SAA7134_BOARD_AVERMEDIA_SUPER_007:	5333	case SAA7134_BOARD_AVERMEDIA_SUPER_007:
		5334	case SAA7134_BOARD_TWINHAN_DTV_DVB_3056:
5236	/* this is a hybrid board, initialize to analog mode	5335	/* this is a hybrid board, initialize to analog mode
5237	* and configure firmware eeprom address	5336	* and configure firmware eeprom address
5238	*/	5337	*/