From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756980Ab0CDRNc (ORCPT ); Thu, 4 Mar 2010 12:13:32 -0500 Received: from mail.gmx.net ([213.165.64.20]:56302 "HELO mail.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1756930Ab0CDRNa convert rfc822-to-8bit (ORCPT ); Thu, 4 Mar 2010 12:13:30 -0500 X-Authenticated: #20450766 X-Provags-ID: V01U2FsdGVkX18izHsWDWgiIIDsHzYmWVUU1nSw8DNIQVG/fXt3dP YR6hqpu6rbTNyJ Date: Thu, 4 Mar 2010 18:13:38 +0100 (CET) From: Guennadi Liakhovetski To: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= cc: Linux Media Mailing List , linux-arm-kernel@lists.infradead.org, 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: <1267721687-19697-1-git-send-email-u.kleine-koenig@pengutronix.de> Message-ID: References: <1267721687-19697-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.46000000000000002 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Uwe On Thu, 4 Mar 2010, Uwe Kleine-König wrote: > This is a regression of > > 7d58289 (mx1: prefix SOC specific defines with MX1_ and deprecate old names) > > Signed-off-by: Uwe Kleine-König > --- > Hello, > > this went unnoticed up to now as mx1_defconfig doesn't include support > for mx1-camera. > I have a patch pending to change that though. > > Best regards > Uwe > > drivers/media/video/mx1_camera.c | 5 ++++- > 1 files changed, 4 insertions(+), 1 deletions(-) > > diff --git a/drivers/media/video/mx1_camera.c b/drivers/media/video/mx1_camera.c > index 2ba14fb..38e5315 100644 > --- a/drivers/media/video/mx1_camera.c > +++ b/drivers/media/video/mx1_camera.c > @@ -45,6 +45,9 @@ > #include > #include > > +#undef DMA_BASE > +#define DMA_BASE MX1_IO_ADDRESS(MX1_DMA_BASE_ADDR) I don't like this. Why the "undef"? Is DMA_BASE already defined? where and what is it? If it is - we better use a different name, if not - just remove the undef, please. > + > /* > * CSI registers > */ > @@ -783,7 +786,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); > > -- > 1.7.0 > Thanks Guennadi --- Guennadi Liakhovetski, Ph.D. Freelance Open-Source Software Developer http://www.open-technology.de/