From patchwork Sat Oct 16 17:42:01 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catimimi X-Patchwork-Id: 259191 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o9GHgi3Z018842 for ; Sat, 16 Oct 2010 17:42:46 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753474Ab0JPRmZ (ORCPT ); Sat, 16 Oct 2010 13:42:25 -0400 Received: from smtp20.orange.fr ([193.252.22.31]:7601 "EHLO smtp20.orange.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753429Ab0JPRmZ (ORCPT ); Sat, 16 Oct 2010 13:42:25 -0400 Received: from me-wanadoo.net (localhost [127.0.0.1]) by mwinf2023.orange.fr (SMTP Server) with ESMTP id 0645A2000168; Sat, 16 Oct 2010 19:42:21 +0200 (CEST) Received: from me-wanadoo.net (localhost [127.0.0.1]) by mwinf2023.orange.fr (SMTP Server) with ESMTP id E96612000169; Sat, 16 Oct 2010 19:42:20 +0200 (CEST) Received: from [192.168.2.4] (abo-159-1-69.bdx.modulonet.fr [85.69.1.159]) by mwinf2023.orange.fr (SMTP Server) with ESMTP id A77FD2000168; Sat, 16 Oct 2010 19:42:18 +0200 (CEST) X-ME-UUID: 20101016174218686.A77FD2000168@mwinf2023.orange.fr X-ME-User-Auth: michel-et-catherine Message-ID: <4CB9E3E9.2020106@orange.fr> Date: Sat, 16 Oct 2010 19:42:01 +0200 From: Catimimi User-Agent: Mozilla/5.0 (X11; U; Linux i686; fr; rv:1.9.1.11) Gecko/20100714 SUSE/3.0.6 Thunderbird/3.0.6 MIME-Version: 1.0 To: Mauro Carvalho Chehab CC: Catimimi , linux-media@vger.kernel.org Subject: Re: [PATCH] Terratec Cinergy Hybrid T USB XS FR References: <4CAA2BE6.1050302@libertysurf.fr> <4CB9103E.6020104@redhat.com> In-Reply-To: <4CB9103E.6020104@redhat.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Sat, 16 Oct 2010 17:42:47 +0000 (UTC) diff -ru v4l-dvb-1da5fed5c8b2-old/linux/drivers/media/video/em28xx/em28xx-cards.c v4l-dvb-1da5fed5c8b2-new/linux/drivers/media/video/em28xx/em28xx-cards.c --- v4l-dvb-1da5fed5c8b2-old/linux/drivers/media/video/em28xx/em28xx-cards.c 2010-03-04 06:49:46.000000000 +0100 +++ v4l-dvb-1da5fed5c8b2-new/linux/drivers/media/video/em28xx/em28xx-cards.c 2010-03-05 21:16:36.000000000 +0100 @@ -200,6 +200,18 @@ { -1, -1, -1, -1}, }; +static struct em28xx_reg_seq terratec_cinergy_USB_XS_FR_analog[] = { + {EM28XX_R08_GPIO, 0x6d, ~EM_GPIO_4, 10}, + {EM2880_R04_GPO, 0x00, 0xff, 10}, + { -1, -1, -1, -1}, +}; + +static struct em28xx_reg_seq terratec_cinergy_USB_XS_FR_digital[] = { + {EM28XX_R08_GPIO, 0x6e, ~EM_GPIO_4, 10}, + {EM2880_R04_GPO, 0x08, 0xff, 10}, + { -1, -1, -1, -1}, +}; + /* eb1a:2868 Reddo DVB-C USB TV Box GPIO4 - CU1216L NIM Other GPIOs seems to be don't care. */ @@ -824,22 +836,22 @@ .tuner_gpio = default_tuner_gpio, .decoder = EM28XX_TVP5150, .has_dvb = 1, - .dvb_gpio = default_digital, + .dvb_gpio = terratec_cinergy_USB_XS_FR_digital, .input = { { .type = EM28XX_VMUX_TELEVISION, .vmux = TVP5150_COMPOSITE0, .amux = EM28XX_AMUX_VIDEO, - .gpio = default_analog, + .gpio = terratec_cinergy_USB_XS_FR_analog, }, { .type = EM28XX_VMUX_COMPOSITE1, .vmux = TVP5150_COMPOSITE1, .amux = EM28XX_AMUX_LINE_IN, - .gpio = default_analog, + .gpio = terratec_cinergy_USB_XS_FR_analog, }, { .type = EM28XX_VMUX_SVIDEO, .vmux = TVP5150_SVIDEO, .amux = EM28XX_AMUX_LINE_IN, - .gpio = default_analog, + .gpio = terratec_cinergy_USB_XS_FR_analog, } }, }, [EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900] = { @@ -2259,6 +2271,7 @@ ctl->demod = XC3028_FE_ZARLINK456; break; case EM2880_BOARD_TERRATEC_HYBRID_XS: + case EM2880_BOARD_TERRATEC_HYBRID_XS_FR: case EM2881_BOARD_PINNACLE_HYBRID_PRO: ctl->demod = XC3028_FE_ZARLINK456; break;