From patchwork Fri Nov 27 04:36:58 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: 63266
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 nAR4gS4H005241
	for <patchwork-sh@patchwork.kernel.org>; Fri, 27 Nov 2009 04:42:28 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753458AbZK0EmT (ORCPT
	<rfc822;patchwork-sh@patchwork.kernel.org>);
	Thu, 26 Nov 2009 23:42:19 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753559AbZK0EmT
	(ORCPT <rfc822; linux-sh-outgoing>);
	Thu, 26 Nov 2009 23:42:19 -0500
Received: from mail-yw0-f182.google.com ([209.85.211.182]:38419 "EHLO
	mail-yw0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1753458AbZK0EmS (ORCPT
	<rfc822;linux-sh@vger.kernel.org>); Thu, 26 Nov 2009 23:42:18 -0500
Received: by ywh12 with SMTP id 12so1358532ywh.21
	for <linux-sh@vger.kernel.org>; Thu, 26 Nov 2009 20:42:24 -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
	:subject; bh=XWMc6Z4dtec6jRWO3eUQKkkosJNFc5amXp13IS/pKrw=;
	b=BrOgc2x47oeNuJGTgmKlsTaWKxiSocGaO/ppDwytvasuatb6vBgdX9BSMSjjnN8i4H
	QZpw7XQhyfERx06GRZi/EcLhFaLYXNoiRx0rzfBgFFP04Y2bsiP+3lzOxJoZiQCskTx/
	3L1JCKzkco55CfSlEA26iEBif62xGxmLcAhmI=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
	h=from:to:cc:date:message-id:subject;
	b=kbBYG7k1g1KiV0JtjZrQDJZa7DdfQxic45TPcVkyaJXVXX8MJeWrHPI+LRBOPzt1up
	KpoiZ476xbN6IOsAMf9uCkNtVz39N3EFe4WoZNTGLXaguDvMsVTREro+bXC8lpGT90ck
	di02mtYpLAasdb1fql5t5Qn/wmv8WNqL5o8uo=
Received: by 10.91.26.31 with SMTP id d31mr902162agj.44.1259296944466;
	Thu, 26 Nov 2009 20:42:24 -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 8sm666862yxb.43.2009.11.26.20.42.22
	(version=TLSv1/SSLv3 cipher=RC4-MD5);
	Thu, 26 Nov 2009 20:42:23 -0800 (PST)
From: Magnus Damm <magnus.damm@gmail.com>
To: linux-sh@vger.kernel.org
Cc: Magnus Damm <magnus.damm@gmail.com>, lethal@linux-sh.org,
	ian@mnementh.co.uk, sameo@linux.intel.com
Date: Fri, 27 Nov 2009 13:36:58 +0900
Message-Id: <20091127043658.13573.80166.sendpatchset@rxone.opensource.se>
Subject: [PATCH] sh: Add SDHI power control support to Ecovec
Sender: linux-sh-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-sh.vger.kernel.org>
X-Mailing-List: linux-sh@vger.kernel.org


--- 0012/arch/sh/boards/mach-ecovec24/setup.c
+++ work/arch/sh/boards/mach-ecovec24/setup.c	2009-11-26 17:57:38.000000000 +0900
@@ -20,6 +20,7 @@
 #include <linux/i2c.h>
 #include <linux/i2c/tsc2007.h>
 #include <linux/input.h>
+#include <linux/mfd/sh_mobile_sdhi.h>
 #include <video/sh_mobile_lcdc.h>
 #include <media/sh_mobile_ceu.h>
 #include <media/tw9910.h>
@@ -423,6 +424,15 @@ static struct i2c_board_info ts_i2c_clie
 };
 
 /* SHDI0 */
+static void sdhi0_set_pwr(struct platform_device *pdev, int state)
+{
+	gpio_set_value(GPIO_PTB6, state);
+}
+
+static struct sh_mobile_sdhi_info sdhi0_info = {
+	.set_pwr = sdhi0_set_pwr,
+};
+
 static struct resource sdhi0_resources[] = {
 	[0] = {
 		.name	= "SDHI0",
@@ -441,12 +451,24 @@ static struct platform_device sdhi0_devi
 	.num_resources  = ARRAY_SIZE(sdhi0_resources),
 	.resource       = sdhi0_resources,
 	.id             = 0,
+	.dev	= {
+		.platform_data	= &sdhi0_info,
+	},
 	.archdata = {
 		.hwblk_id = HWBLK_SDHI0,
 	},
 };
 
 /* SHDI1 */
+static void sdhi1_set_pwr(struct platform_device *pdev, int state)
+{
+	gpio_set_value(GPIO_PTB7, state);
+}
+
+static struct sh_mobile_sdhi_info sdhi1_info = {
+	.set_pwr = sdhi1_set_pwr,
+};
+
 static struct resource sdhi1_resources[] = {
 	[0] = {
 		.name	= "SDHI1",
@@ -465,6 +487,9 @@ static struct platform_device sdhi1_devi
 	.num_resources  = ARRAY_SIZE(sdhi1_resources),
 	.resource       = sdhi1_resources,
 	.id             = 1,
+	.dev	= {
+		.platform_data	= &sdhi1_info,
+	},
 	.archdata = {
 		.hwblk_id = HWBLK_SDHI1,
 	},
@@ -865,7 +890,7 @@ static int __init arch_setup(void)
 	gpio_direction_input(GPIO_PTR5);
 	gpio_direction_input(GPIO_PTR6);
 
-	/* enable SDHI0 */
+	/* enable SDHI0 (needs DS2.4 set to ON) */
 	gpio_request(GPIO_FN_SDHI0CD,  NULL);
 	gpio_request(GPIO_FN_SDHI0WP,  NULL);
 	gpio_request(GPIO_FN_SDHI0CMD, NULL);
@@ -874,8 +899,10 @@ static int __init arch_setup(void)
 	gpio_request(GPIO_FN_SDHI0D2,  NULL);
 	gpio_request(GPIO_FN_SDHI0D1,  NULL);
 	gpio_request(GPIO_FN_SDHI0D0,  NULL);
+	gpio_request(GPIO_PTB6, NULL);
+	gpio_direction_output(GPIO_PTB6, 0);
 
-	/* enable SDHI1 */
+	/* enable SDHI1 (needs DS2.6,7 set to ON,OFF) */
 	gpio_request(GPIO_FN_SDHI1CD,  NULL);
 	gpio_request(GPIO_FN_SDHI1WP,  NULL);
 	gpio_request(GPIO_FN_SDHI1CMD, NULL);
@@ -884,11 +911,8 @@ static int __init arch_setup(void)
 	gpio_request(GPIO_FN_SDHI1D2,  NULL);
 	gpio_request(GPIO_FN_SDHI1D1,  NULL);
 	gpio_request(GPIO_FN_SDHI1D0,  NULL);
-
-	gpio_request(GPIO_PTB6, NULL);
 	gpio_request(GPIO_PTB7, NULL);
-	gpio_direction_output(GPIO_PTB6, 1);
-	gpio_direction_output(GPIO_PTB7, 1);
+	gpio_direction_output(GPIO_PTB7, 0);
 
 	/* I/O buffer drive ability is high for SDHI1 */
 	ctrl_outw((ctrl_inw(IODRIVEA) & ~0x3000) | 0x2000 , IODRIVEA);