From patchwork Mon Dec 14 12:30:41 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 67279 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 nBECaLlB017570 for ; Mon, 14 Dec 2009 12:36:28 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753265AbZLNMg2 (ORCPT ); Mon, 14 Dec 2009 07:36:28 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753398AbZLNMg2 (ORCPT ); Mon, 14 Dec 2009 07:36:28 -0500 Received: from mail-yx0-f187.google.com ([209.85.210.187]:34036 "EHLO mail-yx0-f187.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753265AbZLNMg1 (ORCPT ); Mon, 14 Dec 2009 07:36:27 -0500 Received: by mail-yx0-f187.google.com with SMTP id 17so2543324yxe.33 for ; Mon, 14 Dec 2009 04:36:27 -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=4ID1EQi8wl9RH/dD8i+AAV7YDOCGyuiBwIJJ0IAIr7o=; b=DZwRU3x4XYVbtCd00awg1MEASu+Jy0t7PBKnbgOBPYAVbmStSHEapOvqiLpQ5H4zHi lN+1nsw6pY08mG156cP7Fy8ZZBuET04uKY8V1UesmsKx73NFIdiRsFs9tjqmq+wU8+Xu Ra48w6iNWoISFJgxITMrF9W4Bgg8nrWT+Ttjc= 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=oaGTOtTfGo0ofwlbb2PofEV1gM1sbI32v0WYTqD1i45ouHU24A6hlYa/ISsfd1C8hv 9EELXyNTpKSdGWUt20b0K6DBocGpK1C2lhKFqQk2nTrBdOuv04LcDdgixjPNfZNokfPu cVQM7gcqOjvVBjtNIbTZHR3CWD6UfjNYeuFuM= Received: by 10.91.105.17 with SMTP id h17mr703786agm.62.1260794186429; Mon, 14 Dec 2009 04:36:26 -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 13sm2067299gxk.1.2009.12.14.04.36.24 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 14 Dec 2009 04:36:25 -0800 (PST) From: Magnus Damm To: linux-sh@vger.kernel.org Cc: Magnus Damm , lethal@linux-sh.org Date: Mon, 14 Dec 2009 21:30:41 +0900 Message-Id: <20091214123041.10707.94848.sendpatchset@rxone.opensource.se> In-Reply-To: <20091214122940.10707.63683.sendpatchset@rxone.opensource.se> References: <20091214122940.10707.63683.sendpatchset@rxone.opensource.se> Subject: [PATCH 07/07] sh: sh5 scif pdata (sh5-101/sh5-103) Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org --- 0001/arch/sh/kernel/cpu/sh5/setup-sh5.c +++ work/arch/sh/kernel/cpu/sh5/setup-sh5.c 2009-12-14 20:54:00.000000000 +0900 @@ -16,22 +16,18 @@ #include #include -static struct plat_sci_port sci_platform_data[] = { - { - .mapbase = PHYS_PERIPHERAL_BLOCK + 0x01030000, - .flags = UPF_BOOT_AUTOCONF | UPF_IOREMAP, - .type = PORT_SCIF, - .irqs = { 39, 40, 42, 0 }, - }, { - .flags = 0, - } +static struct plat_sci_port scif0_platform_data = { + .mapbase = PHYS_PERIPHERAL_BLOCK + 0x01030000, + .flags = UPF_BOOT_AUTOCONF | UPF_IOREMAP, + .type = PORT_SCIF, + .irqs = { 39, 40, 42, 0 }, }; -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, }, }; @@ -164,13 +160,13 @@ static struct platform_device tmu2_devic }; static struct platform_device *sh5_early_devices[] __initdata = { + &scif0_device, &tmu0_device, &tmu1_device, &tmu2_device, }; static struct platform_device *sh5_devices[] __initdata = { - &sci_device, &rtc_device, };