From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 04/19] omap2: add USB initialization for tusb6010
Date: Thu, 11 Mar 2010 15:48:14 -0800 [thread overview]
Message-ID: <20100311234814.4500.94634.stgit@baageli.muru.com> (raw)
In-Reply-To: <20100311234404.4500.82861.stgit@baageli.muru.com>
From: Francisco Alecrim <francisco.alecrim@openbossa.org>
Based on Kalle's and Tony's patches. Some variables re-organized
and unused code removed.
Signed-off-by: Kalle Valo <kalle.valo@iki.fi>
Signed-off-by: Francisco Alecrim <francisco.alecrim@openbossa.org>
[tony at atomide.com: this is needed to fix the related tusb6010 DMA API changes]
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/mach-omap2/board-n8x0.c | 98 ++++++++++++++++++++++++++++++++++
arch/arm/mach-omap2/clock2420_data.c | 1
2 files changed, 99 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
index 4cab052..da9bcb8 100644
--- a/arch/arm/mach-omap2/board-n8x0.c
+++ b/arch/arm/mach-omap2/board-n8x0.c
@@ -37,6 +37,103 @@ static int slot1_cover_open;
static int slot2_cover_open;
static struct device *mmc_device;
+#define TUSB6010_ASYNC_CS 1
+#define TUSB6010_SYNC_CS 4
+#define TUSB6010_GPIO_INT 58
+#define TUSB6010_GPIO_ENABLE 0
+#define TUSB6010_DMACHAN 0x3f
+
+#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, TUSB6010_DMACHAN);
+ 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,
@@ -562,6 +659,7 @@ static void __init n8x0_init_machine(void)
n8x0_menelaus_init();
n8x0_onenand_init();
n8x0_mmc_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),
};
/*
next prev parent reply other threads:[~2010-03-11 23:48 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-11 23:48 [PATCH 00/19] omap-fixes for 2.6.34-rc1 Tony Lindgren
2010-03-11 23:48 ` [PATCH 01/19] omap3: Fix compile for Touch Book early_param Tony Lindgren
2010-03-11 23:48 ` [PATCH 02/19] omap2/3/4: ehci: avoid compiler error with touchbook Tony Lindgren
2010-03-11 23:48 ` [PATCH 03/19] omap4: Fix build break by moving omap_smc1 into a separate .S Tony Lindgren
2010-03-11 23:48 ` Tony Lindgren [this message]
2010-03-11 23:48 ` [PATCH 05/19] omap2: Update n8x0 defconfig to test multi-omap and DMA api changes Tony Lindgren
2010-03-11 23:48 ` [PATCH 06/19] omap: Enable PM_RUNTIME in defconfigs to avoid USB compile errors Tony Lindgren
2010-03-11 23:48 ` [PATCH 07/19] OMAP2: serial.c: Fix number of uarts in early_init Tony Lindgren
2010-03-11 23:48 ` [PATCH 08/19] omap2/3/4: mailbox: remove compiler warning Tony Lindgren
2010-03-11 23:48 ` [PATCH 09/19] omap: pass the reboot command to the boot loader Tony Lindgren
2010-03-11 23:48 ` [PATCH 10/19] omap: Checkpatch cleanup for blizzard.h Tony Lindgren
2010-03-11 23:48 ` [PATCH 11/19] omap3: Fix support for the LEDs connected to GPIO outputs on IGEP v2board Tony Lindgren
2010-03-11 23:48 ` [PATCH 12/19] omap: Fix gpio_resume_after_retention Tony Lindgren
2010-03-11 23:50 ` Aguirre, Sergio
2010-03-11 23:56 ` Tony Lindgren
2010-03-12 0:04 ` Aguirre, Sergio
2010-03-12 10:37 ` Gadiyar, Anand
2010-03-12 13:19 ` Felipe Balbi
2010-03-12 14:00 ` Aguirre, Sergio
2010-03-11 23:48 ` [PATCH 13/19] omap: mach-omap2/io.c: fix function declarations Tony Lindgren
2010-03-11 23:48 ` [PATCH 14/19] omap3: pandora: add missing i2c3 board_info Tony Lindgren
2010-03-11 23:48 ` [PATCH 15/19] OMAP2: cpu_is_omap2*: fix compile-time removal of unused code Tony Lindgren
2010-03-11 23:48 ` [PATCH 16/19] OMAP4: fix temporary hacks that break multi-omap PM Tony Lindgren
2010-03-11 23:48 ` [PATCH 17/19] omap: Add DSI regulator supply to OMAP3EVM board file Tony Lindgren
2010-03-12 4:48 ` Hiremath, Vaibhav
2010-03-12 17:12 ` Tony Lindgren
2010-03-12 17:18 ` Tony Lindgren
2010-03-11 23:59 ` [PATCH 18/19] " Tony Lindgren
2010-03-12 0:06 ` Tony Lindgren
2010-03-12 0:00 ` [PATCH 19/19] omap: McBSP: Drop unnecessary status/error bit clearing on reg_cacheretrieved register values Tony Lindgren
2010-03-12 0:10 ` Tony Lindgren
2010-03-12 0:11 ` [PATCH 19b/19] ARM/OMAP: Remove the +x bit from a couple of source files Tony Lindgren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100311234814.4500.94634.stgit@baageli.muru.com \
--to=tony@atomide.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).