From patchwork Fri Oct  2 02:22:43 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: 51276
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 n922RO71007248
	for <patchwork-sh@patchwork.kernel.org>; Fri, 2 Oct 2009 02:27:25 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754812AbZJBC1U (ORCPT
	<rfc822;patchwork-sh@patchwork.kernel.org>);
	Thu, 1 Oct 2009 22:27:20 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754753AbZJBC1T
	(ORCPT <rfc822; linux-sh-outgoing>); Thu, 1 Oct 2009 22:27:19 -0400
Received: from mail-ew0-f211.google.com ([209.85.219.211]:61326 "EHLO
	mail-ew0-f211.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1754535AbZJBC1S (ORCPT
	<rfc822;linux-sh@vger.kernel.org>); Thu, 1 Oct 2009 22:27:18 -0400
Received: by mail-ew0-f211.google.com with SMTP id 7so778329ewy.17
	for <multiple recipients>; Thu, 01 Oct 2009 19:27:22 -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
	:in-reply-to:references:subject;
	bh=UIxFdxf1mIaPoKsZQ5AqY3Ro2HpjTZQtoQUiWqZrikY=;
	b=xzPq1xUU+Ue3aJpIkRBmWly7eEGzvLBc9htQg7foIBd2o5v+VrwY4w+AvzLTBPmrXk
	AhZgZmklEFdtVTv2ssQIfUrxiecBp9lVXESjWvTv1QzQjNaLKL4xwhnJ9nsZdGc+f1h+
	6atyHbgGbbRczwKUgex6yZN+h+NnWyWWGIwy0=
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=KdWCo0Ua1aad8v2Yn58BRohMQDlIuX8iVE4jW+zln48v+7GLo+5QvP0EI1q/Z6ASD6
	BzyXCR9KuOUwb+8rrxcSoYTyiicjTpYbHrOSZDlLD+qRx+/g7uCSGo3prqi17aQYFLvT
	VsGVLV0jVl3sdSESJ/mbTHmSW7DKdAdeUfm40=
Received: by 10.211.174.10 with SMTP id b10mr2301050ebp.39.1254450442574;
	Thu, 01 Oct 2009 19:27:22 -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 24sm715319eyx.9.2009.10.01.19.27.17
	(version=TLSv1/SSLv3 cipher=RC4-MD5);
	Thu, 01 Oct 2009 19:27:20 -0700 (PDT)
From: Magnus Damm <magnus.damm@gmail.com>
To: linux-sh@vger.kernel.org
Cc: linux-mmc@vger.kernel.org, g.liakhovetski@gmx.de, ian@mnementh.co.uk,
	lethal@linux-sh.org, Magnus Damm <magnus.damm@gmail.com>,
	akpm@linux-foundation.org
Date: Fri, 02 Oct 2009 11:22:43 +0900
Message-Id: <20091002022243.8215.7784.sendpatchset@rxone.opensource.se>
In-Reply-To: <20091002022158.8215.58317.sendpatchset@rxone.opensource.se>
References: <20091002022158.8215.58317.sendpatchset@rxone.opensource.se>
Subject: [PATCH 04/07] sh: SDHI platform data to the Migo-R board
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/boards/mach-migor/setup.c
+++ work/arch/sh/boards/mach-migor/setup.c	2009-10-02 09:41:19.000000000 +0900
@@ -18,8 +18,6 @@
 #include <linux/delay.h>
 #include <linux/clk.h>
 #include <linux/gpio.h>
-#include <linux/spi/spi.h>
-#include <linux/spi/spi_gpio.h>
 #include <video/sh_mobile_lcdc.h>
 #include <media/sh_mobile_ceu.h>
 #include <media/ov772x.h>
@@ -390,17 +388,25 @@ static struct platform_device migor_ceu_
 	},
 };
 
-struct spi_gpio_platform_data sdcard_cn9_platform_data = {
-	.sck = GPIO_PTD0,
-	.mosi = GPIO_PTD1,
-	.miso = GPIO_PTD2,
-	.num_chipselect = 1,
+static struct resource sdhi_cn9_resources[] = {
+	[0] = {
+		.name	= "SDHI",
+		.start	= 0x04ce0000,
+		.end	= 0x04ce01ff,
+		.flags	= IORESOURCE_MEM,
+	},
+	[1] = {
+		.start	= 101,
+		.flags  = IORESOURCE_IRQ,
+	},
 };
 
-static struct platform_device sdcard_cn9_device = {
-	.name		= "spi_gpio",
-	.dev	= {
-		.platform_data	= &sdcard_cn9_platform_data,
+static struct platform_device sdhi_cn9_device = {
+	.name		= "sh_mobile_sdhi",
+	.num_resources	= ARRAY_SIZE(sdhi_cn9_resources),
+	.resource	= sdhi_cn9_resources,
+	.archdata = {
+		.hwblk_id = HWBLK_SDHI,
 	},
 };
 
@@ -467,20 +473,11 @@ static struct platform_device *migor_dev
 	&migor_ceu_device,
 	&migor_nor_flash_device,
 	&migor_nand_flash_device,
-	&sdcard_cn9_device,
+	&sdhi_cn9_device,
 	&migor_camera[0],
 	&migor_camera[1],
 };
 
-static struct spi_board_info migor_spi_devices[] = {
-	{
-		.modalias = "mmc_spi",
-		.max_speed_hz = 5000000,
-		.chip_select = 0,
-		.controller_data = (void *) GPIO_PTD5,
-	},
-};
-
 static int __init migor_devices_setup(void)
 {
 
@@ -525,6 +522,16 @@ static int __init migor_devices_setup(vo
 	gpio_request(GPIO_PTA1, NULL);
 	gpio_direction_input(GPIO_PTA1);
 
+	/* SDHI */
+	gpio_request(GPIO_FN_SDHICD, NULL);
+	gpio_request(GPIO_FN_SDHIWP, NULL);
+	gpio_request(GPIO_FN_SDHID3, NULL);
+	gpio_request(GPIO_FN_SDHID2, NULL);
+	gpio_request(GPIO_FN_SDHID1, NULL);
+	gpio_request(GPIO_FN_SDHID0, NULL);
+	gpio_request(GPIO_FN_SDHICMD, NULL);
+	gpio_request(GPIO_FN_SDHICLK, NULL);
+
 	/* Touch Panel */
 	gpio_request(GPIO_FN_IRQ6, NULL);
 
@@ -612,9 +619,6 @@ static int __init migor_devices_setup(vo
 	i2c_register_board_info(0, migor_i2c_devices,
 				ARRAY_SIZE(migor_i2c_devices));
 
-	spi_register_board_info(migor_spi_devices,
-				ARRAY_SIZE(migor_spi_devices));
-
 	return platform_add_devices(migor_devices, ARRAY_SIZE(migor_devices));
 }
 arch_initcall(migor_devices_setup);