From patchwork Wed Sep 23 19:55:11 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: hermann pitton X-Patchwork-Id: 49597 X-Patchwork-Delegate: dougsland@redhat.com Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n8NJuGp6010955 for ; Wed, 23 Sep 2009 19:56:16 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753593AbZIWTzz (ORCPT ); Wed, 23 Sep 2009 15:55:55 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753673AbZIWTzz (ORCPT ); Wed, 23 Sep 2009 15:55:55 -0400 Received: from mail-in-11.arcor-online.net ([151.189.21.51]:53599 "EHLO mail-in-11.arcor-online.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753620AbZIWTzx (ORCPT ); Wed, 23 Sep 2009 15:55:53 -0400 Received: from mail-in-04-z2.arcor-online.net (mail-in-04-z2.arcor-online.net [151.189.8.16]) by mx.arcor.de (Postfix) with ESMTP id B5AD6E3DF9; Wed, 23 Sep 2009 21:55:55 +0200 (CEST) Received: from mail-in-14.arcor-online.net (mail-in-14.arcor-online.net [151.189.21.54]) by mail-in-04-z2.arcor-online.net (Postfix) with ESMTP id AB0A1AC687; Wed, 23 Sep 2009 21:55:55 +0200 (CEST) Received: from [192.168.178.24] (pD9E10A6F.dip0.t-ipconnect.de [217.225.10.111]) (Authenticated sender: hermann-pitton@arcor.de) by mail-in-14.arcor-online.net (Postfix) with ESMTPSA id 71C9628ADD4; Wed, 23 Sep 2009 21:55:55 +0200 (CEST) X-DKIM: Sendmail DKIM Filter v2.8.2 mail-in-14.arcor-online.net 71C9628ADD4 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arcor.de; s=mail-in; t=1253735755; bh=tGPFP4+HkQiF1FeKHOIqeBnCh0euFidAXjrhP/AE4j0=; h=Subject:From:To:Cc:In-Reply-To:References:Content-Type:Date: Message-Id:Mime-Version; b=S//ozk2BjW6qvqdfDkUM/YlctC4j1qpnCqyE/q+vhFBbueZkdBl+KQoRrMeAIu1Ya YnKOz5H5DkP5zPDOtnl4C5CTYypxR32wfcckL8PYCVWjTkGtKDLnyHXBMxjJ74SUyM kfUfwoxGOjYQaSUGeL44xgPzOygGxM6z44nQnZFw= Subject: Re: [PATCH] Add support for Asus Europa Hybrid DVB-T card (SAA7134 SubVendor ID: 0x1043 Device ID: 0x4847) From: hermann pitton To: Danny Cc: phamthanhnam.ptn@gmail.com, linux-media@vger.kernel.org In-Reply-To: <2ebb56ce0909230558y4aa4dcabhb3e6aa1024a5bdb9@mail.gmail.com> References: <4AB646CD.3030909@gmail.com> <1253491552.27219.6.camel@AcerAspire4710> <1253495337.3257.3.camel@pc07.localdom.local> <2ebb56ce0909230558y4aa4dcabhb3e6aa1024a5bdb9@mail.gmail.com> Date: Wed, 23 Sep 2009 21:55:11 +0200 Message-Id: <1253735711.3262.10.camel@pc07.localdom.local> Mime-Version: 1.0 X-Mailer: Evolution 2.12.3 (2.12.3-5.fc8) Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org 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 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 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 > >> > 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 > >> > 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