From patchwork Wed Jan 21 15:14:46 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 3466 X-Patchwork-Delegate: lethal@linux-sh.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n0LFCGP2023131 for ; Wed, 21 Jan 2009 07:12:17 -0800 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755085AbZAUPQo (ORCPT ); Wed, 21 Jan 2009 10:16:44 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756123AbZAUPQo (ORCPT ); Wed, 21 Jan 2009 10:16:44 -0500 Received: from rv-out-0506.google.com ([209.85.198.232]:37964 "EHLO rv-out-0506.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755085AbZAUPQn (ORCPT ); Wed, 21 Jan 2009 10:16:43 -0500 Received: by rv-out-0506.google.com with SMTP id k40so3654714rvb.1 for ; Wed, 21 Jan 2009 07:16:43 -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=/kUb7Kh2qq908Wo2DjYJ9wNbM41ArMOwhvIdsUY2+HY=; b=UeKesNV+tYCBR9MdOklPrHnzFO0trT1zeo0O9wtPD7GQRS11Q7jEThyd6wcxooUsJc zVUZQ91sv/T8gg2J6XiYqUWslyIJvTNhmNNmnIYnWES21efV9aUw2i/3uTv9XWb10qxK 00gX2YTAMgj+2TtvgBFx8KUy3cbIl+SiPHkII= 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=rlRvyo+YE7ihv5f/+8TpRfgXnY66uefegWm/9a9un/ilvZ4kSV2c7gQa47uJ0Nq7Xa hW2G295YVuAW+pK5PQ9oZ+EtSTgWWPDPwYATa5XSX/p+D6evTrfwMnWnoJkiuCj2HpK2 879YLv6MN0PyTyKgOQB/311RmzZTZqYvTu9Xw= Received: by 10.140.199.15 with SMTP id w15mr542229rvf.253.1232551003007; Wed, 21 Jan 2009 07:16:43 -0800 (PST) Received: from rx1.opensource.se (114.8.221.202.ts.2iij.net [202.221.8.114]) by mx.google.com with ESMTPS id k2sm15651565rvb.6.2009.01.21.07.16.41 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 21 Jan 2009 07:16:41 -0800 (PST) From: Magnus Damm To: linux-sh@vger.kernel.org Cc: Magnus Damm , lethal@linux-sh.org Date: Thu, 22 Jan 2009 00:14:46 +0900 Message-Id: <20090121151446.29269.48937.sendpatchset@rx1.opensource.se> In-Reply-To: <20090121151334.29269.55519.sendpatchset@rx1.opensource.se> References: <20090121151334.29269.55519.sendpatchset@rx1.opensource.se> Subject: [PATCH 009/013] sh-sci: convert sh2 cpu to single port devices Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org From: Magnus Damm Rework sh-sci platform data for sh2 processors such as: sh7619 Signed-off-by: Magnus Damm --- arch/sh/kernel/cpu/sh2/setup-sh7619.c | 64 +++++++++++++++++++++------------ 1 file changed, 41 insertions(+), 23 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- 0001/arch/sh/kernel/cpu/sh2/setup-sh7619.c +++ work/arch/sh/kernel/cpu/sh2/setup-sh7619.c 2009-01-21 22:51:11.000000000 +0900 @@ -67,32 +67,48 @@ static struct intc_prio_reg prio_registe static DECLARE_INTC_DESC(intc_desc, "sh7619", vectors, groups, NULL, prio_registers, NULL); -static struct plat_sci_port sci_platform_data[] = { - { - .mapbase = 0xf8400000, - .flags = UPF_BOOT_AUTOCONF, - .type = PORT_SCIF, - .irqs = { 88, 89, 91, 90}, - }, { - .mapbase = 0xf8410000, - .flags = UPF_BOOT_AUTOCONF, - .type = PORT_SCIF, - .irqs = { 92, 93, 95, 94}, - }, { - .mapbase = 0xf8420000, - .flags = UPF_BOOT_AUTOCONF, - .type = PORT_SCIF, - .irqs = { 96, 97, 99, 98}, - }, { - .flags = 0, - } +static struct plat_sci_port scif0_platform_data = { + .mapbase = 0xf8400000, + .flags = UPF_BOOT_AUTOCONF, + .type = PORT_SCIF, + .irqs = { 88, 89, 91, 90 }, }; -static struct platform_device sci_device = { +static struct platform_device scif0_device = { .name = "sh-sci", - .id = -1, + .id = 0, .dev = { - .platform_data = sci_platform_data, + .platform_data = &scif0_platform_data, + }, +}; + +static struct plat_sci_port scif1_platform_data = { + .mapbase = 0xf8410000, + .flags = UPF_BOOT_AUTOCONF, + .type = PORT_SCIF, + .irqs = { 92, 93, 95, 94 }, +}; + +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, 97, 99, 98 }, +}; + +static struct platform_device scif2_device = { + .name = "sh-sci", + .id = 2, + .dev = { + .platform_data = &scif2_platform_data, }, }; @@ -120,7 +136,9 @@ static struct platform_device eth_device }; static struct platform_device *sh7619_devices[] __initdata = { - &sci_device, + &scif0_device, + &scif1_device, + &scif2_device, ð_device, };