From patchwork Tue Sep 18 16:16:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 1473541 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 7793ADF24C for ; Tue, 18 Sep 2012 16:16:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750971Ab2IRQQ3 (ORCPT ); Tue, 18 Sep 2012 12:16:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58265 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750877Ab2IRQQ2 (ORCPT ); Tue, 18 Sep 2012 12:16:28 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q8IGGQX7002871 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 18 Sep 2012 12:16:26 -0400 Received: from [10.3.224.136] (vpn-224-136.phx2.redhat.com [10.3.224.136]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q8IGGOeQ011860 (version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NO); Tue, 18 Sep 2012 12:16:25 -0400 Message-ID: <50589E52.5050602@redhat.com> Date: Tue, 18 Sep 2012 13:16:18 -0300 From: Mauro Carvalho Chehab User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:15.0) Gecko/20120828 Thunderbird/15.0 MIME-Version: 1.0 To: =?ISO-8859-1?Q?Alfredo_Jes=FAs_Delaiti?= CC: linux-media@vger.kernel.org Subject: Re: [PATCH] Mygica X8507 audio for YPbPr, AV and S-Video References: <50450FB5.3090503@netscape.net> In-Reply-To: <50450FB5.3090503@netscape.net> X-Enigmail-Version: 1.4.4 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Em 03-09-2012 17:14, Alfredo Jesús Delaiti escreveu: > Hi > > This patch add audio support for input YPbPr, AV and S-Video for Mygica X8507 card. > I tried it with the 3.4 and 3.5 kernel > > Remains to be done: IR, FM and ISDBT > > Sorry if I sent the patch improperly. > > Signed-off-by: Alfredo J. Delaiti > > > > diff --git a/media/video/cx23885/cx23885-cards.c b/media/video/cx23885/cx23885-cards.c > index 080e111..17e2576 100644 > --- a/media/video/cx23885/cx23885-cards.c > +++ b/media/video/cx23885/cx23885-cards.c Wrong format... the "drivers/" is missing. Well, the location also changed to drivers/media/pci, but my scripts can fix it. > @@ -541,11 +541,13 @@ struct cx23885_board cx23885_boards[] = { > { > .type = CX23885_VMUX_COMPOSITE1, > .vmux = CX25840_COMPOSITE8, > + .amux = CX25840_AUDIO7, Didn't apply well. It seems it conflicted with some other patch. Please, re-generate it against the very latest tree. Also, when doing diffs for the boards entries, it is wise to have more context lines, in order that a patch made for one driver would be badly applied at some other board entry. The easiest way to do that is to do: $ git diff -U10 or $ git show -U10 (if you've merged the patch at your local copy) (if you're generating the patch against the main media-tree.git) Where "10" is just an arbitrary large number that will allow to see the board name that will be modified, like: Thanks, Mauro --- 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 --- a/drivers/media/pci/cx23885/cx23885-cards.c +++ b/drivers/media/pci/cx23885/cx23885-cards.c @@ -531,20 +531,21 @@ struct cx23885_board cx23885_boards[] = { .name = "Mygica X8507", .tuner_type = TUNER_XC5000, .tuner_addr = 0x61, .tuner_bus = 1, .porta = CX23885_ANALOG_VIDEO, .input = { { .type = CX23885_VMUX_TELEVISION, .vmux = CX25840_COMPOSITE2, .amux = CX25840_AUDIO8, + /* Some foo addition - just for testing */ }, { .type = CX23885_VMUX_COMPOSITE1, .vmux = CX25840_COMPOSITE8, }, { .type = CX23885_VMUX_SVIDEO, .vmux = CX25840_SVIDEO_LUMA3 | CX25840_SVIDEO_CHROMA4, },