From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755209Ab0C1UMN (ORCPT ); Sun, 28 Mar 2010 16:12:13 -0400 Received: from mail.gmx.net ([213.165.64.20]:40697 "HELO mail.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1755041Ab0C1UML convert rfc822-to-8bit (ORCPT ); Sun, 28 Mar 2010 16:12:11 -0400 X-Authenticated: #20450766 X-Provags-ID: V01U2FsdGVkX18qdYtn1/AqGW5ebQTnhd47vLIa3Zi6rmXpPiQ5JD 4i0K6S+9bDkH7J Date: Sun, 28 Mar 2010 22:12:06 +0200 (CEST) From: Guennadi Liakhovetski To: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= cc: Linux Media Mailing List , Mauro Carvalho Chehab , Antonio Ospite , Sascha Hauer , Hans Verkuil , linux-kernel@vger.kernel.org Subject: Re: [PATCH] V4L/DVB: mx1-camera: compile fix In-Reply-To: <1269726133-12377-1-git-send-email-u.kleine-koenig@pengutronix.de> Message-ID: References: <1269726133-12377-1-git-send-email-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=UTF-8 Content-Transfer-Encoding: 8BIT X-Y-GMX-Trusted: 0 X-FuHaFi: 0.46999999999999997 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, 27 Mar 2010, Uwe Kleine-König wrote: > This fixes a regression of > > 7d58289 (mx1: prefix SOC specific defines with MX1_ and deprecate old names) > > Signed-off-by: Uwe Kleine-König Sascha, I need your ack to pull this via my tree. Thanks Guennadi > --- > arch/arm/plat-mxc/include/mach/dma-mx1-mx2.h | 8 +++++++- > drivers/media/video/mx1_camera.c | 8 +++----- > 2 files changed, 10 insertions(+), 6 deletions(-) > > Hello, > > changed since last post: > > - put offset in the definition of MX1_DMA_REG in parenthesis > - describe register definitions now moved to dma-mx1-mx2.h with the full > register names and order by address. > > Thanks > Uwe > > diff --git a/arch/arm/plat-mxc/include/mach/dma-mx1-mx2.h b/arch/arm/plat-mxc/include/mach/dma-mx1-mx2.h > index 07be8ad..4b63b05 100644 > --- a/arch/arm/plat-mxc/include/mach/dma-mx1-mx2.h > +++ b/arch/arm/plat-mxc/include/mach/dma-mx1-mx2.h > @@ -31,7 +31,13 @@ > #define DMA_MODE_WRITE 1 > #define DMA_MODE_MASK 1 > > -#define DMA_BASE IO_ADDRESS(DMA_BASE_ADDR) > +#define MX1_DMA_REG(offset) MX1_IO_ADDRESS(MX1_DMA_BASE_ADDR + (offset)) > + > +/* DMA Interrupt Mask Register */ > +#define MX1_DMA_DIMR MX1_DMA_REG(0x08) > + > +/* Channel Control Register */ > +#define MX1_DMA_CCR(x) MX1_DMA_REG(0x8c + ((x) << 6)) > > #define IMX_DMA_MEMSIZE_32 (0 << 4) > #define IMX_DMA_MEMSIZE_8 (1 << 4) > diff --git a/drivers/media/video/mx1_camera.c b/drivers/media/video/mx1_camera.c > index c167cc3..aa81acd 100644 > --- a/drivers/media/video/mx1_camera.c > +++ b/drivers/media/video/mx1_camera.c > @@ -48,8 +48,6 @@ > /* > * CSI registers > */ > -#define DMA_CCR(x) (0x8c + ((x) << 6)) /* Control Registers */ > -#define DMA_DIMR 0x08 /* Interrupt mask Register */ > #define CSICR1 0x00 /* CSI Control Register 1 */ > #define CSISR 0x08 /* CSI Status Register */ > #define CSIRXR 0x10 /* CSI RxFIFO Register */ > @@ -783,7 +781,7 @@ static int __init mx1_camera_probe(struct platform_device *pdev) > pcdev); > > imx_dma_config_channel(pcdev->dma_chan, IMX_DMA_TYPE_FIFO, > - IMX_DMA_MEMSIZE_32, DMA_REQ_CSI_R, 0); > + IMX_DMA_MEMSIZE_32, MX1_DMA_REQ_CSI_R, 0); > /* burst length : 16 words = 64 bytes */ > imx_dma_config_burstlen(pcdev->dma_chan, 0); > > @@ -797,8 +795,8 @@ static int __init mx1_camera_probe(struct platform_device *pdev) > set_fiq_handler(&mx1_camera_sof_fiq_start, &mx1_camera_sof_fiq_end - > &mx1_camera_sof_fiq_start); > > - regs.ARM_r8 = DMA_BASE + DMA_DIMR; > - regs.ARM_r9 = DMA_BASE + DMA_CCR(pcdev->dma_chan); > + regs.ARM_r8 = (long)MX1_DMA_DIMR; > + regs.ARM_r9 = (long)MX1_DMA_CCR(pcdev->dma_chan); > regs.ARM_r10 = (long)pcdev->base + CSICR1; > regs.ARM_fp = (long)pcdev->base + CSISR; > regs.ARM_sp = 1 << pcdev->dma_chan; > -- > 1.7.0 > --- Guennadi Liakhovetski, Ph.D. Freelance Open-Source Software Developer http://www.open-technology.de/