From patchwork Tue May 8 18:40:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Stuebner X-Patchwork-Id: 8477 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id EB13423E42 for ; Tue, 8 May 2012 18:40:37 +0000 (UTC) Received: from mail-yx0-f180.google.com (mail-yx0-f180.google.com [209.85.213.180]) by fiordland.canonical.com (Postfix) with ESMTP id B2A99A183AC for ; Tue, 8 May 2012 18:40:37 +0000 (UTC) Received: by mail-yx0-f180.google.com with SMTP id q6so858771yen.11 for ; Tue, 08 May 2012 11:40:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to :subject:date:user-agent:cc:references:in-reply-to:mime-version :content-type:content-transfer-encoding:message-id :x-gm-message-state; bh=3N6M+LJYNAiIYiVisWQxquT6gTb4qlXuacTiVLtToAA=; b=ZUON1drIyr/h6+f7UL0kxWWzwpKr0mCzNvsilnhtTia2hOEMa1x+Hytjg/0/qSGUol egC8PRMQXQoFp6BLuB8VA3eQ9grr31XH3PS9HPnQOfDRNXz4vmDA8nLWyf2n8x+7JrOU Z94YRqKDsuJwS0zSxP7sOfKVXy6j3F7HVpcw1E6fMYprhAz6CKabhA6/1UNtWID+Lhuq S5QHDXye5bPK+ICHGNB4OKxko5SepVsx1nx6Q1YMY0jEm1WouRwp3YC0dKH634dlXrUn pPJAzzRj/Qk5zHl/MhypLMm9CuPr9UagZgKhhOh4Tjl4Ke/iIfSCfiEzZCx6YUB6YJK0 O9CQ== Received: by 10.50.47.131 with SMTP id d3mr11458159ign.33.1336502437173; Tue, 08 May 2012 11:40:37 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.73.147 with SMTP id q19csp219896ibj; Tue, 8 May 2012 11:40:34 -0700 (PDT) Received: by 10.180.97.4 with SMTP id dw4mr46865963wib.18.1336502432579; Tue, 08 May 2012 11:40:32 -0700 (PDT) Received: from gloria.sntech.de (gloria.sntech.de. [95.129.55.99]) by mx.google.com with ESMTPS id n11si133027wee.32.2012.05.08.11.40.31 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 08 May 2012 11:40:32 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of heiko@sntech.de designates 95.129.55.99 as permitted sender) client-ip=95.129.55.99; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of heiko@sntech.de designates 95.129.55.99 as permitted sender) smtp.mail=heiko@sntech.de Received: from 146-52-48-101-dynip.superkabel.de ([146.52.48.101] helo=marty.localnet) by gloria.sntech.de with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1SRpKf-0007Ti-SG; Tue, 08 May 2012 20:40:21 +0200 From: Heiko =?iso-8859-15?q?St=FCbner?= To: Tushar Behera Subject: [PATCH v2 06/33] ARM: S3C24XX: dev-uart: Use common macro to define resources Date: Tue, 8 May 2012 20:40:20 +0200 User-Agent: KMail/1.13.5 (Linux/2.6.37-2-686; KDE/4.4.5; i686; ; ) Cc: linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kgene.kim@samsung.com, linux@arm.linux.org.uk, patches@linaro.org, Ben Dooks References: <1335327163-11794-1-git-send-email-tushar.behera@linaro.org> <1335327163-11794-7-git-send-email-tushar.behera@linaro.org> In-Reply-To: <1335327163-11794-7-git-send-email-tushar.behera@linaro.org> MIME-Version: 1.0 Message-Id: <201205082040.20900.heiko@sntech.de> X-Gm-Message-State: ALoCoQlUV1xoodIK8K340/DAXe9s20CEtjsBJFP7ql0BLfKRNC3YIM8XjqjOUj1Fg23M7mQyHO5L From: Tushar Behera CC: Ben Dooks CC: Kukjin Kim Signed-off-by: Tushar Behera Signed-off-by: Heiko Stuebner --- changes since v1: update the patch to apply against the moved dev-uart devices As this patch does not touch anything else apart from the uart devices it could also be applied on top of the movement patches directly arch/arm/mach-s3c24xx/common.c | 56 +++++++++++---------------------------- 1 files changed, 16 insertions(+), 40 deletions(-) diff --git a/arch/arm/mach-s3c24xx/common.c b/arch/arm/mach-s3c24xx/common.c index d42423a..56cdd34 100644 --- a/arch/arm/mach-s3c24xx/common.c +++ b/arch/arm/mach-s3c24xx/common.c @@ -241,55 +241,31 @@ void __init s3c24xx_init_io(struct map_desc *mach_desc, int size) /* Serial port registrations */ static struct resource s3c2410_uart0_resource[] = { - [0] = { - .start = S3C2410_PA_UART0, - .end = S3C2410_PA_UART0 + 0x3fff, - .flags = IORESOURCE_MEM, - }, - [1] = { - .start = IRQ_S3CUART_RX0, - .end = IRQ_S3CUART_ERR0, - .flags = IORESOURCE_IRQ, - } + [0] = DEFINE_RES_MEM(S3C2410_PA_UART0, SZ_16K), + [1] = DEFINE_RES_NAMED(IRQ_S3CUART_RX0, \ + IRQ_S3CUART_ERR0 - IRQ_S3CUART_RX0 + 1, \ + NULL, IORESOURCE_IRQ) }; static struct resource s3c2410_uart1_resource[] = { - [0] = { - .start = S3C2410_PA_UART1, - .end = S3C2410_PA_UART1 + 0x3fff, - .flags = IORESOURCE_MEM, - }, - [1] = { - .start = IRQ_S3CUART_RX1, - .end = IRQ_S3CUART_ERR1, - .flags = IORESOURCE_IRQ, - } + [0] = DEFINE_RES_MEM(S3C2410_PA_UART1, SZ_16K), + [1] = DEFINE_RES_NAMED(IRQ_S3CUART_RX1, \ + IRQ_S3CUART_ERR1 - IRQ_S3CUART_RX1 + 1, \ + NULL, IORESOURCE_IRQ) }; static struct resource s3c2410_uart2_resource[] = { - [0] = { - .start = S3C2410_PA_UART2, - .end = S3C2410_PA_UART2 + 0x3fff, - .flags = IORESOURCE_MEM, - }, - [1] = { - .start = IRQ_S3CUART_RX2, - .end = IRQ_S3CUART_ERR2, - .flags = IORESOURCE_IRQ, - } + [0] = DEFINE_RES_MEM(S3C2410_PA_UART2, SZ_16K), + [1] = DEFINE_RES_NAMED(IRQ_S3CUART_RX2, \ + IRQ_S3CUART_ERR2 - IRQ_S3CUART_RX2 + 1, \ + NULL, IORESOURCE_IRQ) }; static struct resource s3c2410_uart3_resource[] = { - [0] = { - .start = S3C2443_PA_UART3, - .end = S3C2443_PA_UART3 + 0x3fff, - .flags = IORESOURCE_MEM, - }, - [1] = { - .start = IRQ_S3CUART_RX3, - .end = IRQ_S3CUART_ERR3, - .flags = IORESOURCE_IRQ, - }, + [0] = DEFINE_RES_MEM(S3C2443_PA_UART3, SZ_16K), + [1] = DEFINE_RES_NAMED(IRQ_S3CUART_RX3, \ + IRQ_S3CUART_ERR3 - IRQ_S3CUART_RX3 + 1, \ + NULL, IORESOURCE_IRQ) }; struct s3c24xx_uart_resources s3c2410_uart_resources[] __initdata = {