Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1764076AbZLQHml (ORCPT ); Thu, 17 Dec 2009 02:42:41 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1764064AbZLQHmh (ORCPT ); Thu, 17 Dec 2009 02:42:37 -0500 Received: from mail.gmx.net ([213.165.64.20]:33787 "HELO mail.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1764056AbZLQHmf convert rfc822-to-8bit (ORCPT ); Thu, 17 Dec 2009 02:42:35 -0500 X-Authenticated: #20450766 X-Provags-ID: V01U2FsdGVkX1+QHhsJnEiQ3gsyn6TbUlUVvo3th/EyHWa4WyzdHN +3QCpiqTdRvg4/ Date: Thu, 17 Dec 2009 08:42:39 +0100 (CET) From: Guennadi Liakhovetski To: Nobuhiro Iwamatsu cc: Paul Mundt , Dan Williams , linux-kernel@vger.kernel.org, linux-sh@vger.kernel.org Subject: Re: [PATCH 5/5] sh: dmaengine support for sh7724 In-Reply-To: <29ab51dc0912161914w6967c9d1l79df27d670f01b6a@mail.gmail.com> Message-ID: References: <20091208071302.GA23814@linux-sh.org> <29ab51dc0912161914w6967c9d1l79df27d670f01b6a@mail.gmail.com> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=ISO-8859-1 Content-Transfer-Encoding: 8BIT X-Y-GMX-Trusted: 0 X-FuHaFi: 0.45 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4292 Lines: 131 Hi again On Thu, 17 Dec 2009, Nobuhiro Iwamatsu wrote: > Hi, > > 2009/12/8 Paul Mundt : > > On Mon, Dec 07, 2009 at 06:02:24PM -0700, Dan Williams wrote: > >> On Fri, Dec 4, 2009 at 11:45 AM, Guennadi Liakhovetski > >> wrote: > >> > Add a dmaengine platform device to sh7724, fix DMA channel interrupt numbers. > >> > > >> > Signed-off-by: Guennadi Liakhovetski > >> > --- > >> > > >> > With this patch dmatest works with channels 0-5, channels 6-11 still don't > >> > work for some reason... So, feel free to discard it for now, if a complete > >> > fix would be preferred. > >> > >> Does this patch limit operation to channels 0-5? ?I leave this one for > >> Paul to disposition. > >> > > There are 6 channels per controller, so the fact that the second > > controller isn't working could either be cause the driver needs more work > > to handle multiple controllers properly, or there could be a pinmux issue > > that hasn't been resolved yet for DMAC1. Both of these cases require the > > driver to be a bit smarter, but as Guennadi is presently working on these > > things, doing them incrementally is ok with me. If this gets DMAC0 > > working at least where it wasn't before, it's certainly worth applying. > > DMAC1 seems to have more problems than just wrong interrupt numbers, so > > this isn't going to cause any regressions there either. > > > > Acked-by: Paul Mundt > > This patch can not apply Paul's git/HEAD too. > I updated patch. > > Acked-by: Nobuhiro Iwamatsu Same comment applies as to the other my patch. Paul, I think, you indicated, that you've already merged my patch, or at least, that you have no problem merging it. Please, do use my original version and not this one. Thanks Guennadi > > Best regards, > Nobuhiro > > ----- > > Add a dmaengine platform device to sh7724, fix DMA channel interrupt numbers. > > Signed-off-by: Guennadi Liakhovetski > Signed-off-by: Nobuhiro Iwamatsu > --- > arch/sh/include/cpu-sh4/cpu/dma-sh4a.h | 8 ++++---- > arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 15 +++++++++++++++ > 2 files changed, 19 insertions(+), 4 deletions(-) > > diff --git a/arch/sh/include/cpu-sh4/cpu/dma-sh4a.h > b/arch/sh/include/cpu-sh4/cpu/dma-sh4a.h > index f0886bc..c4ed660 100644 > --- a/arch/sh/include/cpu-sh4/cpu/dma-sh4a.h > +++ b/arch/sh/include/cpu-sh4/cpu/dma-sh4a.h > @@ -19,10 +19,10 @@ > #elif defined(CONFIG_CPU_SUBTYPE_SH7723) || \ > defined(CONFIG_CPU_SUBTYPE_SH7724) > #define DMTE0_IRQ 48 /* DMAC0A*/ > -#define DMTE4_IRQ 40 /* DMAC0B */ > -#define DMTE6_IRQ 42 > -#define DMTE8_IRQ 76 /* DMAC1A */ > -#define DMTE9_IRQ 77 > +#define DMTE4_IRQ 76 /* DMAC0B */ > +#define DMTE6_IRQ 40 > +#define DMTE8_IRQ 42 /* DMAC1A */ > +#define DMTE9_IRQ 43 > #define DMTE10_IRQ 72 /* DMAC1B */ > #define DMTE11_IRQ 73 > #define DMAE0_IRQ 78 /* DMA Error IRQ*/ > diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7724.c > b/arch/sh/kernel/cpu/sh4a/setup-sh7724.c > index a52f351..d32f96c 100644 > --- a/arch/sh/kernel/cpu/sh4a/setup-sh7724.c > +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7724.c > @@ -23,9 +23,23 @@ > #include > #include > #include > +#include > #include > #include > > +/* DMA */ > +static struct sh_dmae_pdata dma_platform_data = { > + .mode = SHDMA_DMAOR1, > +}; > + > +static struct platform_device dma_device = { > + .name = "sh-dma-engine", > + .id = -1, > + .dev = { > + .platform_data = &dma_platform_data, > + }, > +}; > + > /* Serial */ > static struct plat_sci_port scif0_platform_data = { > .mapbase = 0xffe00000, > @@ -649,6 +663,7 @@ static struct platform_device *sh7724_devices[] > __initdata = { > &tmu3_device, > &tmu4_device, > &tmu5_device, > + &dma_device, > &rtc_device, > &iic0_device, > &iic1_device, > -- > 1.6.5.4 > --- Guennadi Liakhovetski -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/