From patchwork Tue Oct 27 10:49:55 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 56074 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 n9RAsxO0031670 for ; Tue, 27 Oct 2009 10:54:59 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752537AbZJ0Kyr (ORCPT ); Tue, 27 Oct 2009 06:54:47 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752810AbZJ0Kyr (ORCPT ); Tue, 27 Oct 2009 06:54:47 -0400 Received: from mail-px0-f179.google.com ([209.85.216.179]:51821 "EHLO mail-px0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752537AbZJ0Kyq (ORCPT ); Tue, 27 Oct 2009 06:54:46 -0400 Received: by pxi9 with SMTP id 9so10517pxi.4 for ; Tue, 27 Oct 2009 03:54:51 -0700 (PDT) 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 :subject; bh=wk2evQBPz0Ib0wziwkY3WmbX6dQjjRdhD9KPTu7IvW8=; b=iDe8avMhDfuUxwUFOX75uagS6OnL/2ou0CuW4psVVovJ5aqisfVRjbNRJOq5SvqQXE 4zhC4pldwYs2+iTWHtaNzp2espu5IEQI7BVEZZw6et6EK2sahVA+gYw4zeV295jsvBlA AY1DljpqnNLKSEzrecR4vACzv6agJwnAzvN/I= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:date:message-id:subject; b=h0qjVueCrFDgOB/w7YwIJQzAf0EEUx5x7cfdTJZVTMxdCWyk4xButkgWeAZkeP+vam h42uoAnoAtBhoGCK1t/HTuUr2YW0nHNYQSF5p14cs2xd88CVEV/e9iAZfMKqI5btQ/8A gYPduqtCYPgPe8Lk6JEqU7FI0fEiiJaDJWs9M= Received: by 10.114.243.13 with SMTP id q13mr17223455wah.76.1256640891325; Tue, 27 Oct 2009 03:54:51 -0700 (PDT) Received: from rxone.opensource.se (49.14.32.202.bf.2iij.net [202.32.14.49]) by mx.google.com with ESMTPS id 22sm1827658pzk.6.2009.10.27.03.54.49 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 27 Oct 2009 03:54:50 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Cc: Magnus Damm , lethal@linux-sh.org Date: Tue, 27 Oct 2009 19:49:55 +0900 Message-Id: <20091027104955.26350.60772.sendpatchset@rxone.opensource.se> Subject: [PATCH] sh: add SDHI1 support to ms7724se Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org --- 0005/arch/sh/boards/mach-se/7724/setup.c +++ work/arch/sh/boards/mach-se/7724/setup.c 2009-10-27 18:50:48.000000000 +0900 @@ -463,6 +463,7 @@ static struct resource sdhi0_cn7_resourc static struct platform_device sdhi0_cn7_device = { .name = "sh_mobile_sdhi", + .id = 0, .num_resources = ARRAY_SIZE(sdhi0_cn7_resources), .resource = sdhi0_cn7_resources, .archdata = { @@ -470,6 +471,29 @@ static struct platform_device sdhi0_cn7_ }, }; +static struct resource sdhi1_cn8_resources[] = { + [0] = { + .name = "SDHI1", + .start = 0x04cf0000, + .end = 0x04cf01ff, + .flags = IORESOURCE_MEM, + }, + [1] = { + .start = 24, + .flags = IORESOURCE_IRQ, + }, +}; + +static struct platform_device sdhi1_cn8_device = { + .name = "sh_mobile_sdhi", + .id = 1, + .num_resources = ARRAY_SIZE(sdhi1_cn8_resources), + .resource = sdhi1_cn8_resources, + .archdata = { + .hwblk_id = HWBLK_SDHI1, + }, +}; + static struct platform_device *ms7724se_devices[] __initdata = { &heartbeat_device, &smc91x_eth_device, @@ -483,6 +507,7 @@ static struct platform_device *ms7724se_ &sh7724_usb1_gadget_device, &fsi_device, &sdhi0_cn7_device, + &sdhi1_cn8_device, }; #define EEPROM_OP 0xBA206000 @@ -725,6 +750,16 @@ static int __init devices_setup(void) gpio_request(GPIO_FN_SDHI0CMD, NULL); gpio_request(GPIO_FN_SDHI0CLK, NULL); + /* SDHI1 connected to cn8 */ + gpio_request(GPIO_FN_SDHI1CD, NULL); + gpio_request(GPIO_FN_SDHI1WP, NULL); + gpio_request(GPIO_FN_SDHI1D3, NULL); + gpio_request(GPIO_FN_SDHI1D2, NULL); + gpio_request(GPIO_FN_SDHI1D1, NULL); + gpio_request(GPIO_FN_SDHI1D0, NULL); + gpio_request(GPIO_FN_SDHI1CMD, NULL); + gpio_request(GPIO_FN_SDHI1CLK, NULL); + /* * enable SH-Eth *