diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-06-29 06:07:08 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-06-29 06:07:08 -0700 |
| commit | f6f1f12f6d4e9e4a44587e58ec96db25673083ec (patch) | |
| tree | 68f44e3d64ebbee9f89c459136702ca243bbfa61 /arch/arm/mach-omap2/usb-tusb6010.c | |
| parent | e0246e8ecad10b9437381b89756292ac031d4cfa (diff) | |
| parent | a77e1c4d09c88f98ac2e653382d2c1861dbb736f (diff) | |
Merge tag 'omap-devel-d-for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into fixes-non-criticalomap-fixes-non-critical-for-v3.6
Some OMAP AM35xx fixes.
The powerdomain and clockdomain data for the AM35xx are finally fixed.
The AM35xx EMAC/MDIO Ethernet controller integration code has been
converted to use the OMAP device and hwmod framework. Also the UART4
and HSOTGUSB warnings have been fixed.
Diffstat (limited to 'arch/arm/mach-omap2/usb-tusb6010.c')
| -rw-r--r-- | arch/arm/mach-omap2/usb-tusb6010.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/usb-tusb6010.c b/arch/arm/mach-omap2/usb-tusb6010.c index db84a46ce7fd..805bea6edf17 100644 --- a/arch/arm/mach-omap2/usb-tusb6010.c +++ b/arch/arm/mach-omap2/usb-tusb6010.c @@ -300,7 +300,7 @@ tusb6010_setup_interface(struct musb_hdrc_platform_data *data, printk(error, 3, status); return status; } - tusb_resources[2].start = irq + IH_GPIO_BASE; + tusb_resources[2].start = gpio_to_irq(irq); /* set up memory timings ... can speed them up later */ if (!ps_refclk) { |