From patchwork Tue Nov 30 04:37:33 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
X-Patchwork-Id: 366022
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oAU4bgC9029795
	for <patchwork-sh@patchwork.kernel.org>; Tue, 30 Nov 2010 04:37:42 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753851Ab0K3Ehi (ORCPT
	<rfc822;patchwork-sh@patchwork.kernel.org>);
	Mon, 29 Nov 2010 23:37:38 -0500
Received: from mail.renesas.com ([202.234.163.13]:44181 "EHLO
	mail04.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org
	with ESMTP id S1753034Ab0K3Ehi (ORCPT
	<rfc822;linux-sh@vger.kernel.org>); Mon, 29 Nov 2010 23:37:38 -0500
X-AuditID: ac140387-0000000b00000202-b6-4cf47f8d25d0
Received: from guardian02.idc.renesas.com ([172.20.8.201])
	by mail04.idc.renesas.com (sendmail) with ESMTP id oAU4bXfX012094;
	Tue, 30 Nov 2010 13:37:33 +0900 (JST)
Received: (from root@localhost)
	by guardian02.idc.renesas.com with  id oAU4bXTQ024097;
	Tue, 30 Nov 2010 13:37:33 +0900 (JST)
Received: from mta07.idc.renesas.com (localhost [127.0.0.1])
	by mta07.idc.renesas.com with ESMTP id oAU4bWu5016510;
	Tue, 30 Nov 2010 13:37:32 +0900 (JST)
Received: from PG10870.renesas.com ([172.30.8.159])
	by ims05.idc.renesas.com (Sendmail)
	with ESMTPA id <0LCO0075CKULLD@ims05.idc.renesas.com>; Tue,
	30 Nov 2010 13:37:33 +0900 (JST)
Date: Tue, 30 Nov 2010 13:37:33 +0900 (JST)
Date-warning: Date header was inserted by ims05.idc.renesas.com
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Subject: [PATCH] ARM: mach-shmobile: mackerel: Add USB1(Host) support
To: Paul Mundt <lethal@linux-sh.org>
Cc: Magnus <magnus.damm@gmail.com>, Linux-SH <linux-sh@vger.kernel.org>
Message-id: <w3py68ba0kz.wl%kuninori.morimoto.gx@renesas.com>
MIME-version: 1.0 (generated by SEMI 1.14.6 - "Maruoka")
Content-type: text/plain; charset=US-ASCII
User-Agent: SEMI/1.14.6 (Maruoka) FLIM/1.14.7 (=?ISO-2022-JP-2?B?U2Fuag==?=
	=?ISO-2022-JP-2?B?GyQoRCtXGyhC?=) APEL/10.6 Emacs/23.2
	(i386-mingw-nt5.1.2600) MULE/6.0 (HANACHIRUSATO)
X-Brightmail-Tracker: AAAAAA==
Sender: linux-sh-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-sh.vger.kernel.org>
X-Mailing-List: linux-sh@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]);
	Tue, 30 Nov 2010 04:37:42 +0000 (UTC)


diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index e6407cc..f9418e7 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -33,6 +33,7 @@
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <linux/smsc911x.h>
+#include <linux/usb/r8a66597.h>
 
 #include <video/sh_mobile_lcdc.h>
 
@@ -114,8 +115,22 @@
  * IRQ9  | ICR2A.IRQ9SA=0010  | KEY(TCA6408)       | Low
  * IRQ21 | ICR4A.IRQ21SA=0011 | Sensor(ADXL345)    | High
  * IRQ22 | ICR4A.IRQ22SA=0011 | Sensor(AK8975)     | High
+ */
 
-*/
+/*
+ * USB
+ *
+ * USB0 : CN22 : Function
+ * USB1 : CN31 : Function/Host *1
+ *
+ * J30 (for CN31) *1
+ * ----------+---------------+-------------
+ * 1-2 short | VBUS 5V       | Host
+ * open      | external VBUS | Function
+ *
+ * *1
+ * CN31 is used as Host in Linux.
+ */
 
 /* MTD */
 static struct mtd_partition nor_flash_partitions[] = {
@@ -254,10 +269,51 @@ static struct platform_device lcdc_device = {
 	},
 };
 
+/* USB1 (Host) */
+static void usb1_host_port_power(int port, int power)
+{
+	if (!power) /* only power-on is supported for now */
+		return;
+
+	/* set VBOUT/PWEN and EXTLP1 in DVSTCTR */
+	__raw_writew(__raw_readw(0xE68B0008) | 0x600, 0xE68B0008);
+}
+
+static struct r8a66597_platdata usb1_host_data = {
+	.on_chip	= 1,
+	.port_power	= usb1_host_port_power,
+};
+
+static struct resource usb1_host_resources[] = {
+	[0] = {
+		.name	= "USBHS",
+		.start	= 0xE68B0000,
+		.end	= 0xE68B00E6 - 1,
+		.flags	= IORESOURCE_MEM,
+	},
+	[1] = {
+		.start	= evt2irq(0x1ce0) /* USB1_USB1I0 */,
+		.flags	= IORESOURCE_IRQ,
+	},
+};
+
+static struct platform_device usb1_host_device = {
+	.name	= "r8a66597_hcd",
+	.id	= 1,
+	.dev = {
+		.dma_mask		= NULL,         /*  not use dma */
+		.coherent_dma_mask	= 0xffffffff,
+		.platform_data		= &usb1_host_data,
+	},
+	.num_resources	= ARRAY_SIZE(usb1_host_resources),
+	.resource	= usb1_host_resources,
+};
+
 static struct platform_device *mackerel_devices[] __initdata = {
 	&nor_flash_device,
 	&smc911x_device,
 	&lcdc_device,
+	&usb1_host_device,
 };
 
 static struct map_desc mackerel_io_desc[] __initdata = {
@@ -327,6 +383,17 @@ static void __init mackerel_init(void)
 	gpio_request(GPIO_PORT151, NULL); /* LCDDON */
 	gpio_direction_output(GPIO_PORT151, 1);
 
+	/* USB enable */
+	gpio_request(GPIO_FN_VBUS0_1,    NULL);
+	gpio_request(GPIO_FN_IDIN_1_18,  NULL);
+	gpio_request(GPIO_FN_PWEN_1_115, NULL);
+	gpio_request(GPIO_FN_OVCN_1_114, NULL);
+	gpio_request(GPIO_FN_EXTLP_1,    NULL);
+	gpio_request(GPIO_FN_OVCN2_1,    NULL);
+
+	/* setup USB phy */
+	__raw_writew(0x8a0a, 0xE6058130);	/* USBCR2 */
+
 
 	sh7372_add_standard_devices();