From patchwork Sun Sep 20 15:14:21 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danny Wood X-Patchwork-Id: 48901 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 n8KFDoWv014485 for ; Sun, 20 Sep 2009 15:13:50 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752364AbZITPNq (ORCPT ); Sun, 20 Sep 2009 11:13:46 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752602AbZITPNq (ORCPT ); Sun, 20 Sep 2009 11:13:46 -0400 Received: from mail-ew0-f206.google.com ([209.85.219.206]:57033 "EHLO mail-ew0-f206.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751534AbZITPNp (ORCPT ); Sun, 20 Sep 2009 11:13:45 -0400 Received: by ewy2 with SMTP id 2so331720ewy.17 for ; Sun, 20 Sep 2009 08:13:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:subject:content-type :content-transfer-encoding; bh=F9eGl7iO7XDIjWNU3ALh0RHlWhbw5U8kIS6tgqbUG28=; b=mqXmJclpUksd/J2UI5qTs/aSvMdIXhVYAXin8zc5z0JtXspEolU4hEtvEo7R6zkuhG bv3D9jlQKJ7OesCRFfDIQYwwulZ5Wwn1w/X2N+Fo+PsTTrbHfT0Ibhg9ZS4xHTH2R7mL xP0fvhJqU8IaxaTxtLM7fmQiA06zn4qfxp0gw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:subject :content-type:content-transfer-encoding; b=fZ7BUizGp4hbTwcXunWXmKClSzEFtm7plVqvwmYqQLJFXOYAPscO8kY7OX9leJPJGR UPPURKmypFWsOYouBOqOmRky+T8ZPC2DtpItNlCrfMEIt8BeZQNOQxZaWhoDMfkV1Ex9 hifOSNzkApBmRns3+lAovXnDJKLOQEZ5axNm4= Received: by 10.211.143.13 with SMTP id v13mr4496768ebn.21.1253459627592; Sun, 20 Sep 2009 08:13:47 -0700 (PDT) Received: from ?192.168.11.200? (cpc1-glfd5-2-0-cust536.6-2.cable.virginmedia.com [82.8.178.25]) by mx.google.com with ESMTPS id 24sm371884eyx.7.2009.09.20.08.13.46 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 20 Sep 2009 08:13:46 -0700 (PDT) Message-ID: <4AB646CD.3030909@gmail.com> Date: Sun, 20 Sep 2009 16:14:21 +0100 From: Danny Wood User-Agent: Thunderbird 2.0.0.23 (X11/20090817) MIME-Version: 1.0 To: linux-media@vger.kernel.org Subject: [PATCH] Add support for Asus Europa Hybrid DVB-T card (SAA7134 SubVendor ID: 0x1043 Device ID: 0x4847) Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org 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 --- 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 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