Skip to contentSkip to conversation

Add support for Asus Europa Hybrid DVB-T card (SAA7134 SubVendor ID: 0x1043 Device ID: 0x4847)

PATCH In review Danny Wood 3 participants 5 messages Sep 20, 2009 – Sep 23, 2009 Media (V4L/DVB)

lore
Share & tools
lore

Danny Wood

author
#0 lore raw

PATCH 1/1 Add support for Asus Europa Hybrid DVB-T card (SAA7134 SubVendor ID: 0x1043 Device ID: 0x4847)

Adds the device IDs and driver linking to allow the Asus Europa DVB-T card to operate with these drivers.
The device has a SAA7134 chipset with a TD1316 Hybrid Tuner. All inputs work on the card including switching between DVB-T and Analogue TV, there is also no IR with this card.

(Resent with fixed email formatting)

linux/drivers/media/video/saa7134/saa7134-cards.c +31 -0
diff -ruN a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c
@@ -5317,6 +5317,30 @@
 			.amux = TV,
 		},
 	},
+	[SAA7134_BOARD_ASUS_EUROPA_HYBRID] = {
+		.name           = "Asus Europa Hybrid OEM",
+		.audio_clock    = 0x00187de7,
+		.tuner_type     = TUNER_PHILIPS_TD1316,
+		.radio_type     = UNSET,
+		.tuner_addr	= 0x61,
+		.radio_addr	= ADDR_UNSET,
+		.tda9887_conf   = TDA9887_PRESENT | TDA9887_PORT1_ACTIVE,
+		.mpeg           = SAA7134_MPEG_DVB,
+		.inputs = {{
+			.name   = name_tv,
+			.vmux   = 3,
+			.amux   = TV,
+			.tv     = 1,
+		},{
+			.name   = name_comp1,
+			.vmux   = 4,
+			.amux   = LINE2,
+		},{
+			.name   = name_svideo,
+			.vmux   = 8,
+			.amux   = LINE2,
+		}},
+	},
 
 };
 
@@ -6455,6 +6479,12 @@
 		.subvendor    = PCI_VENDOR_ID_PHILIPS,
 		.subdevice    = 0x2004,
 		.driver_data  = SAA7134_BOARD_ZOLID_HYBRID_PCI,
+	},{
+		.vendor       = PCI_VENDOR_ID_PHILIPS,
+		.device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
+		.subvendor    = 0x1043,
+		.subdevice    = 0x4847,
+		.driver_data  = SAA7134_BOARD_ASUS_EUROPA_HYBRID,
 	}, {
 		/* --- boards without eeprom + subsystem ID --- */
 		.vendor       = PCI_VENDOR_ID_PHILIPS,
@@ -7162,6 +7192,7 @@
 		/* break intentionally omitted */
 	case SAA7134_BOARD_VIDEOMATE_DVBT_300:
 	case SAA7134_BOARD_ASUS_EUROPA2_HYBRID:
+	case SAA7134_BOARD_ASUS_EUROPA_HYBRID:
 	{
 
 		/* The Philips EUROPA based hybrid boards have the tuner
linux/drivers/media/video/saa7134/saa7134-dvb.c +1 -0
diff -ruN a/linux/drivers/media/video/saa7134/saa7134-dvb.c b/linux/drivers/media/video/saa7134/saa7134-dvb.c
@@ -1116,6 +1116,7 @@
 		break;
 	case SAA7134_BOARD_PHILIPS_EUROPA:
 	case SAA7134_BOARD_VIDEOMATE_DVBT_300:
+	case SAA7134_BOARD_ASUS_EUROPA_HYBRID:
 		fe0->dvb.frontend = dvb_attach(tda10046_attach,
 					       &philips_europa_config,
 					       &dev->i2c_adap);
linux/drivers/media/video/saa7134/saa7134.h +1 -0
diff -ruN a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h
@@ -298,6 +298,7 @@
 #define SAA7134_BOARD_BEHOLD_X7             171
 #define SAA7134_BOARD_ROVERMEDIA_LINK_PRO_FM 172
 #define SAA7134_BOARD_ZOLID_HYBRID_PCI		173
+#define SAA7134_BOARD_ASUS_EUROPA_HYBRID	174
 
 #define SAA7134_MAXBOARDS 32
 #define SAA7134_INPUT_MAX 8
#1 lore raw

Hi, Danny
Please add an entry in:
linux/Documentation/video4linux/CARDLIST.saa7134
Regards.

Vào CN, ngày 20, 09 năm 2009 lúc 16:14 +0100, Danny Wood viết:

Quoted 91 lines

Adds the device IDs and driver linking to allow the Asus Europa DVB-T card to operate with these drivers.
The device has a SAA7134 chipset with a TD1316 Hybrid Tuner. All inputs work on the card including switching between DVB-T and Analogue TV, there is also no IR with this card.

(Resent with fixed email formatting)

diff -ruN a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c

linux/drivers/media/video/saa7134/saa7134-cards.c +31 -0
@@ -5317,6 +5317,30 @@
 			.amux = TV,
 		},
 	},
+	[SAA7134_BOARD_ASUS_EUROPA_HYBRID] = {
+		.name           = "Asus Europa Hybrid OEM",
+		.audio_clock    = 0x00187de7,
+		.tuner_type     = TUNER_PHILIPS_TD1316,
+		.radio_type     = UNSET,
+		.tuner_addr	= 0x61,
+		.radio_addr	= ADDR_UNSET,
+		.tda9887_conf   = TDA9887_PRESENT | TDA9887_PORT1_ACTIVE,
+		.mpeg           = SAA7134_MPEG_DVB,
+		.inputs = {{
+			.name   = name_tv,
+			.vmux   = 3,
+			.amux   = TV,
+			.tv     = 1,
+		},{
+			.name   = name_comp1,
+			.vmux   = 4,
+			.amux   = LINE2,
+		},{
+			.name   = name_svideo,
+			.vmux   = 8,
+			.amux   = LINE2,
+		}},
+	},
 
 };
 
@@ -6455,6 +6479,12 @@
 		.subvendor    = PCI_VENDOR_ID_PHILIPS,
 		.subdevice    = 0x2004,
 		.driver_data  = SAA7134_BOARD_ZOLID_HYBRID_PCI,
+	},{
+		.vendor       = PCI_VENDOR_ID_PHILIPS,
+		.device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
+		.subvendor    = 0x1043,
+		.subdevice    = 0x4847,
+		.driver_data  = SAA7134_BOARD_ASUS_EUROPA_HYBRID,
 	}, {
 		/* --- boards without eeprom + subsystem ID --- */
 		.vendor       = PCI_VENDOR_ID_PHILIPS,
@@ -7162,6 +7192,7 @@
 		/* break intentionally omitted */
 	case SAA7134_BOARD_VIDEOMATE_DVBT_300:
 	case SAA7134_BOARD_ASUS_EUROPA2_HYBRID:
+	case SAA7134_BOARD_ASUS_EUROPA_HYBRID:
 	{
 
 		/* The Philips EUROPA based hybrid boards have the tuner

diff -ruN a/linux/drivers/media/video/saa7134/saa7134-dvb.c b/linux/drivers/media/video/saa7134/saa7134-dvb.c

linux/drivers/media/video/saa7134/saa7134-dvb.c +1 -0
@@ -1116,6 +1116,7 @@
 		break;
 	case SAA7134_BOARD_PHILIPS_EUROPA:
 	case SAA7134_BOARD_VIDEOMATE_DVBT_300:
+	case SAA7134_BOARD_ASUS_EUROPA_HYBRID:
 		fe0->dvb.frontend = dvb_attach(tda10046_attach,
 					       &philips_europa_config,
 					       &dev->i2c_adap);

diff -ruN a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h

linux/drivers/media/video/saa7134/saa7134.h +1 -1
@@ -298,6 +298,7 @@
 #define SAA7134_BOARD_BEHOLD_X7             171
 #define SAA7134_BOARD_ROVERMEDIA_LINK_PRO_FM 172
 #define SAA7134_BOARD_ZOLID_HYBRID_PCI		173
+#define SAA7134_BOARD_ASUS_EUROPA_HYBRID	174
 
 #define SAA7134_MAXBOARDS 32
 #define SAA7134_INPUT_MAX 8
 
--

To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#2 lore raw

Hi Pham,

Am Montag, den 21.09.2009, 07:05 +0700 schrieb Pham Thanh Nam:

Quoted 4 lines

Hi, Danny
Please add an entry in:
linux/Documentation/video4linux/CARDLIST.saa7134
Regards.

that is not so important.

It will be auto magically created by scripts, if Mauro pulls it in.

Cheers,
Hermann

Quoted 88 lines

Vào CN, ngày 20, 09 năm 2009 lúc 16:14 +0100, Danny Wood viết:

Quoted 87 lines

Adds the device IDs and driver linking to allow the Asus Europa DVB-T card to operate with these drivers.
The device has a SAA7134 chipset with a TD1316 Hybrid Tuner. All inputs work on the card including switching between DVB-T and Analogue TV, there is also no IR with this card.

(Resent with fixed email formatting)

diff -ruN a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c

linux/drivers/media/video/saa7134/saa7134-cards.c +31 -0
@@ -5317,6 +5317,30 @@
 			.amux = TV,
 		},
 	},
+	[SAA7134_BOARD_ASUS_EUROPA_HYBRID] = {
+		.name           = "Asus Europa Hybrid OEM",
+		.audio_clock    = 0x00187de7,
+		.tuner_type     = TUNER_PHILIPS_TD1316,
+		.radio_type     = UNSET,
+		.tuner_addr	= 0x61,
+		.radio_addr	= ADDR_UNSET,
+		.tda9887_conf   = TDA9887_PRESENT | TDA9887_PORT1_ACTIVE,
+		.mpeg           = SAA7134_MPEG_DVB,
+		.inputs = {{
+			.name   = name_tv,
+			.vmux   = 3,
+			.amux   = TV,
+			.tv     = 1,
+		},{
+			.name   = name_comp1,
+			.vmux   = 4,
+			.amux   = LINE2,
+		},{
+			.name   = name_svideo,
+			.vmux   = 8,
+			.amux   = LINE2,
+		}},
+	},
 
 };
 
@@ -6455,6 +6479,12 @@
 		.subvendor    = PCI_VENDOR_ID_PHILIPS,
 		.subdevice    = 0x2004,
 		.driver_data  = SAA7134_BOARD_ZOLID_HYBRID_PCI,
+	},{
+		.vendor       = PCI_VENDOR_ID_PHILIPS,
+		.device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
+		.subvendor    = 0x1043,
+		.subdevice    = 0x4847,
+		.driver_data  = SAA7134_BOARD_ASUS_EUROPA_HYBRID,
 	}, {
 		/* --- boards without eeprom + subsystem ID --- */
 		.vendor       = PCI_VENDOR_ID_PHILIPS,
@@ -7162,6 +7192,7 @@
 		/* break intentionally omitted */
 	case SAA7134_BOARD_VIDEOMATE_DVBT_300:
 	case SAA7134_BOARD_ASUS_EUROPA2_HYBRID:
+	case SAA7134_BOARD_ASUS_EUROPA_HYBRID:
 	{
 
 		/* The Philips EUROPA based hybrid boards have the tuner

diff -ruN a/linux/drivers/media/video/saa7134/saa7134-dvb.c b/linux/drivers/media/video/saa7134/saa7134-dvb.c

linux/drivers/media/video/saa7134/saa7134-dvb.c +1 -0
@@ -1116,6 +1116,7 @@
 		break;
 	case SAA7134_BOARD_PHILIPS_EUROPA:
 	case SAA7134_BOARD_VIDEOMATE_DVBT_300:
+	case SAA7134_BOARD_ASUS_EUROPA_HYBRID:
 		fe0->dvb.frontend = dvb_attach(tda10046_attach,
 					       &philips_europa_config,
 					       &dev->i2c_adap);

diff -ruN a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h

linux/drivers/media/video/saa7134/saa7134.h +1 -0
@@ -298,6 +298,7 @@
 #define SAA7134_BOARD_BEHOLD_X7             171
 #define SAA7134_BOARD_ROVERMEDIA_LINK_PRO_FM 172
 #define SAA7134_BOARD_ZOLID_HYBRID_PCI		173
+#define SAA7134_BOARD_ASUS_EUROPA_HYBRID	174
 
 #define SAA7134_MAXBOARDS 32
 #define SAA7134_INPUT_MAX 8
author
#3 lore raw

So should I resubmit the patch with this extra file patched or not?

Quoted 110 lines · hermann pitton

Hi Pham,

Am Montag, den 21.09.2009, 07:05 +0700 schrieb Pham Thanh Nam:

Quoted 4 lines

Hi, Danny
Please add an entry in:
linux/Documentation/video4linux/CARDLIST.saa7134
Regards.

that is not so important.

It will be auto magically created by scripts, if Mauro pulls it in.

Cheers,
Hermann

Quoted 85 lines

Vào CN, ngày 20, 09 năm 2009 lúc 16:14 +0100, Danny Wood viết:

Quoted 84 lines

Adds the device IDs and driver linking to allow the Asus Europa DVB-T card to operate with these drivers.
The device has a SAA7134 chipset with a TD1316 Hybrid Tuner. All inputs work on the card including switching between DVB-T and Analogue TV, there is also no IR with this card.

(Resent with fixed email formatting)

diff -ruN a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c

linux/drivers/media/video/saa7134/saa7134-cards.c     2009-09-20 09:07:21.000000000 +0100 renamed from linux/drivers/media/video/saa7134/saa7134-cards.c     2009-09-20 09:10:03.000000000 +0100 +30 -0
@@ -5317,6 +5317,30 @@
                     .amux = TV,
             },
     },
+   [SAA7134_BOARD_ASUS_EUROPA_HYBRID] = {
+           .name           = "Asus Europa Hybrid OEM",
+           .audio_clock    = 0x00187de7,
+           .tuner_type     = TUNER_PHILIPS_TD1316,
+           .radio_type     = UNSET,
+           .tuner_addr     = 0x61,
+           .radio_addr     = ADDR_UNSET,
+           .tda9887_conf   = TDA9887_PRESENT | TDA9887_PORT1_ACTIVE,
+           .mpeg           = SAA7134_MPEG_DVB,
+           .inputs = {{
+                   .name   = name_tv,
+                   .vmux   = 3,
+                   .amux   = TV,
+                   .tv     = 1,
+           },{
+                   .name   = name_comp1,
+                   .vmux   = 4,
+                   .amux   = LINE2,
+           },{
+                   .name   = name_svideo,
+                   .vmux   = 8,
+                   .amux   = LINE2,
+           }},
+   },
 
  };
 
@@ -6455,6 +6479,12 @@
             .subvendor    = PCI_VENDOR_ID_PHILIPS,
             .subdevice    = 0x2004,
             .driver_data  = SAA7134_BOARD_ZOLID_HYBRID_PCI,
+   },{
+           .vendor       = PCI_VENDOR_ID_PHILIPS,
+           .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
+           .subvendor    = 0x1043,
+           .subdevice    = 0x4847,
+           .driver_data  = SAA7134_BOARD_ASUS_EUROPA_HYBRID,
     }, {
             /* --- boards without eeprom + subsystem ID --- */
             .vendor       = PCI_VENDOR_ID_PHILIPS,
@@ -7162,6 +7192,7 @@
             /* break intentionally omitted */

    case SAA7134_BOARD_VIDEOMATE_DVBT_300:
    case SAA7134_BOARD_ASUS_EUROPA2_HYBRID:
+   case SAA7134_BOARD_ASUS_EUROPA_HYBRID:
    {

            /* The Philips EUROPA based hybrid boards have the tuner
diff -ruN a/linux/drivers/media/video/saa7134/saa7134-dvb.c b/linux/drivers/media/video/saa7134/saa7134-dvb.c

linux/drivers/media/video/saa7134/saa7134-dvb.c       2009-09-20 08:58:51.000000000 +0100 renamed from linux/drivers/media/video/saa7134/saa7134-dvb.c       2009-09-20 09:10:03.000000000 +0100 +0 -0
@@ -1116,6 +1116,7 @@
             break;

    case SAA7134_BOARD_PHILIPS_EUROPA:
    case SAA7134_BOARD_VIDEOMATE_DVBT_300:
+   case SAA7134_BOARD_ASUS_EUROPA_HYBRID:
            fe0->dvb.frontend = dvb_attach(tda10046_attach,
                                           &philips_europa_config,
                                           &dev->i2c_adap);
diff -ruN a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h

linux/drivers/media/video/saa7134/saa7134.h   2009-09-20 09:08:15.000000000 +0100 renamed from linux/drivers/media/video/saa7134/saa7134.h   2009-09-20 09:10:03.000000000 +0100 +1 -0
@@ -298,6 +298,7 @@
  #define SAA7134_BOARD_BEHOLD_X7             171
  #define SAA7134_BOARD_ROVERMEDIA_LINK_PRO_FM 172
  #define SAA7134_BOARD_ZOLID_HYBRID_PCI             173
+#define SAA7134_BOARD_ASUS_EUROPA_HYBRID   174
 
Quoted 3 lines

linux/drivers/media/video/saa7134/saa7134.h   2009-09-20 09:08:15.000000000 +0100 line 304

Quoted 3 lines
linux/drivers/media/video/saa7134/saa7134.h   2009-09-20 09:08:15.000000000 +0100 renamed from linux/drivers/media/video/saa7134/saa7134.h   2009-09-20 09:10:03.000000000 +0100 +0 -0
  #define SAA7134_MAXBOARDS 32
  #define SAA7134_INPUT_MAX 8

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reviewed-by
#4 lore raw

Hi Danny,

as said, that line in saa7134.CARDLIST would also be auto generated on mercurial "make commit".

Since you also have some of the usual "make checkpatch" warnings about missing space after comma, a new version fixing that is attached.

Thanks!

Cheers,
Hermann

Am Mittwoch, den 23.09.2009, 13:58 +0100 schrieb Danny:

Quoted 104 lines

So should I resubmit the patch with this extra file patched or not?

Quoted 100 lines · hermann pitton

Hi Pham,

Am Montag, den 21.09.2009, 07:05 +0700 schrieb Pham Thanh Nam:

Quoted 4 lines

Hi, Danny
Please add an entry in:
linux/Documentation/video4linux/CARDLIST.saa7134
Regards.

that is not so important.

It will be auto magically created by scripts, if Mauro pulls it in.

Cheers,
Hermann

Quoted 85 lines

Vào CN, ngày 20, 09 năm 2009 lúc 16:14 +0100, Danny Wood viết:

Quoted 84 lines

Adds the device IDs and driver linking to allow the Asus Europa DVB-T card to operate with these drivers.
The device has a SAA7134 chipset with a TD1316 Hybrid Tuner. All inputs work on the card including switching between DVB-T and Analogue TV, there is also no IR with this card.

(Resent with fixed email formatting)

diff -ruN a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c

linux/drivers/media/video/saa7134/saa7134-cards.c 2009-09-20 09:07:21.000000000 +0100 renamed from linux/drivers/media/video/saa7134/saa7134-cards.c 2009-09-20 09:10:03.000000000 +0100 +31 -0
@@ -5317,6 +5317,30 @@
                    .amux = TV,
            },
    },
+   [SAA7134_BOARD_ASUS_EUROPA_HYBRID] = {
+           .name           = "Asus Europa Hybrid OEM",
+           .audio_clock    = 0x00187de7,
+           .tuner_type     = TUNER_PHILIPS_TD1316,
+           .radio_type     = UNSET,
+           .tuner_addr     = 0x61,
+           .radio_addr     = ADDR_UNSET,
+           .tda9887_conf   = TDA9887_PRESENT | TDA9887_PORT1_ACTIVE,
+           .mpeg           = SAA7134_MPEG_DVB,
+           .inputs = {{
+                   .name   = name_tv,
+                   .vmux   = 3,
+                   .amux   = TV,
+                   .tv     = 1,
+           },{
+                   .name   = name_comp1,
+                   .vmux   = 4,
+                   .amux   = LINE2,
+           },{
+                   .name   = name_svideo,
+                   .vmux   = 8,
+                   .amux   = LINE2,
+           }},
+   },
 
 };
 
@@ -6455,6 +6479,12 @@
            .subvendor    = PCI_VENDOR_ID_PHILIPS,
            .subdevice    = 0x2004,
            .driver_data  = SAA7134_BOARD_ZOLID_HYBRID_PCI,
+   },{
+           .vendor       = PCI_VENDOR_ID_PHILIPS,
+           .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
+           .subvendor    = 0x1043,
+           .subdevice    = 0x4847,
+           .driver_data  = SAA7134_BOARD_ASUS_EUROPA_HYBRID,
    }, {
            /* --- boards without eeprom + subsystem ID --- */
            .vendor       = PCI_VENDOR_ID_PHILIPS,
@@ -7162,6 +7192,7 @@
            /* break intentionally omitted */
    case SAA7134_BOARD_VIDEOMATE_DVBT_300:
    case SAA7134_BOARD_ASUS_EUROPA2_HYBRID:
+   case SAA7134_BOARD_ASUS_EUROPA_HYBRID:
    {
 
            /* The Philips EUROPA based hybrid boards have the tuner

diff -ruN a/linux/drivers/media/video/saa7134/saa7134-dvb.c b/linux/drivers/media/video/saa7134/saa7134-dvb.c

linux/drivers/media/video/saa7134/saa7134-dvb.c 2009-09-20 08:58:51.000000000 +0100 renamed from linux/drivers/media/video/saa7134/saa7134-dvb.c 2009-09-20 09:10:03.000000000 +0100 +1 -0
@@ -1116,6 +1116,7 @@
            break;
    case SAA7134_BOARD_PHILIPS_EUROPA:
    case SAA7134_BOARD_VIDEOMATE_DVBT_300:
+   case SAA7134_BOARD_ASUS_EUROPA_HYBRID:
            fe0->dvb.frontend = dvb_attach(tda10046_attach,
                                           &philips_europa_config,
                                           &dev->i2c_adap);

diff -ruN a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h

linux/drivers/media/video/saa7134/saa7134.h 2009-09-20 09:08:15.000000000 +0100 renamed from linux/drivers/media/video/saa7134/saa7134.h 2009-09-20 09:10:03.000000000 +0100 +1 -0
@@ -298,6 +298,7 @@
 #define SAA7134_BOARD_BEHOLD_X7             171
 #define SAA7134_BOARD_ROVERMEDIA_LINK_PRO_FM 172
 #define SAA7134_BOARD_ZOLID_HYBRID_PCI             173
+#define SAA7134_BOARD_ASUS_EUROPA_HYBRID   174
 
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

linux/drivers/media/video/saa7134/saa7134.h 2009-09-20 09:08:15.000000000 +0100 line 304

Quoted 3 lines
linux/drivers/media/video/saa7134/saa7134.h 2009-09-20 09:08:15.000000000 +0100 renamed from linux/drivers/media/video/saa7134/saa7134.h 2009-09-20 09:10:03.000000000 +0100 +0 -0
 #define SAA7134_MAXBOARDS 32
 #define SAA7134_INPUT_MAX 8
linux/Documentation/video4linux/CARDLIST.saa7134 +1 -0
diff -r a798c751f06d linux/Documentation/video4linux/CARDLIST.saa7134
@@ -172,3 +172,4 @@
 171 -> Beholder BeholdTV X7                     [5ace:7595]
 172 -> RoverMedia TV Link Pro FM                [19d1:0138]
 173 -> Zolid Hybrid TV Tuner PCI                [1131:2004]
+174 -> Asus Europa Hybrid OEM                   [1043:4847]
linux/drivers/media/video/saa7134/saa7134-cards.c +31 -0
diff -r a798c751f06d linux/drivers/media/video/saa7134/saa7134-cards.c
@@ -5317,6 +5317,30 @@
 			.amux = TV,
 		},
 	},
+	[SAA7134_BOARD_ASUS_EUROPA_HYBRID] = {
+		.name           = "Asus Europa Hybrid OEM",
+		.audio_clock    = 0x00187de7,
+		.tuner_type     = TUNER_PHILIPS_TD1316,
+		.radio_type     = UNSET,
+		.tuner_addr	= 0x61,
+		.radio_addr	= ADDR_UNSET,
+		.tda9887_conf   = TDA9887_PRESENT | TDA9887_PORT1_ACTIVE,
+		.mpeg           = SAA7134_MPEG_DVB,
+		.inputs = {{
+			.name   = name_tv,
+			.vmux   = 3,
+			.amux   = TV,
+			.tv     = 1,
+		}, {
+			.name   = name_comp1,
+			.vmux   = 4,
+			.amux   = LINE2,
+		}, {
+			.name   = name_svideo,
+			.vmux   = 8,
+			.amux   = LINE2,
+		} },
+	},
 
 };
 
@@ -6456,6 +6480,12 @@
 		.subdevice    = 0x2004,
 		.driver_data  = SAA7134_BOARD_ZOLID_HYBRID_PCI,
 	}, {
+		.vendor       = PCI_VENDOR_ID_PHILIPS,
+		.device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
+		.subvendor    = 0x1043,
+		.subdevice    = 0x4847,
+		.driver_data  = SAA7134_BOARD_ASUS_EUROPA_HYBRID,
+	}, {
 		/* --- boards without eeprom + subsystem ID --- */
 		.vendor       = PCI_VENDOR_ID_PHILIPS,
 		.device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
@@ -7162,6 +7192,7 @@
 		/* break intentionally omitted */
 	case SAA7134_BOARD_VIDEOMATE_DVBT_300:
 	case SAA7134_BOARD_ASUS_EUROPA2_HYBRID:
+	case SAA7134_BOARD_ASUS_EUROPA_HYBRID:
 	{
 
 		/* The Philips EUROPA based hybrid boards have the tuner
linux/drivers/media/video/saa7134/saa7134-dvb.c +1 -0
diff -r a798c751f06d linux/drivers/media/video/saa7134/saa7134-dvb.c
@@ -1116,6 +1116,7 @@
 		break;
 	case SAA7134_BOARD_PHILIPS_EUROPA:
 	case SAA7134_BOARD_VIDEOMATE_DVBT_300:
+	case SAA7134_BOARD_ASUS_EUROPA_HYBRID:
 		fe0->dvb.frontend = dvb_attach(tda10046_attach,
 					       &philips_europa_config,
 					       &dev->i2c_adap);
linux/drivers/media/video/saa7134/saa7134.h +1 -0
diff -r a798c751f06d linux/drivers/media/video/saa7134/saa7134.h
@@ -298,6 +298,7 @@
 #define SAA7134_BOARD_BEHOLD_X7             171
 #define SAA7134_BOARD_ROVERMEDIA_LINK_PRO_FM 172
 #define SAA7134_BOARD_ZOLID_HYBRID_PCI		173
+#define SAA7134_BOARD_ASUS_EUROPA_HYBRID	174
 
 #define SAA7134_MAXBOARDS 32
 #define SAA7134_INPUT_MAX 8