From patchwork Mon Dec 14 12:29:48 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Magnus Damm <magnus.damm@gmail.com>
X-Patchwork-Id: 67273
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nBECZSGJ017414
	for <patchwork-sh@patchwork.kernel.org>; Mon, 14 Dec 2009 12:35:35 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751328AbZLNMff (ORCPT
	<rfc822;patchwork-sh@patchwork.kernel.org>);
	Mon, 14 Dec 2009 07:35:35 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751485AbZLNMff
	(ORCPT <rfc822; linux-sh-outgoing>);
	Mon, 14 Dec 2009 07:35:35 -0500
Received: from mail-gx0-f211.google.com ([209.85.217.211]:40268 "EHLO
	mail-gx0-f211.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751328AbZLNMfe (ORCPT
	<rfc822;linux-sh@vger.kernel.org>); Mon, 14 Dec 2009 07:35:34 -0500
X-Greylist: delayed 7498 seconds by postgrey-1.27 at vger.kernel.org;
	Mon, 14 Dec 2009 07:35:26 EST
Received: by mail-gx0-f211.google.com with SMTP id 3so4369767gxk.1
	for <linux-sh@vger.kernel.org>; Mon, 14 Dec 2009 04:35:34 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=domainkey-signature:received:received:from:to:cc:date:message-id
	:in-reply-to:references:subject;
	bh=boDag0mBYfVau6movE52kAR0p51s+wIr39NqLdWewBo=;
	b=ZStcFdxSTJ+9lL26/UzyhPnVTvqoZXuFdWkNPRbiSTXI+W2bEKw/ZIaH83J9MNIGvF
	732rxa6Iis1WgHWnSgWlmGErEqNPs597nThpkPcIhRfAzsPXShW5WIMIgJGEPsXeLqLH
	flgbHhMf2P0jzRJYhkV9UmHCWuWiOWx0s2Zxk=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
	h=from:to:cc:date:message-id:in-reply-to:references:subject;
	b=ve5aRnFlyJxh9Nj9lNWibmdt9u4mhYoPyK8lpfYXDGW3/Y/NkzIIQd2mI2wVDavcLe
	vInKJcX3fHC1bj/y1Qvx8s/tmusBNKtFLsq9m2eg/6Vc5HOr3Fa3JHCf1d1GnembfaI6
	NiIlBb1OYNxyYkAeOQ1AsVmAMpNns5zTimy/s=
Received: by 10.91.14.10 with SMTP id r10mr4747008agi.5.1260794133967;
	Mon, 14 Dec 2009 04:35:33 -0800 (PST)
Received: from rxone.opensource.se (49.14.32.202.bf.2iij.net [202.32.14.49])
	by mx.google.com with ESMTPS id
	16sm2062107gxk.3.2009.12.14.04.35.32
	(version=TLSv1/SSLv3 cipher=RC4-MD5);
	Mon, 14 Dec 2009 04:35:33 -0800 (PST)
From: Magnus Damm <magnus.damm@gmail.com>
To: linux-sh@vger.kernel.org
Cc: Magnus Damm <magnus.damm@gmail.com>, lethal@linux-sh.org
Date: Mon, 14 Dec 2009 21:29:48 +0900
Message-Id: <20091214122948.10707.58674.sendpatchset@rxone.opensource.se>
In-Reply-To: <20091214122940.10707.63683.sendpatchset@rxone.opensource.se>
References: <20091214122940.10707.63683.sendpatchset@rxone.opensource.se>
Subject: [PATCH 01/07] sh: sh2 scif pdata (sh7616)
Sender: linux-sh-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-sh.vger.kernel.org>
X-Mailing-List: linux-sh@vger.kernel.org


--- 0001/arch/sh/kernel/cpu/sh2/setup-sh7619.c
+++ work/arch/sh/kernel/cpu/sh2/setup-sh7619.c	2009-12-14 19:43:25.000000000 +0900
@@ -59,32 +59,48 @@ static struct intc_prio_reg prio_registe
 static DECLARE_INTC_DESC(intc_desc, "sh7619", vectors, NULL,
 			 NULL, prio_registers, NULL);
 
-static struct plat_sci_port sci_platform_data[] = {
-	{
-		.mapbase	= 0xf8400000,
-		.flags		= UPF_BOOT_AUTOCONF,
-		.type		= PORT_SCIF,
-		.irqs		= { 88, 88, 88, 88 },
-	}, {
-		.mapbase	= 0xf8410000,
-		.flags		= UPF_BOOT_AUTOCONF,
-		.type		= PORT_SCIF,
-		.irqs		= { 92, 92, 92, 92 },
-	}, {
-		.mapbase	= 0xf8420000,
-		.flags		= UPF_BOOT_AUTOCONF,
-		.type		= PORT_SCIF,
-		.irqs		= { 96, 96, 96, 96 },
-	}, {
-		.flags = 0,
-	}
+static struct plat_sci_port scif0_platform_data = {
+	.mapbase	= 0xf8400000,
+	.flags		= UPF_BOOT_AUTOCONF,
+	.type		= PORT_SCIF,
+	.irqs		= { 88, 88, 88, 88 },
 };
 
-static struct platform_device sci_device = {
+static struct platform_device scif0_device = {
 	.name		= "sh-sci",
-	.id		= -1,
+	.id		= 0,
+	.dev		= {
+		.platform_data	= &scif0_platform_data,
+	},
+};
+
+static struct plat_sci_port scif1_platform_data = {
+	.mapbase	= 0xf8410000,
+	.flags		= UPF_BOOT_AUTOCONF,
+	.type		= PORT_SCIF,
+	.irqs		= { 92, 92, 92, 92 },
+};
+
+static struct platform_device scif1_device = {
+	.name		= "sh-sci",
+	.id		= 1,
+	.dev		= {
+		.platform_data	= &scif1_platform_data,
+	},
+};
+
+static struct plat_sci_port scif2_platform_data = {
+	.mapbase	= 0xf8420000,
+	.flags		= UPF_BOOT_AUTOCONF,
+	.type		= PORT_SCIF,
+	.irqs		= { 96, 96, 96, 96 },
+};
+
+static struct platform_device scif2_device = {
+	.name		= "sh-sci",
+	.id		= 2,
 	.dev		= {
-		.platform_data	= sci_platform_data,
+		.platform_data	= &scif2_platform_data,
 	},
 };
 
@@ -176,7 +192,9 @@ static struct platform_device cmt1_devic
 };
 
 static struct platform_device *sh7619_devices[] __initdata = {
-	&sci_device,
+	&scif0_device,
+	&scif1_device,
+	&scif2_device,
 	&eth_device,
 	&cmt0_device,
 	&cmt1_device,
@@ -195,6 +213,9 @@ void __init plat_irq_setup(void)
 }
 
 static struct platform_device *sh7619_early_devices[] __initdata = {
+	&scif0_device,
+	&scif1_device,
+	&scif2_device,
 	&cmt0_device,
 	&cmt1_device,
 };