From patchwork Mon Mar 1 22:13:04 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francisco Alecrim X-Patchwork-Id: 83078 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o21MFKKc015714 for ; Mon, 1 Mar 2010 22:15:20 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752391Ab0CAWPT (ORCPT ); Mon, 1 Mar 2010 17:15:19 -0500 Received: from mail-vw0-f46.google.com ([209.85.212.46]:61908 "EHLO mail-vw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751651Ab0CAWPS (ORCPT ); Mon, 1 Mar 2010 17:15:18 -0500 Received: by vws10 with SMTP id 10so573935vws.19 for ; Mon, 01 Mar 2010 14:15:17 -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:subject:date :message-id:x-mailer; bh=TW1anYshA3L3egkKz80vCiQLPQT7K0oXg17sxYx7IHM=; b=xFSD8OcTV8XAGwpYsRYBPLJ3D1GVOVQqlr4J7M/Clp/lD1Knj9UmjnZvSpgxmt2puN C4P1Ey3frRRI9rEZ/IZYDwQAjFD0Fq9t44RWpZK9ggiSSTE+i4WWUbfk3iUw1GVU1x+Y VXPUq0Xvz1+w9JdMW/Vu/pQF92U/1NrT0w5og= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=oNsOR9amW/q1yRJwfwepHui4BCxLDk0XpCaJPN7kZT3IRYtRnahGJcyU9MdfhlBZ/t lETCNrmScfNkH9CDtDcY+uxVsaTIL7uvxncbnm/kF1gPR7JrMImnvZD0WyKDy1JCSidz 051ujSg1JM1HONpHo7O6RWYGEOZc4kmxuGPpY= Received: by 10.220.127.27 with SMTP id e27mr3625960vcs.96.1267481717031; Mon, 01 Mar 2010 14:15:17 -0800 (PST) Received: from localhost.localdomain ([189.2.128.130]) by mx.google.com with ESMTPS id 25sm32694494vws.12.2010.03.01.14.15.13 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 01 Mar 2010 14:15:15 -0800 (PST) From: Francisco Alecrim To: linux-omap@vger.kernel.org Cc: Francisco Alecrim , Kalle Valo , Tony Lindgren Subject: [PATCH v2] board-n8x0: add USB initialization Date: Mon, 1 Mar 2010 18:13:04 -0400 Message-Id: <1267481584-29281-1-git-send-email-alecrim@gmail.com> X-Mailer: git-send-email 1.6.3.3 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Mon, 01 Mar 2010 22:15:20 +0000 (UTC) diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c index ee548dd..79d659a 100644 --- a/arch/arm/mach-omap2/board-n8x0.c +++ b/arch/arm/mach-omap2/board-n8x0.c @@ -32,6 +32,97 @@ #include #include +#if defined(CONFIG_USB_TUSB6010) || \ + defined(CONFIG_USB_TUSB6010_MODULE) +/* + * Enable or disable power to TUSB6010. When enabling, turn on 3.3 V and + * 1.5 V voltage regulators of PM companion chip. Companion chip will then + * provide then PGOOD signal to TUSB6010 which will release it from reset. + */ +static int tusb_set_power(int state) +{ + int i, retval = 0; + + if (state) { + gpio_set_value(TUSB6010_GPIO_ENABLE, 1); + msleep(1); + + /* Wait until TUSB6010 pulls INT pin down */ + i = 100; + while (i && gpio_get_value(TUSB6010_GPIO_INT)) { + msleep(1); + i--; + } + + if (!i) { + printk(KERN_ERR "tusb: powerup failed\n"); + retval = -ENODEV; + } + } else { + gpio_set_value(TUSB6010_GPIO_ENABLE, 0); + msleep(10); + } + + return retval; +} + +static struct musb_hdrc_config musb_config = { + .multipoint = 1, + .dyn_fifo = 1, + .num_eps = 16, + .ram_bits = 12, +}; + +static struct musb_hdrc_platform_data tusb_data = { +#if defined(CONFIG_USB_MUSB_OTG) + .mode = MUSB_OTG, +#elif defined(CONFIG_USB_MUSB_PERIPHERAL) + .mode = MUSB_PERIPHERAL, +#else /* defined(CONFIG_USB_MUSB_HOST) */ + .mode = MUSB_HOST, +#endif + .set_power = tusb_set_power, + .min_power = 25, /* x2 = 50 mA drawn from VBUS as peripheral */ + .power = 100, /* Max 100 mA VBUS for host mode */ + .config = &musb_config, +}; + +static void __init n8x0_usb_init(void) +{ + int ret = 0; + static char announce[] __initdata = KERN_INFO "TUSB 6010\n"; + + /* PM companion chip power control pin */ + ret = gpio_request(TUSB6010_GPIO_ENABLE, "TUSB6010 enable"); + if (ret != 0) { + printk(KERN_ERR "Could not get TUSB power GPIO%i\n", + TUSB6010_GPIO_ENABLE); + return; + } + gpio_direction_output(TUSB6010_GPIO_ENABLE, 0); + + tusb_set_power(0); + + ret = tusb6010_setup_interface(&tusb_data, TUSB6010_REFCLK_19, 2, + TUSB6010_ASYNC_CS, TUSB6010_SYNC_CS, + TUSB6010_GPIO_INT, 0x3f); + if (ret != 0) + goto err; + + printk(announce); + + return; + +err: + gpio_free(TUSB6010_GPIO_ENABLE); +} +#else + +static void __init n8x0_usb_init(void) {} + +#endif /*CONFIG_USB_TUSB6010 */ + + static struct omap2_mcspi_device_config p54spi_mcspi_config = { .turbo_mode = 0, .single_channel = 1, @@ -148,6 +239,7 @@ static void __init n8x0_init_machine(void) omap_serial_init(); n8x0_onenand_init(); + n8x0_usb_init(); } MACHINE_START(NOKIA_N800, "Nokia N800") diff --git a/arch/arm/mach-omap2/clock2420_data.c b/arch/arm/mach-omap2/clock2420_data.c index f12af95..d932b14 100644 --- a/arch/arm/mach-omap2/clock2420_data.c +++ b/arch/arm/mach-omap2/clock2420_data.c @@ -1841,6 +1841,7 @@ static struct omap_clk omap2420_clks[] = { CLK(NULL, "aes_ick", &aes_ick, CK_242X), CLK(NULL, "pka_ick", &pka_ick, CK_242X), CLK(NULL, "usb_fck", &usb_fck, CK_242X), + CLK("musb_hdrc", "fck", &osc_ck, CK_242X), }; /* diff --git a/include/linux/usb/musb.h b/include/linux/usb/musb.h index 3fdeef5..c281ce0 100644 --- a/include/linux/usb/musb.h +++ b/include/linux/usb/musb.h @@ -98,6 +98,10 @@ struct musb_hdrc_platform_data { #define TUSB6010_OSCCLK_60 16667 /* psec/clk @ 60.0 MHz */ #define TUSB6010_REFCLK_24 41667 /* psec/clk @ 24.0 MHz XI */ #define TUSB6010_REFCLK_19 52083 /* psec/clk @ 19.2 MHz CLKIN */ +#define TUSB6010_ASYNC_CS 1 +#define TUSB6010_SYNC_CS 4 +#define TUSB6010_GPIO_INT 58 +#define TUSB6010_GPIO_ENABLE 0 #ifdef CONFIG_ARCH_OMAP2