1 files changed, 125 insertions, 2 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 927413aded10..aa1db509f3d4 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -1911,7 +1911,7 @@ struct saa7134_board saa7134_boards[] = {
                },
        },
        [SAA7134_BOARD_FLYDVBT_DUO_CARDBUS] = {
-                .name           = "LifeView/Typhoon FlyDVB-T Duo Cardbus",
+                .name           = "LifeView/Typhoon/Genius FlyDVB-T Duo Cardbus",
                .audio_clock    = 0x00200000,
                .tuner_type     = TUNER_PHILIPS_TDA8290,
                .radio_type     = UNSET,
@@ -2891,6 +2891,80 @@ struct saa7134_board saa7134_boards[] = {
                        .gpio = 0x8000,
                },
        },
+        [SAA7134_BOARD_MEDION_MD8800_QUADRO] = {
+                .name           = "Medion Md8800 Quadro",
+                .audio_clock    = 0x00187de7,
+                .tuner_type     = TUNER_PHILIPS_TDA8290,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .mpeg           = SAA7134_MPEG_DVB,
+                .inputs = {{
+                        .name   = name_tv,
+                        .vmux   = 1,
+                        .amux   = TV,
+                        .tv     = 1,
+                },{
+                        .name   = name_comp1,
+                        .vmux   = 0,
+                        .amux   = LINE2,
+                },{
+                        .name   = name_svideo,
+                        .vmux   = 8,
+                        .amux   = LINE2,
+                }},
+        },
+        [SAA7134_BOARD_FLYDVBS_LR300] = {
+                /* LifeView FlyDVB-s */
+                /* Igor M. Liplianin <liplianin@tut.by> */
+                .name           = "LifeView FlyDVB-S /Acorp TV134DS",
+                .audio_clock    = 0x00200000,
+                .tuner_type     = TUNER_ABSENT,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .mpeg           = SAA7134_MPEG_DVB,
+                .inputs         = {{
+                        .name = name_comp1,     /* Composite input */
+                        .vmux = 3,
+                        .amux = LINE1,
+                },{
+                        .name = name_svideo,    /* S-Video signal on S-Video input */
+                        .vmux = 8,
+                        .amux = LINE1,
+                }},
+        },
+        [SAA7134_BOARD_PROTEUS_2309] = {
+                .name           = "Proteus Pro 2309",
+                .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 = 1,
+                        .amux = LINE2,
+                        .tv   = 1,
+                },{
+                        .name = name_comp1,
+                        .vmux = 0,
+                        .amux = LINE2,
+                },{
+                        .name = name_comp2,
+                        .vmux = 3,
+                        .amux = LINE2,
+                },{
+                        .name = name_svideo,
+                        .vmux = 8,
+                        .amux = LINE2,
+                }},
+                .mute = {
+                        .name = name_mute,
+                        .amux = LINE1,
+                },
+        },
 };
 const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
@@ -3375,7 +3449,7 @@ struct pci_device_id saa7134_pci_tbl[] = {
                .driver_data  = SAA7134_BOARD_FLYDVB_TRIO,
        },{
                .vendor       = PCI_VENDOR_ID_PHILIPS,
-                .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,  /* SAA 7131E */
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
                .subvendor    = 0x1461,
                .subdevice    = 0x2c05,
                .driver_data  = SAA7134_BOARD_AVERMEDIA_777,
@@ -3422,6 +3496,18 @@ struct pci_device_id saa7134_pci_tbl[] = {
                .subdevice    = 0x0005,
                .driver_data  = SAA7134_BOARD_MD7134_BRIDGE_2,
        },{
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
+                .subvendor    = 0x5168,
+                .subdevice    = 0x0300,
+                .driver_data  = SAA7134_BOARD_FLYDVBS_LR300,
+        },{
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
+                .subvendor    = 0x4e42,
+                .subdevice    = 0x0300,/* LR300 */
+                .driver_data  = SAA7134_BOARD_FLYDVBS_LR300,
+        },{
                .vendor = PCI_VENDOR_ID_PHILIPS,
                .device = PCI_DEVICE_ID_PHILIPS_SAA7134,
                .subvendor = 0x1489,
@@ -3446,6 +3532,36 @@ struct pci_device_id saa7134_pci_tbl[] = {
                .subdevice    = 0x3502,  /* whats the difference to 0x3306 ?*/
                .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,
+        },{
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
+                .subvendor    = 0x16be,
+                .subdevice    = 0x0008,
+                .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,
+        },{
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
+                .subvendor    = 0x1489,
+                .subdevice    = 0x0502,                /* Cardbus version */
+                .driver_data  = SAA7134_BOARD_FLYDVBT_DUO_CARDBUS,
+        },{
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7130,
+                .subvendor    = 0x0919, /* Philips Proteus PRO 2309 */
+                .subdevice    = 0x2003,
+                .driver_data  = SAA7134_BOARD_PROTEUS_2309,
+        },{
                /* --- boards without eeprom + subsystem ID --- */
                .vendor       = PCI_VENDOR_ID_PHILIPS,
                .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
@@ -3548,6 +3664,12 @@ int saa7134_board_init1(struct saa7134_dev *dev)
        case SAA7134_BOARD_SEDNA_PC_TV_CARDBUS:
        case SAA7134_BOARD_FLYDVBT_LR301:
        case SAA7134_BOARD_FLYDVBTDUO:
+        case SAA7134_BOARD_PROTEUS_2309:
+                dev->has_remote = SAA7134_REMOTE_GPIO;
+                break;
+        case SAA7134_BOARD_FLYDVBS_LR300:
+                saa_writeb(SAA7134_GPIO_GPMODE3, 0x80);
+                saa_writeb(SAA7134_GPIO_GPSTATUS2, 0x40);
                dev->has_remote = SAA7134_REMOTE_GPIO;
                break;
        case SAA7134_BOARD_MD5044:
@@ -3732,6 +3854,7 @@ int saa7134_board_init2(struct saa7134_dev *dev)
        case SAA7134_BOARD_PHILIPS_TIGER:
        case SAA7134_BOARD_TEVION_DVBT_220RF:
        case SAA7134_BOARD_ASUSTeK_P7131_DUAL:
+        case SAA7134_BOARD_MEDION_MD8800_QUADRO:
                /* 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 927413aded10..aa1db509f3d4 100644 --- a/drivers/media/video/saa7134/saa7134-cards.c +++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -1911,7 +1911,7 @@ struct saa7134_board saa7134_boards[] = {
1911	},	1911	},
1912	},	1912	},
1913	[SAA7134_BOARD_FLYDVBT_DUO_CARDBUS] = {	1913	[SAA7134_BOARD_FLYDVBT_DUO_CARDBUS] = {
1914	.name = "LifeView/Typhoon FlyDVB-T Duo Cardbus",	1914	.name = "LifeView/Typhoon/Genius FlyDVB-T Duo Cardbus",
1915	.audio_clock = 0x00200000,	1915	.audio_clock = 0x00200000,
1916	.tuner_type = TUNER_PHILIPS_TDA8290,	1916	.tuner_type = TUNER_PHILIPS_TDA8290,
1917	.radio_type = UNSET,	1917	.radio_type = UNSET,
@@ -2891,6 +2891,80 @@ struct saa7134_board saa7134_boards[] = {
2891	.gpio = 0x8000,	2891	.gpio = 0x8000,
2892	},	2892	},
2893	},	2893	},
		2894	[SAA7134_BOARD_MEDION_MD8800_QUADRO] = {
		2895	.name = "Medion Md8800 Quadro",
		2896	.audio_clock = 0x00187de7,
		2897	.tuner_type = TUNER_PHILIPS_TDA8290,
		2898	.radio_type = UNSET,
		2899	.tuner_addr = ADDR_UNSET,
		2900	.radio_addr = ADDR_UNSET,
		2901	.mpeg = SAA7134_MPEG_DVB,
		2902	.inputs = {{
		2903	.name = name_tv,
		2904	.vmux = 1,
		2905	.amux = TV,
		2906	.tv = 1,
		2907	},{
		2908	.name = name_comp1,
		2909	.vmux = 0,
		2910	.amux = LINE2,
		2911	},{
		2912	.name = name_svideo,
		2913	.vmux = 8,
		2914	.amux = LINE2,
		2915	}},
		2916	},
		2917	[SAA7134_BOARD_FLYDVBS_LR300] = {
		2918	/* LifeView FlyDVB-s */
		2919	/* Igor M. Liplianin <liplianin@tut.by> */
		2920	.name = "LifeView FlyDVB-S /Acorp TV134DS",
		2921	.audio_clock = 0x00200000,
		2922	.tuner_type = TUNER_ABSENT,
		2923	.radio_type = UNSET,
		2924	.tuner_addr = ADDR_UNSET,
		2925	.radio_addr = ADDR_UNSET,
		2926	.mpeg = SAA7134_MPEG_DVB,
		2927	.inputs = {{
		2928	.name = name_comp1, /* Composite input */
		2929	.vmux = 3,
		2930	.amux = LINE1,
		2931	},{
		2932	.name = name_svideo, /* S-Video signal on S-Video input */
		2933	.vmux = 8,
		2934	.amux = LINE1,
		2935	}},
		2936	},
		2937	[SAA7134_BOARD_PROTEUS_2309] = {
		2938	.name = "Proteus Pro 2309",
		2939	.audio_clock = 0x00187de7,
		2940	.tuner_type = TUNER_PHILIPS_FM1216ME_MK3,
		2941	.radio_type = UNSET,
		2942	.tuner_addr = ADDR_UNSET,
		2943	.radio_addr = ADDR_UNSET,
		2944	.tda9887_conf = TDA9887_PRESENT,
		2945	.inputs = {{
		2946	.name = name_tv,
		2947	.vmux = 1,
		2948	.amux = LINE2,
		2949	.tv = 1,
		2950	},{
		2951	.name = name_comp1,
		2952	.vmux = 0,
		2953	.amux = LINE2,
		2954	},{
		2955	.name = name_comp2,
		2956	.vmux = 3,
		2957	.amux = LINE2,
		2958	},{
		2959	.name = name_svideo,
		2960	.vmux = 8,
		2961	.amux = LINE2,
		2962	}},
		2963	.mute = {
		2964	.name = name_mute,
		2965	.amux = LINE1,
		2966	},
		2967	},
2894	};	2968	};
2895		2969
2896	const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);	2970	const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
@@ -3375,7 +3449,7 @@ struct pci_device_id saa7134_pci_tbl[] = {
3375	.driver_data = SAA7134_BOARD_FLYDVB_TRIO,	3449	.driver_data = SAA7134_BOARD_FLYDVB_TRIO,
3376	},{	3450	},{
3377	.vendor = PCI_VENDOR_ID_PHILIPS,	3451	.vendor = PCI_VENDOR_ID_PHILIPS,
3378	.device = PCI_DEVICE_ID_PHILIPS_SAA7134, /* SAA 7131E */	3452	.device = PCI_DEVICE_ID_PHILIPS_SAA7134,
3379	.subvendor = 0x1461,	3453	.subvendor = 0x1461,
3380	.subdevice = 0x2c05,	3454	.subdevice = 0x2c05,
3381	.driver_data = SAA7134_BOARD_AVERMEDIA_777,	3455	.driver_data = SAA7134_BOARD_AVERMEDIA_777,
@@ -3422,6 +3496,18 @@ struct pci_device_id saa7134_pci_tbl[] = {
3422	.subdevice = 0x0005,	3496	.subdevice = 0x0005,
3423	.driver_data = SAA7134_BOARD_MD7134_BRIDGE_2,	3497	.driver_data = SAA7134_BOARD_MD7134_BRIDGE_2,
3424	},{	3498	},{
		3499	.vendor = PCI_VENDOR_ID_PHILIPS,
		3500	.device = PCI_DEVICE_ID_PHILIPS_SAA7134,
		3501	.subvendor = 0x5168,
		3502	.subdevice = 0x0300,
		3503	.driver_data = SAA7134_BOARD_FLYDVBS_LR300,
		3504	},{
		3505	.vendor = PCI_VENDOR_ID_PHILIPS,
		3506	.device = PCI_DEVICE_ID_PHILIPS_SAA7134,
		3507	.subvendor = 0x4e42,
		3508	.subdevice = 0x0300,/* LR300 */
		3509	.driver_data = SAA7134_BOARD_FLYDVBS_LR300,
		3510	},{
3425	.vendor = PCI_VENDOR_ID_PHILIPS,	3511	.vendor = PCI_VENDOR_ID_PHILIPS,
3426	.device = PCI_DEVICE_ID_PHILIPS_SAA7134,	3512	.device = PCI_DEVICE_ID_PHILIPS_SAA7134,
3427	.subvendor = 0x1489,	3513	.subvendor = 0x1489,
@@ -3446,6 +3532,36 @@ struct pci_device_id saa7134_pci_tbl[] = {
3446	.subdevice = 0x3502, /* whats the difference to 0x3306 ?*/	3532	.subdevice = 0x3502, /* whats the difference to 0x3306 ?*/
3447	.driver_data = SAA7134_BOARD_FLYDVBT_HYBRID_CARDBUS,	3533	.driver_data = SAA7134_BOARD_FLYDVBT_HYBRID_CARDBUS,
3448	},{	3534	},{
		3535	.vendor = PCI_VENDOR_ID_PHILIPS,
		3536	.device = PCI_DEVICE_ID_PHILIPS_SAA7133,
		3537	.subvendor = 0x16be,
		3538	.subdevice = 0x0007,
		3539	.driver_data = SAA7134_BOARD_MEDION_MD8800_QUADRO,
		3540	},{
		3541	.vendor = PCI_VENDOR_ID_PHILIPS,
		3542	.device = PCI_DEVICE_ID_PHILIPS_SAA7133,
		3543	.subvendor = 0x16be,
		3544	.subdevice = 0x0008,
		3545	.driver_data = SAA7134_BOARD_MEDION_MD8800_QUADRO,
		3546	},{
		3547	.vendor = PCI_VENDOR_ID_PHILIPS,
		3548	.device = PCI_DEVICE_ID_PHILIPS_SAA7133,
		3549	.subvendor = 0x1461,
		3550	.subdevice = 0x2c05,
		3551	.driver_data = SAA7134_BOARD_AVERMEDIA_777,
		3552	},{
		3553	.vendor = PCI_VENDOR_ID_PHILIPS,
		3554	.device = PCI_DEVICE_ID_PHILIPS_SAA7133,
		3555	.subvendor = 0x1489,
		3556	.subdevice = 0x0502, /* Cardbus version */
		3557	.driver_data = SAA7134_BOARD_FLYDVBT_DUO_CARDBUS,
		3558	},{
		3559	.vendor = PCI_VENDOR_ID_PHILIPS,
		3560	.device = PCI_DEVICE_ID_PHILIPS_SAA7130,
		3561	.subvendor = 0x0919, /* Philips Proteus PRO 2309 */
		3562	.subdevice = 0x2003,
		3563	.driver_data = SAA7134_BOARD_PROTEUS_2309,
		3564	},{
3449	/* --- boards without eeprom + subsystem ID --- */	3565	/* --- boards without eeprom + subsystem ID --- */
3450	.vendor = PCI_VENDOR_ID_PHILIPS,	3566	.vendor = PCI_VENDOR_ID_PHILIPS,
3451	.device = PCI_DEVICE_ID_PHILIPS_SAA7134,	3567	.device = PCI_DEVICE_ID_PHILIPS_SAA7134,
@@ -3548,6 +3664,12 @@ int saa7134_board_init1(struct saa7134_dev *dev)
3548	case SAA7134_BOARD_SEDNA_PC_TV_CARDBUS:	3664	case SAA7134_BOARD_SEDNA_PC_TV_CARDBUS:
3549	case SAA7134_BOARD_FLYDVBT_LR301:	3665	case SAA7134_BOARD_FLYDVBT_LR301:
3550	case SAA7134_BOARD_FLYDVBTDUO:	3666	case SAA7134_BOARD_FLYDVBTDUO:
		3667	case SAA7134_BOARD_PROTEUS_2309:
		3668	dev->has_remote = SAA7134_REMOTE_GPIO;
		3669	break;
		3670	case SAA7134_BOARD_FLYDVBS_LR300:
		3671	saa_writeb(SAA7134_GPIO_GPMODE3, 0x80);
		3672	saa_writeb(SAA7134_GPIO_GPSTATUS2, 0x40);
3551	dev->has_remote = SAA7134_REMOTE_GPIO;	3673	dev->has_remote = SAA7134_REMOTE_GPIO;
3552	break;	3674	break;
3553	case SAA7134_BOARD_MD5044:	3675	case SAA7134_BOARD_MD5044:
@@ -3732,6 +3854,7 @@ int saa7134_board_init2(struct saa7134_dev *dev)
3732	case SAA7134_BOARD_PHILIPS_TIGER:	3854	case SAA7134_BOARD_PHILIPS_TIGER:
3733	case SAA7134_BOARD_TEVION_DVBT_220RF:	3855	case SAA7134_BOARD_TEVION_DVBT_220RF:
3734	case SAA7134_BOARD_ASUSTeK_P7131_DUAL:	3856	case SAA7134_BOARD_ASUSTeK_P7131_DUAL:
		3857	case SAA7134_BOARD_MEDION_MD8800_QUADRO:
3735	/* this is a hybrid board, initialize to analog mode	3858	/* this is a hybrid board, initialize to analog mode
3736	* and configure firmware eeprom address	3859	* and configure firmware eeprom address
3737	*/	3860	*/