From patchwork Fri May 21 07:17:53 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Hauer X-Patchwork-Id: 101305 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4L7ICTa010266 for ; Fri, 21 May 2010 07:18:13 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753517Ab0EUHSF (ORCPT ); Fri, 21 May 2010 03:18:05 -0400 Received: from metis.ext.pengutronix.de ([92.198.50.35]:38499 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753062Ab0EUHSD (ORCPT ); Fri, 21 May 2010 03:18:03 -0400 Received: from octopus.hi.pengutronix.de ([2001:6f8:1178:2:215:17ff:fe12:23b0]) by metis.ext.pengutronix.de with esmtp (Exim 4.71) (envelope-from ) id 1OFMUU-0005v2-0a; Fri, 21 May 2010 09:17:54 +0200 Received: from sha by octopus.hi.pengutronix.de with local (Exim 4.69) (envelope-from ) id 1OFMUT-0005kL-H6; Fri, 21 May 2010 09:17:53 +0200 Date: Fri, 21 May 2010 09:17:53 +0200 From: Sascha Hauer To: Baruch Siach Cc: linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sascha Hauer Subject: Re: [PATCH 2/3] mx27: add support for the CSI device Message-ID: <20100521071753.GB17272@pengutronix.de> References: <2df2fdd7809e836bac3ff4cd2d77aa976e6ca760.1273150585.git.baruch@tkos.co.il> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <2df2fdd7809e836bac3ff4cd2d77aa976e6ca760.1273150585.git.baruch@tkos.co.il> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-IRC: #ptxdist @freenode X-Accept-Language: de,en X-Accept-Content-Type: text/plain X-Uptime: 09:16:26 up 25 days, 42 min, 24 users, load average: 1.94, 2.94, 2.71 User-Agent: Mutt/1.5.18 (2008-05-17) X-SA-Exim-Connect-IP: 2001:6f8:1178:2:215:17ff:fe12:23b0 X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-media@vger.kernel.org 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 (demeter.kernel.org [140.211.167.41]); Fri, 21 May 2010 07:18:13 +0000 (UTC) diff --git a/arch/arm/mach-mx2/devices.c b/arch/arm/mach-mx2/devices.c index de501ac..6a49c79 100644 --- a/arch/arm/mach-mx2/devices.c +++ b/arch/arm/mach-mx2/devices.c @@ -43,20 +43,20 @@ #ifdef CONFIG_MACH_MX27 static struct resource mx27_camera_resources[] = { { - .start = CSI_BASE_ADDR, - .end = CSI_BASE_ADDR + 0x1f, + .start = MX27_CSI_BASE_ADDR, + .end = MX27_CSI_BASE_ADDR + 0x1f, .flags = IORESOURCE_MEM, }, { - .start = EMMA_PRP_BASE_ADDR, - .end = EMMA_PRP_BASE_ADDR + 0x1f, + .start = MX27_EMMA_PRP_BASE_ADDR, + .end = MX27_EMMA_PRP_BASE_ADDR + 0x1f, .flags = IORESOURCE_MEM, }, { - .start = MXC_INT_CSI, - .end = MXC_INT_CSI, + .start = MX27_INT_CSI, + .end = MX27_INT_CSI, .flags = IORESOURCE_IRQ, },{ - .start = MXC_INT_EMMAPRP, - .end = MXC_INT_EMMAPRP, + .start = MX27_INT_EMMAPRP, + .end = MX27_INT_EMMAPRP, .flags = IORESOURCE_IRQ, }, };