* [PATCH] Add support for Asus Europa Hybrid DVB-T card (SAA7134 SubVendor ID: 0x1043 Device ID: 0x4847)
@ 2009-09-20 10:18 Danny
0 siblings, 0 replies; 6+ messages in thread
From: Danny @ 2009-09-20 10:18 UTC (permalink / raw)
To: linux-media
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.
Signed-off-by: Danny Wood <danwood76@gmail.com>
diff -ruN a/linux/drivers/media/video/saa7134/saa7134-cards.c
b/linux/drivers/media/video/saa7134/saa7134-cards.c
--- a/linux/drivers/media/video/saa7134/saa7134-cards.c 2009-09-20
09:10:03.000000000 +0100
+++ b/linux/drivers/media/video/saa7134/saa7134-cards.c 2009-09-20
09:07:21.000000000 +0100
@@ -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
--- a/linux/drivers/media/video/saa7134/saa7134-dvb.c 2009-09-20
09:10:03.000000000 +0100
+++ b/linux/drivers/media/video/saa7134/saa7134-dvb.c 2009-09-20
08:58:51.000000000 +0100
@@ -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
--- a/linux/drivers/media/video/saa7134/saa7134.h 2009-09-20
09:10:03.000000000 +0100
+++ b/linux/drivers/media/video/saa7134/saa7134.h 2009-09-20
09:08:15.000000000 +0100
@@ -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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] Add support for Asus Europa Hybrid DVB-T card (SAA7134 SubVendor ID: 0x1043 Device ID: 0x4847)
@ 2009-09-20 15:14 Danny Wood
2009-09-21 0:05 ` Pham Thanh Nam
0 siblings, 1 reply; 6+ messages in thread
From: Danny Wood @ 2009-09-20 15:14 UTC (permalink / raw)
To: linux-media
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)
Signed-off-by: Danny Wood <danwood76@gmail.com>
diff -ruN a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c
--- a/linux/drivers/media/video/saa7134/saa7134-cards.c 2009-09-20 09:10:03.000000000 +0100
+++ b/linux/drivers/media/video/saa7134/saa7134-cards.c 2009-09-20 09:07:21.000000000 +0100
@@ -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
--- a/linux/drivers/media/video/saa7134/saa7134-dvb.c 2009-09-20 09:10:03.000000000 +0100
+++ b/linux/drivers/media/video/saa7134/saa7134-dvb.c 2009-09-20 08:58:51.000000000 +0100
@@ -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
--- a/linux/drivers/media/video/saa7134/saa7134.h 2009-09-20 09:10:03.000000000 +0100
+++ b/linux/drivers/media/video/saa7134/saa7134.h 2009-09-20 09:08:15.000000000 +0100
@@ -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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Add support for Asus Europa Hybrid DVB-T card (SAA7134 SubVendor ID: 0x1043 Device ID: 0x4847)
2009-09-20 15:14 [PATCH] Add support for Asus Europa Hybrid DVB-T card (SAA7134 SubVendor ID: 0x1043 Device ID: 0x4847) Danny Wood
@ 2009-09-21 0:05 ` Pham Thanh Nam
2009-09-21 1:08 ` hermann pitton
0 siblings, 1 reply; 6+ messages in thread
From: Pham Thanh Nam @ 2009-09-21 0:05 UTC (permalink / raw)
To: linux-media
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:
> 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)
>
> Signed-off-by: Danny Wood <danwood76@gmail.com>
> diff -ruN a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c
> --- a/linux/drivers/media/video/saa7134/saa7134-cards.c 2009-09-20 09:10:03.000000000 +0100
> +++ b/linux/drivers/media/video/saa7134/saa7134-cards.c 2009-09-20 09:07:21.000000000 +0100
> @@ -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
> --- a/linux/drivers/media/video/saa7134/saa7134-dvb.c 2009-09-20 09:10:03.000000000 +0100
> +++ b/linux/drivers/media/video/saa7134/saa7134-dvb.c 2009-09-20 08:58:51.000000000 +0100
> @@ -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
> --- a/linux/drivers/media/video/saa7134/saa7134.h 2009-09-20 09:10:03.000000000 +0100
> +++ b/linux/drivers/media/video/saa7134/saa7134.h 2009-09-20 09:08:15.000000000 +0100
> @@ -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 majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Add support for Asus Europa Hybrid DVB-T card (SAA7134 SubVendor ID: 0x1043 Device ID: 0x4847)
2009-09-21 0:05 ` Pham Thanh Nam
@ 2009-09-21 1:08 ` hermann pitton
2009-09-23 12:58 ` Danny
0 siblings, 1 reply; 6+ messages in thread
From: hermann pitton @ 2009-09-21 1:08 UTC (permalink / raw)
To: Pham Thanh Nam; +Cc: linux-media
Hi Pham,
Am Montag, den 21.09.2009, 07:05 +0700 schrieb Pham Thanh Nam:
> 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
> Vào CN, ngày 20, 09 năm 2009 lúc 16:14 +0100, Danny Wood viết:
> > 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)
> >
> > Signed-off-by: Danny Wood <danwood76@gmail.com>
> > diff -ruN a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c
> > --- a/linux/drivers/media/video/saa7134/saa7134-cards.c 2009-09-20 09:10:03.000000000 +0100
> > +++ b/linux/drivers/media/video/saa7134/saa7134-cards.c 2009-09-20 09:07:21.000000000 +0100
> > @@ -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
> > --- a/linux/drivers/media/video/saa7134/saa7134-dvb.c 2009-09-20 09:10:03.000000000 +0100
> > +++ b/linux/drivers/media/video/saa7134/saa7134-dvb.c 2009-09-20 08:58:51.000000000 +0100
> > @@ -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
> > --- a/linux/drivers/media/video/saa7134/saa7134.h 2009-09-20 09:10:03.000000000 +0100
> > +++ b/linux/drivers/media/video/saa7134/saa7134.h 2009-09-20 09:08:15.000000000 +0100
> > @@ -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
> >
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Add support for Asus Europa Hybrid DVB-T card (SAA7134 SubVendor ID: 0x1043 Device ID: 0x4847)
2009-09-21 1:08 ` hermann pitton
@ 2009-09-23 12:58 ` Danny
2009-09-23 19:55 ` hermann pitton
0 siblings, 1 reply; 6+ messages in thread
From: Danny @ 2009-09-23 12:58 UTC (permalink / raw)
To: hermann pitton, phamthanhnam.ptn, linux-media
So should I resubmit the patch with this extra file patched or not?
On Mon, Sep 21, 2009 at 2:08 AM, hermann pitton <hermann-pitton@arcor.de> wrote:
> Hi Pham,
>
> Am Montag, den 21.09.2009, 07:05 +0700 schrieb Pham Thanh Nam:
>> 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
>
>> Vào CN, ngày 20, 09 năm 2009 lúc 16:14 +0100, Danny Wood viết:
>> > 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)
>> >
>> > Signed-off-by: Danny Wood <danwood76@gmail.com>
>> > diff -ruN a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c
>> > --- a/linux/drivers/media/video/saa7134/saa7134-cards.c 2009-09-20 09:10:03.000000000 +0100
>> > +++ b/linux/drivers/media/video/saa7134/saa7134-cards.c 2009-09-20 09:07:21.000000000 +0100
>> > @@ -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
>> > --- a/linux/drivers/media/video/saa7134/saa7134-dvb.c 2009-09-20 09:10:03.000000000 +0100
>> > +++ b/linux/drivers/media/video/saa7134/saa7134-dvb.c 2009-09-20 08:58:51.000000000 +0100
>> > @@ -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
>> > --- a/linux/drivers/media/video/saa7134/saa7134.h 2009-09-20 09:10:03.000000000 +0100
>> > +++ b/linux/drivers/media/video/saa7134/saa7134.h 2009-09-20 09:08:15.000000000 +0100
>> > @@ -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 majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Add support for Asus Europa Hybrid DVB-T card (SAA7134 SubVendor ID: 0x1043 Device ID: 0x4847)
2009-09-23 12:58 ` Danny
@ 2009-09-23 19:55 ` hermann pitton
0 siblings, 0 replies; 6+ messages in thread
From: hermann pitton @ 2009-09-23 19:55 UTC (permalink / raw)
To: Danny; +Cc: phamthanhnam.ptn, linux-media
[-- Attachment #1: Type: text/plain, Size: 5222 bytes --]
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.
Reviewed-by: hermann pitton <hermann.pitton@arcor.de>
Thanks!
Cheers,
Hermann
Am Mittwoch, den 23.09.2009, 13:58 +0100 schrieb Danny:
> So should I resubmit the patch with this extra file patched or not?
>
>
> On Mon, Sep 21, 2009 at 2:08 AM, hermann pitton <hermann-pitton@arcor.de> wrote:
> > Hi Pham,
> >
> > Am Montag, den 21.09.2009, 07:05 +0700 schrieb Pham Thanh Nam:
> >> 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
> >
> >> Vào CN, ngày 20, 09 năm 2009 lúc 16:14 +0100, Danny Wood viết:
> >> > 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)
> >> >
> >> > Signed-off-by: Danny Wood <danwood76@gmail.com>
> >> > diff -ruN a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c
> >> > --- a/linux/drivers/media/video/saa7134/saa7134-cards.c 2009-09-20 09:10:03.000000000 +0100
> >> > +++ b/linux/drivers/media/video/saa7134/saa7134-cards.c 2009-09-20 09:07:21.000000000 +0100
> >> > @@ -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
> >> > --- a/linux/drivers/media/video/saa7134/saa7134-dvb.c 2009-09-20 09:10:03.000000000 +0100
> >> > +++ b/linux/drivers/media/video/saa7134/saa7134-dvb.c 2009-09-20 08:58:51.000000000 +0100
> >> > @@ -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
> >> > --- a/linux/drivers/media/video/saa7134/saa7134.h 2009-09-20 09:10:03.000000000 +0100
> >> > +++ b/linux/drivers/media/video/saa7134/saa7134.h 2009-09-20 09:08:15.000000000 +0100
> >> > @@ -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
> >> >
[-- Attachment #2: saa7134_support-for-asus-europa-hybrid.patch --]
[-- Type: text/x-patch, Size: 3117 bytes --]
diff -r a798c751f06d linux/Documentation/video4linux/CARDLIST.saa7134
--- a/linux/Documentation/video4linux/CARDLIST.saa7134 Wed Sep 23 10:21:53 2009 +0200
+++ b/linux/Documentation/video4linux/CARDLIST.saa7134 Wed Sep 23 21:04:13 2009 +0200
@@ -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]
diff -r a798c751f06d linux/drivers/media/video/saa7134/saa7134-cards.c
--- a/linux/drivers/media/video/saa7134/saa7134-cards.c Wed Sep 23 10:21:53 2009 +0200
+++ b/linux/drivers/media/video/saa7134/saa7134-cards.c Wed Sep 23 21:04:13 2009 +0200
@@ -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
diff -r a798c751f06d linux/drivers/media/video/saa7134/saa7134-dvb.c
--- a/linux/drivers/media/video/saa7134/saa7134-dvb.c Wed Sep 23 10:21:53 2009 +0200
+++ b/linux/drivers/media/video/saa7134/saa7134-dvb.c Wed Sep 23 21:04:13 2009 +0200
@@ -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 -r a798c751f06d linux/drivers/media/video/saa7134/saa7134.h
--- a/linux/drivers/media/video/saa7134/saa7134.h Wed Sep 23 10:21:53 2009 +0200
+++ b/linux/drivers/media/video/saa7134/saa7134.h Wed Sep 23 21:04:13 2009 +0200
@@ -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
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2009-09-23 19:55 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-09-20 15:14 [PATCH] Add support for Asus Europa Hybrid DVB-T card (SAA7134 SubVendor ID: 0x1043 Device ID: 0x4847) Danny Wood
2009-09-21 0:05 ` Pham Thanh Nam
2009-09-21 1:08 ` hermann pitton
2009-09-23 12:58 ` Danny
2009-09-23 19:55 ` hermann pitton
-- strict thread matches above, loose matches on Subject: below --
2009-09-20 10:18 Danny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox