From patchwork Thu Nov 5 14:35:29 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 57895 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 nA5EfPdH012906 for ; Thu, 5 Nov 2009 14:41:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757761AbZKEOke (ORCPT ); Thu, 5 Nov 2009 09:40:34 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757664AbZKEOke (ORCPT ); Thu, 5 Nov 2009 09:40:34 -0500 Received: from mail-bw0-f227.google.com ([209.85.218.227]:42342 "EHLO mail-bw0-f227.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757750AbZKEOkc (ORCPT ); Thu, 5 Nov 2009 09:40:32 -0500 Received: by mail-bw0-f227.google.com with SMTP id 27so43541bwz.21 for ; Thu, 05 Nov 2009 06:40:37 -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=TXiZwG1p6yHpU2rqHN+nXfFTvK6VwQKS14PkJL1JQL8=; b=yH7cmtaoFmKQxabFFo+7kfB6i5pms+PGdsNt/VD2W46FeJOK+3drm3T4KdWq47A2v8 Q6Jwz4woJ04g8pZjLCTT+1QaVdCFsBm/+FxI3jbNYgU0DPeRh+uTsmkukT99EOuOZHSl ZI+1Gm6ZOj3TPQGlwCmDv+eiDVFGLvm3pMn64= 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=RFtsWUSLzJUnGj2TITh47ZqbGrh40VKx9YEbnVPIrmlyFHEbCz0lbCygX5Y77qWKtt cCHaMQA+roXoqE/GH2La5gT0Q6lRjNLv/iarlTAqmTji9ldaZN3EEQqG/acwAMdHT6+g bPhFOY1r8KNTdO4Eg30BEPaV3b1Kew3c5zO0s= Received: by 10.204.24.69 with SMTP id u5mr3096091bkb.1.1257432037648; Thu, 05 Nov 2009 06:40:37 -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 14sm677800fxm.7.2009.11.05.06.40.34 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 05 Nov 2009 06:40:36 -0800 (PST) From: Magnus Damm To: linux-sh@vger.kernel.org Cc: Magnus Damm , lethal@linux-sh.org Date: Thu, 05 Nov 2009 23:35:29 +0900 Message-Id: <20091105143529.9902.8190.sendpatchset@rxone.opensource.se> In-Reply-To: <20091105143447.9902.4608.sendpatchset@rxone.opensource.se> References: <20091105143447.9902.4608.sendpatchset@rxone.opensource.se> Subject: [PATCH 04/05] sh: Break out SH7724 serial ports Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org --- 0001/arch/sh/kernel/cpu/sh4a/setup-sh7724.c +++ work/arch/sh/kernel/cpu/sh4a/setup-sh7724.c 2009-11-05 22:43:18.000000000 +0900 @@ -27,53 +27,99 @@ #include /* Serial */ -static struct plat_sci_port sci_platform_data[] = { - { - .mapbase = 0xffe00000, - .flags = UPF_BOOT_AUTOCONF, - .type = PORT_SCIF, - .irqs = { 80, 80, 80, 80 }, - .clk = "scif0", - }, { - .mapbase = 0xffe10000, - .flags = UPF_BOOT_AUTOCONF, - .type = PORT_SCIF, - .irqs = { 81, 81, 81, 81 }, - .clk = "scif1", - }, { - .mapbase = 0xffe20000, - .flags = UPF_BOOT_AUTOCONF, - .type = PORT_SCIF, - .irqs = { 82, 82, 82, 82 }, - .clk = "scif2", - }, { - .mapbase = 0xa4e30000, - .flags = UPF_BOOT_AUTOCONF, - .type = PORT_SCIFA, - .irqs = { 56, 56, 56, 56 }, - .clk = "scif3", - }, { - .mapbase = 0xa4e40000, - .flags = UPF_BOOT_AUTOCONF, - .type = PORT_SCIFA, - .irqs = { 88, 88, 88, 88 }, - .clk = "scif4", - }, { - .mapbase = 0xa4e50000, - .flags = UPF_BOOT_AUTOCONF, - .type = PORT_SCIFA, - .irqs = { 109, 109, 109, 109 }, - .clk = "scif5", - }, { - .flags = 0, - } +static struct plat_sci_port scif0_platform_data = { + .mapbase = 0xffe00000, + .flags = UPF_BOOT_AUTOCONF, + .type = PORT_SCIF, + .irqs = { 80, 80, 80, 80 }, + .clk = "scif0", }; -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 = 0xffe10000, + .flags = UPF_BOOT_AUTOCONF, + .type = PORT_SCIF, + .irqs = { 81, 81, 81, 81 }, + .clk = "scif1", +}; + +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 = 0xffe20000, + .flags = UPF_BOOT_AUTOCONF, + .type = PORT_SCIF, + .irqs = { 82, 82, 82, 82 }, + .clk = "scif2", +}; + +static struct platform_device scif2_device = { + .name = "sh-sci", + .id = 2, + .dev = { + .platform_data = &scif2_platform_data, + }, +}; + +static struct plat_sci_port scif3_platform_data = { + .mapbase = 0xa4e30000, + .flags = UPF_BOOT_AUTOCONF, + .type = PORT_SCIFA, + .irqs = { 56, 56, 56, 56 }, + .clk = "scif3", +}; + +static struct platform_device scif3_device = { + .name = "sh-sci", + .id = 3, + .dev = { + .platform_data = &scif3_platform_data, + }, +}; + +static struct plat_sci_port scif4_platform_data = { + .mapbase = 0xa4e40000, + .flags = UPF_BOOT_AUTOCONF, + .type = PORT_SCIFA, + .irqs = { 88, 88, 88, 88 }, + .clk = "scif4", +}; + +static struct platform_device scif4_device = { + .name = "sh-sci", + .id = 4, + .dev = { + .platform_data = &scif4_platform_data, + }, +}; + +static struct plat_sci_port scif5_platform_data = { + .mapbase = 0xa4e50000, + .flags = UPF_BOOT_AUTOCONF, + .type = PORT_SCIFA, + .irqs = { 109, 109, 109, 109 }, + .clk = "scif5", +}; + +static struct platform_device scif5_device = { + .name = "sh-sci", + .id = 5, .dev = { - .platform_data = sci_platform_data, + .platform_data = &scif5_platform_data, }, }; @@ -597,7 +643,12 @@ static struct platform_device *sh7724_de &tmu3_device, &tmu4_device, &tmu5_device, - &sci_device, + &scif0_device, + &scif1_device, + &scif2_device, + &scif3_device, + &scif4_device, + &scif5_device, &rtc_device, &iic0_device, &iic1_device, @@ -631,6 +682,12 @@ static struct platform_device *sh7724_ea &tmu3_device, &tmu4_device, &tmu5_device, + &scif0_device, + &scif1_device, + &scif2_device, + &scif3_device, + &scif4_device, + &scif5_device, }; void __init plat_early_device_setup(void)