2009-10-14 08:44:14 +00:00
|
|
|
/*
|
2010-11-21 17:53:42 +00:00
|
|
|
* ehci-omap.c - driver for USBHOST on OMAP3/4 processors
|
2009-10-14 08:44:14 +00:00
|
|
|
*
|
2010-11-21 17:53:42 +00:00
|
|
|
* Bus Glue for the EHCI controllers in OMAP3/4
|
|
|
|
|
* Tested on several OMAP3 boards, and OMAP4 Pandaboard
|
2009-10-14 08:44:14 +00:00
|
|
|
*
|
2011-03-01 14:38:21 +00:00
|
|
|
* Copyright (C) 2007-2011 Texas Instruments, Inc.
|
2009-10-14 08:44:14 +00:00
|
|
|
* Author: Vikram Pandita <vikram.pandita@ti.com>
|
2010-11-21 17:53:42 +00:00
|
|
|
* Author: Anand Gadiyar <gadiyar@ti.com>
|
2011-03-01 14:38:21 +00:00
|
|
|
* Author: Keshava Munegowda <keshava_mgowda@ti.com>
|
2009-10-14 08:44:14 +00:00
|
|
|
*
|
|
|
|
|
* Copyright (C) 2009 Nokia Corporation
|
|
|
|
|
* Contact: Felipe Balbi <felipe.balbi@nokia.com>
|
|
|
|
|
*
|
|
|
|
|
* Based on "ehci-fsl.c" and "ehci-au1xxx.c" ehci glue layers
|
|
|
|
|
*
|
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
|
* (at your option) any later version.
|
|
|
|
|
*
|
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
|
* along with this program; if not, write to the Free Software
|
|
|
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
|
*
|
2011-03-01 14:38:21 +00:00
|
|
|
* TODO (last updated Feb 27, 2010):
|
2009-10-14 08:44:14 +00:00
|
|
|
* - add kernel-doc
|
|
|
|
|
* - enable AUTOIDLE
|
|
|
|
|
* - add suspend/resume
|
2010-11-21 17:53:42 +00:00
|
|
|
* - add HSIC and TLL support
|
|
|
|
|
* - convert to use hwmod and runtime PM
|
2009-10-14 08:44:14 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include <linux/platform_device.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 08:04:11 +00:00
|
|
|
#include <linux/slab.h>
|
2010-07-08 08:33:02 +00:00
|
|
|
#include <linux/usb/ulpi.h>
|
2009-12-15 18:38:05 +00:00
|
|
|
#include <plat/usb.h>
|
2011-04-21 14:22:43 +00:00
|
|
|
#include <linux/regulator/consumer.h>
|
2011-10-11 07:52:11 +00:00
|
|
|
#include <linux/pm_runtime.h>
|
2012-03-19 06:42:47 +00:00
|
|
|
#include <linux/gpio.h>
|
2012-06-05 12:34:27 +00:00
|
|
|
#include <linux/clk.h>
|
2009-10-14 08:44:14 +00:00
|
|
|
|
|
|
|
|
/* EHCI Register Set */
|
2010-05-06 14:39:48 +00:00
|
|
|
#define EHCI_INSNREG04 (0xA0)
|
|
|
|
|
#define EHCI_INSNREG04_DISABLE_UNSUSPEND (1 << 5)
|
2009-10-14 08:44:14 +00:00
|
|
|
#define EHCI_INSNREG05_ULPI (0xA4)
|
|
|
|
|
#define EHCI_INSNREG05_ULPI_CONTROL_SHIFT 31
|
|
|
|
|
#define EHCI_INSNREG05_ULPI_PORTSEL_SHIFT 24
|
|
|
|
|
#define EHCI_INSNREG05_ULPI_OPSEL_SHIFT 22
|
|
|
|
|
#define EHCI_INSNREG05_ULPI_REGADD_SHIFT 16
|
|
|
|
|
#define EHCI_INSNREG05_ULPI_EXTREGADD_SHIFT 8
|
|
|
|
|
#define EHCI_INSNREG05_ULPI_WRDATA_SHIFT 0
|
|
|
|
|
|
2012-06-05 12:34:27 +00:00
|
|
|
/* Errata i693 */
|
|
|
|
|
static struct clk *utmi_p1_fck;
|
|
|
|
|
static struct clk *utmi_p2_fck;
|
|
|
|
|
static struct clk *xclk60mhsp1_ck;
|
|
|
|
|
static struct clk *xclk60mhsp2_ck;
|
|
|
|
|
static struct clk *usbhost_p1_fck;
|
|
|
|
|
static struct clk *usbhost_p2_fck;
|
|
|
|
|
static struct clk *init_60m_fclk;
|
|
|
|
|
|
2011-03-01 14:38:21 +00:00
|
|
|
/*-------------------------------------------------------------------------*/
|
2010-11-21 17:53:42 +00:00
|
|
|
|
2011-03-01 14:38:21 +00:00
|
|
|
static const struct hc_driver ehci_omap_hc_driver;
|
2010-11-21 17:53:42 +00:00
|
|
|
|
2010-11-21 17:53:41 +00:00
|
|
|
|
2011-03-01 14:38:21 +00:00
|
|
|
static inline void ehci_write(void __iomem *base, u32 reg, u32 val)
|
2009-10-14 08:44:14 +00:00
|
|
|
{
|
|
|
|
|
__raw_writel(val, base + reg);
|
|
|
|
|
}
|
|
|
|
|
|
2011-03-01 14:38:21 +00:00
|
|
|
static inline u32 ehci_read(void __iomem *base, u32 reg)
|
2009-10-14 08:44:14 +00:00
|
|
|
{
|
|
|
|
|
return __raw_readl(base + reg);
|
|
|
|
|
}
|
|
|
|
|
|
2012-06-05 12:34:27 +00:00
|
|
|
/* Erratum i693 workaround sequence */
|
|
|
|
|
static void omap_ehci_erratum_i693(struct ehci_hcd *ehci)
|
|
|
|
|
{
|
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
|
|
/* Switch to the internal 60 MHz clock */
|
|
|
|
|
ret = clk_set_parent(utmi_p1_fck, init_60m_fclk);
|
|
|
|
|
if (ret != 0)
|
|
|
|
|
ehci_err(ehci, "init_60m_fclk set parent"
|
|
|
|
|
"failed error:%d\n", ret);
|
|
|
|
|
|
|
|
|
|
ret = clk_set_parent(utmi_p2_fck, init_60m_fclk);
|
|
|
|
|
if (ret != 0)
|
|
|
|
|
ehci_err(ehci, "init_60m_fclk set parent"
|
|
|
|
|
"failed error:%d\n", ret);
|
|
|
|
|
|
|
|
|
|
clk_enable(usbhost_p1_fck);
|
|
|
|
|
clk_enable(usbhost_p2_fck);
|
|
|
|
|
|
|
|
|
|
/* Wait 1ms and switch back to the external clock */
|
|
|
|
|
mdelay(1);
|
|
|
|
|
ret = clk_set_parent(utmi_p1_fck, xclk60mhsp1_ck);
|
|
|
|
|
if (ret != 0)
|
|
|
|
|
ehci_err(ehci, "xclk60mhsp1_ck set parent"
|
|
|
|
|
"failed error:%d\n", ret);
|
|
|
|
|
|
|
|
|
|
ret = clk_set_parent(utmi_p2_fck, xclk60mhsp2_ck);
|
|
|
|
|
if (ret != 0)
|
|
|
|
|
ehci_err(ehci, "xclk60mhsp2_ck set parent"
|
|
|
|
|
"failed error:%d\n", ret);
|
|
|
|
|
|
|
|
|
|
clk_disable(usbhost_p1_fck);
|
|
|
|
|
clk_disable(usbhost_p2_fck);
|
|
|
|
|
}
|
|
|
|
|
|
2012-07-13 09:25:24 +00:00
|
|
|
static void omap_ehci_soft_phy_reset(struct usb_hcd *hcd, u8 port)
|
2010-07-08 08:33:02 +00:00
|
|
|
{
|
|
|
|
|
unsigned long timeout = jiffies + msecs_to_jiffies(1000);
|
|
|
|
|
unsigned reg = 0;
|
|
|
|
|
|
|
|
|
|
reg = ULPI_FUNC_CTRL_RESET
|
|
|
|
|
/* FUNCTION_CTRL_SET register */
|
|
|
|
|
| (ULPI_SET(ULPI_FUNC_CTRL) << EHCI_INSNREG05_ULPI_REGADD_SHIFT)
|
|
|
|
|
/* Write */
|
|
|
|
|
| (2 << EHCI_INSNREG05_ULPI_OPSEL_SHIFT)
|
|
|
|
|
/* PORTn */
|
|
|
|
|
| ((port + 1) << EHCI_INSNREG05_ULPI_PORTSEL_SHIFT)
|
|
|
|
|
/* start ULPI access*/
|
|
|
|
|
| (1 << EHCI_INSNREG05_ULPI_CONTROL_SHIFT);
|
|
|
|
|
|
2011-03-01 14:38:21 +00:00
|
|
|
ehci_write(hcd->regs, EHCI_INSNREG05_ULPI, reg);
|
2010-07-08 08:33:02 +00:00
|
|
|
|
|
|
|
|
/* Wait for ULPI access completion */
|
2011-03-01 14:38:21 +00:00
|
|
|
while ((ehci_read(hcd->regs, EHCI_INSNREG05_ULPI)
|
2010-07-08 08:33:02 +00:00
|
|
|
& (1 << EHCI_INSNREG05_ULPI_CONTROL_SHIFT))) {
|
|
|
|
|
cpu_relax();
|
|
|
|
|
|
|
|
|
|
if (time_after(jiffies, timeout)) {
|
2012-07-13 09:25:24 +00:00
|
|
|
dev_dbg(hcd->self.controller,
|
|
|
|
|
"phy reset operation timed out\n");
|
2010-07-08 08:33:02 +00:00
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2012-07-09 19:55:14 +00:00
|
|
|
static int omap_ehci_init(struct usb_hcd *hcd)
|
|
|
|
|
{
|
|
|
|
|
struct ehci_hcd *ehci = hcd_to_ehci(hcd);
|
|
|
|
|
int rc;
|
|
|
|
|
struct ehci_hcd_omap_platform_data *pdata;
|
|
|
|
|
|
|
|
|
|
pdata = hcd->self.controller->platform_data;
|
MFD bits for the 3.6 merge window.
We have support for a few new drivers:
- Samsung s2mps11
- Wolfson Microelectronics wm5102 and wm5110
- Marvell 88PM800 and 88PM805
- TI twl6041
We also have our regular driver improvements:
- Device tree and IRQ domain support for STE AB8500
- Regmap and devm_* API conversion for TI tps6586x
- Device tree support for Samsung max77686
- devm_* API conversion for STE AB3100
Besides that, quite a lot of fixing and cleanup for mc13xxx, tps65910,
tps65090, da9052 and twl-core.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQIcBAABAgAGBQJQFpGVAAoJEIqAPN1PVmxKFNoP/1dkYngrxxV6cxdyLJ74APhG
lVKPgaDxQhdgfwCZJmMeZK1UphZo80cWnEXG6sTHZUEQdTaslSJu5SuPfUM+fo7e
52/dU0nx0ZE04pwPQLHbidS4TmHlbLg9oM2kmIf9RO5rg34GodwVgRL/4+k1qvhz
aWYJt9erFhQOpqaSX66mXHSuhvzHypbcE7d2B2Ykmh3NoYiH2w9H9KmIbbb+ZLq8
+Bp/i5Ys/vfooo+8IE2w6KZfIzMwsmmtWjjr/38yuQJaKZCh/zn23DM9HsdrVf++
RzfniRF4YBxmeKi7zi8MFIYys8filTCXA9dXbGSAKCuUCT37yZRnUxTeN1bn7Bux
A7KRpG7pUKQKVKqCTndvK5LcQKlT33XyW2ZzV1wVWX2JkCJ+gilPeykb8IabNvGX
nIp0STEGR/WdCLEAKo8pJF7Usn0RuUzAug02SG/mQ6dpnLoZqp0Od5W7gRhT7M7h
hXr/xKJ6cG5YwicpAdy5kJJ0dRgQrtaHwxrF0B68AXZ7CmAtkPuEGCYhUCFnGQUH
XJ0CodAqqVBRyYiQS4zIpIh2nqhIdsgv4OC1+kVLbubQk+PR88zG9Jvg6i1HQi/A
OHi7N5Wite3YUrs3sBzDKnEc/Il2YRhVaz2SLVNfZR0PS7hywHN3rK/tVFINTgei
jNEz1H6hu7ToNLfs0UzP
=c28c
-----END PGP SIGNATURE-----
Merge tag 'mfd-3.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
Pull MFD bits from Samuel Ortiz:
"We have support for a few new drivers:
- Samsung s2mps11
- Wolfson Microelectronics wm5102 and wm5110
- Marvell 88PM800 and 88PM805
- TI twl6041
We also have our regular driver improvements:
- Device tree and IRQ domain support for STE AB8500
- Regmap and devm_* API conversion for TI tps6586x
- Device tree support for Samsung max77686
- devm_* API conversion for STE AB3100
Besides that, quite a lot of fixing and cleanup for mc13xxx, tps65910,
tps65090, da9052 and twl-core."
Fix up mostly trivial conflicts, with the exception of
drivers/usb/host/ehci-omap.c in particular, which had some
re-organization of the reset sequence (commit 1a49e2ac9651: "EHCI:
centralize controller initialization") that clashed with commit
2761a6394516 ("mfd: USB: Fix the omap-usb EHCI ULPI PHY reset fix
issues").
In particular, commit 2761a6394516 moved the usb_add_hcd() to the
*middle* of the reset sequence, which clashes fairly badly with the
reset sequence re-organization (although it could have been done inside
the new omap_ehci_init() function).
I left that part of commit 2761a6394516 just undone.
* tag 'mfd-3.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (110 commits)
mfd: Ensure AB8500 platform data is passed through db8500-prcmu to MFD Core
mfd: Arizone core should select MFD_CORE
mfd: Fix arizona-irq.c build by selecting REGMAP_IRQ
mfd: Add debug trace on entering and leaving arizone runtime suspend
mfd: Correct tps65090 cell names
mfd: Remove gpio support from tps6586x core driver
ARM: tegra: defconfig: Enable tps6586x gpio
gpio: tps6586x: Add gpio support through platform driver
mfd: Cache tps6586x register through regmap
mfd: Use regmap for tps6586x register access.
mfd: Use devm managed resources for tps6586x
input: Add onkey support for 88PM80X PMIC
mfd: Add support for twl6041
mfd: Fix twl6040 revision information
mfd: Matches should be NULL when populate anatop child devices
input: ab8500-ponkey: Create AB8500 domain IRQ mapping
mfd: Add missing out of memory check for pcf50633
Documentation: Describe the AB8500 Device Tree bindings
mfd: Add tps65910 32-kHz-crystal-input init
mfd: Drop modifying mc13xxx driver's id_table in probe
...
2012-07-30 19:41:17 +00:00
|
|
|
|
|
|
|
|
/* Hold PHYs in reset while initializing EHCI controller */
|
2012-07-09 19:55:14 +00:00
|
|
|
if (pdata->phy_reset) {
|
|
|
|
|
if (gpio_is_valid(pdata->reset_gpio_port[0]))
|
MFD bits for the 3.6 merge window.
We have support for a few new drivers:
- Samsung s2mps11
- Wolfson Microelectronics wm5102 and wm5110
- Marvell 88PM800 and 88PM805
- TI twl6041
We also have our regular driver improvements:
- Device tree and IRQ domain support for STE AB8500
- Regmap and devm_* API conversion for TI tps6586x
- Device tree support for Samsung max77686
- devm_* API conversion for STE AB3100
Besides that, quite a lot of fixing and cleanup for mc13xxx, tps65910,
tps65090, da9052 and twl-core.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQIcBAABAgAGBQJQFpGVAAoJEIqAPN1PVmxKFNoP/1dkYngrxxV6cxdyLJ74APhG
lVKPgaDxQhdgfwCZJmMeZK1UphZo80cWnEXG6sTHZUEQdTaslSJu5SuPfUM+fo7e
52/dU0nx0ZE04pwPQLHbidS4TmHlbLg9oM2kmIf9RO5rg34GodwVgRL/4+k1qvhz
aWYJt9erFhQOpqaSX66mXHSuhvzHypbcE7d2B2Ykmh3NoYiH2w9H9KmIbbb+ZLq8
+Bp/i5Ys/vfooo+8IE2w6KZfIzMwsmmtWjjr/38yuQJaKZCh/zn23DM9HsdrVf++
RzfniRF4YBxmeKi7zi8MFIYys8filTCXA9dXbGSAKCuUCT37yZRnUxTeN1bn7Bux
A7KRpG7pUKQKVKqCTndvK5LcQKlT33XyW2ZzV1wVWX2JkCJ+gilPeykb8IabNvGX
nIp0STEGR/WdCLEAKo8pJF7Usn0RuUzAug02SG/mQ6dpnLoZqp0Od5W7gRhT7M7h
hXr/xKJ6cG5YwicpAdy5kJJ0dRgQrtaHwxrF0B68AXZ7CmAtkPuEGCYhUCFnGQUH
XJ0CodAqqVBRyYiQS4zIpIh2nqhIdsgv4OC1+kVLbubQk+PR88zG9Jvg6i1HQi/A
OHi7N5Wite3YUrs3sBzDKnEc/Il2YRhVaz2SLVNfZR0PS7hywHN3rK/tVFINTgei
jNEz1H6hu7ToNLfs0UzP
=c28c
-----END PGP SIGNATURE-----
Merge tag 'mfd-3.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
Pull MFD bits from Samuel Ortiz:
"We have support for a few new drivers:
- Samsung s2mps11
- Wolfson Microelectronics wm5102 and wm5110
- Marvell 88PM800 and 88PM805
- TI twl6041
We also have our regular driver improvements:
- Device tree and IRQ domain support for STE AB8500
- Regmap and devm_* API conversion for TI tps6586x
- Device tree support for Samsung max77686
- devm_* API conversion for STE AB3100
Besides that, quite a lot of fixing and cleanup for mc13xxx, tps65910,
tps65090, da9052 and twl-core."
Fix up mostly trivial conflicts, with the exception of
drivers/usb/host/ehci-omap.c in particular, which had some
re-organization of the reset sequence (commit 1a49e2ac9651: "EHCI:
centralize controller initialization") that clashed with commit
2761a6394516 ("mfd: USB: Fix the omap-usb EHCI ULPI PHY reset fix
issues").
In particular, commit 2761a6394516 moved the usb_add_hcd() to the
*middle* of the reset sequence, which clashes fairly badly with the
reset sequence re-organization (although it could have been done inside
the new omap_ehci_init() function).
I left that part of commit 2761a6394516 just undone.
* tag 'mfd-3.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (110 commits)
mfd: Ensure AB8500 platform data is passed through db8500-prcmu to MFD Core
mfd: Arizone core should select MFD_CORE
mfd: Fix arizona-irq.c build by selecting REGMAP_IRQ
mfd: Add debug trace on entering and leaving arizone runtime suspend
mfd: Correct tps65090 cell names
mfd: Remove gpio support from tps6586x core driver
ARM: tegra: defconfig: Enable tps6586x gpio
gpio: tps6586x: Add gpio support through platform driver
mfd: Cache tps6586x register through regmap
mfd: Use regmap for tps6586x register access.
mfd: Use devm managed resources for tps6586x
input: Add onkey support for 88PM80X PMIC
mfd: Add support for twl6041
mfd: Fix twl6040 revision information
mfd: Matches should be NULL when populate anatop child devices
input: ab8500-ponkey: Create AB8500 domain IRQ mapping
mfd: Add missing out of memory check for pcf50633
Documentation: Describe the AB8500 Device Tree bindings
mfd: Add tps65910 32-kHz-crystal-input init
mfd: Drop modifying mc13xxx driver's id_table in probe
...
2012-07-30 19:41:17 +00:00
|
|
|
gpio_set_value_cansleep(pdata->reset_gpio_port[0], 0);
|
2012-07-09 19:55:14 +00:00
|
|
|
|
|
|
|
|
if (gpio_is_valid(pdata->reset_gpio_port[1]))
|
MFD bits for the 3.6 merge window.
We have support for a few new drivers:
- Samsung s2mps11
- Wolfson Microelectronics wm5102 and wm5110
- Marvell 88PM800 and 88PM805
- TI twl6041
We also have our regular driver improvements:
- Device tree and IRQ domain support for STE AB8500
- Regmap and devm_* API conversion for TI tps6586x
- Device tree support for Samsung max77686
- devm_* API conversion for STE AB3100
Besides that, quite a lot of fixing and cleanup for mc13xxx, tps65910,
tps65090, da9052 and twl-core.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQIcBAABAgAGBQJQFpGVAAoJEIqAPN1PVmxKFNoP/1dkYngrxxV6cxdyLJ74APhG
lVKPgaDxQhdgfwCZJmMeZK1UphZo80cWnEXG6sTHZUEQdTaslSJu5SuPfUM+fo7e
52/dU0nx0ZE04pwPQLHbidS4TmHlbLg9oM2kmIf9RO5rg34GodwVgRL/4+k1qvhz
aWYJt9erFhQOpqaSX66mXHSuhvzHypbcE7d2B2Ykmh3NoYiH2w9H9KmIbbb+ZLq8
+Bp/i5Ys/vfooo+8IE2w6KZfIzMwsmmtWjjr/38yuQJaKZCh/zn23DM9HsdrVf++
RzfniRF4YBxmeKi7zi8MFIYys8filTCXA9dXbGSAKCuUCT37yZRnUxTeN1bn7Bux
A7KRpG7pUKQKVKqCTndvK5LcQKlT33XyW2ZzV1wVWX2JkCJ+gilPeykb8IabNvGX
nIp0STEGR/WdCLEAKo8pJF7Usn0RuUzAug02SG/mQ6dpnLoZqp0Od5W7gRhT7M7h
hXr/xKJ6cG5YwicpAdy5kJJ0dRgQrtaHwxrF0B68AXZ7CmAtkPuEGCYhUCFnGQUH
XJ0CodAqqVBRyYiQS4zIpIh2nqhIdsgv4OC1+kVLbubQk+PR88zG9Jvg6i1HQi/A
OHi7N5Wite3YUrs3sBzDKnEc/Il2YRhVaz2SLVNfZR0PS7hywHN3rK/tVFINTgei
jNEz1H6hu7ToNLfs0UzP
=c28c
-----END PGP SIGNATURE-----
Merge tag 'mfd-3.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
Pull MFD bits from Samuel Ortiz:
"We have support for a few new drivers:
- Samsung s2mps11
- Wolfson Microelectronics wm5102 and wm5110
- Marvell 88PM800 and 88PM805
- TI twl6041
We also have our regular driver improvements:
- Device tree and IRQ domain support for STE AB8500
- Regmap and devm_* API conversion for TI tps6586x
- Device tree support for Samsung max77686
- devm_* API conversion for STE AB3100
Besides that, quite a lot of fixing and cleanup for mc13xxx, tps65910,
tps65090, da9052 and twl-core."
Fix up mostly trivial conflicts, with the exception of
drivers/usb/host/ehci-omap.c in particular, which had some
re-organization of the reset sequence (commit 1a49e2ac9651: "EHCI:
centralize controller initialization") that clashed with commit
2761a6394516 ("mfd: USB: Fix the omap-usb EHCI ULPI PHY reset fix
issues").
In particular, commit 2761a6394516 moved the usb_add_hcd() to the
*middle* of the reset sequence, which clashes fairly badly with the
reset sequence re-organization (although it could have been done inside
the new omap_ehci_init() function).
I left that part of commit 2761a6394516 just undone.
* tag 'mfd-3.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (110 commits)
mfd: Ensure AB8500 platform data is passed through db8500-prcmu to MFD Core
mfd: Arizone core should select MFD_CORE
mfd: Fix arizona-irq.c build by selecting REGMAP_IRQ
mfd: Add debug trace on entering and leaving arizone runtime suspend
mfd: Correct tps65090 cell names
mfd: Remove gpio support from tps6586x core driver
ARM: tegra: defconfig: Enable tps6586x gpio
gpio: tps6586x: Add gpio support through platform driver
mfd: Cache tps6586x register through regmap
mfd: Use regmap for tps6586x register access.
mfd: Use devm managed resources for tps6586x
input: Add onkey support for 88PM80X PMIC
mfd: Add support for twl6041
mfd: Fix twl6040 revision information
mfd: Matches should be NULL when populate anatop child devices
input: ab8500-ponkey: Create AB8500 domain IRQ mapping
mfd: Add missing out of memory check for pcf50633
Documentation: Describe the AB8500 Device Tree bindings
mfd: Add tps65910 32-kHz-crystal-input init
mfd: Drop modifying mc13xxx driver's id_table in probe
...
2012-07-30 19:41:17 +00:00
|
|
|
gpio_set_value_cansleep(pdata->reset_gpio_port[1], 0);
|
2012-07-09 19:55:14 +00:00
|
|
|
|
|
|
|
|
/* Hold the PHY in RESET for enough time till DIR is high */
|
|
|
|
|
udelay(10);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Soft reset the PHY using PHY reset command over ULPI */
|
|
|
|
|
if (pdata->port_mode[0] == OMAP_EHCI_PORT_MODE_PHY)
|
2012-07-13 09:25:24 +00:00
|
|
|
omap_ehci_soft_phy_reset(hcd, 0);
|
2012-07-09 19:55:14 +00:00
|
|
|
if (pdata->port_mode[1] == OMAP_EHCI_PORT_MODE_PHY)
|
2012-07-13 09:25:24 +00:00
|
|
|
omap_ehci_soft_phy_reset(hcd, 1);
|
2012-07-09 19:55:14 +00:00
|
|
|
|
|
|
|
|
/* we know this is the memory we want, no need to ioremap again */
|
|
|
|
|
ehci->caps = hcd->regs;
|
|
|
|
|
|
|
|
|
|
rc = ehci_setup(hcd);
|
|
|
|
|
|
|
|
|
|
if (pdata->phy_reset) {
|
|
|
|
|
/* Hold the PHY in RESET for enough time till
|
|
|
|
|
* PHY is settled and ready
|
|
|
|
|
*/
|
|
|
|
|
udelay(10);
|
|
|
|
|
|
|
|
|
|
if (gpio_is_valid(pdata->reset_gpio_port[0]))
|
|
|
|
|
gpio_set_value_cansleep(pdata->reset_gpio_port[0], 1);
|
|
|
|
|
|
|
|
|
|
if (gpio_is_valid(pdata->reset_gpio_port[1]))
|
|
|
|
|
gpio_set_value_cansleep(pdata->reset_gpio_port[1], 1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* root ports should always stay powered */
|
|
|
|
|
ehci_port_power(ehci, 1);
|
|
|
|
|
|
|
|
|
|
return rc;
|
|
|
|
|
}
|
|
|
|
|
|
2012-06-05 12:34:27 +00:00
|
|
|
static int omap_ehci_hub_control(
|
|
|
|
|
struct usb_hcd *hcd,
|
|
|
|
|
u16 typeReq,
|
|
|
|
|
u16 wValue,
|
|
|
|
|
u16 wIndex,
|
|
|
|
|
char *buf,
|
|
|
|
|
u16 wLength
|
|
|
|
|
)
|
|
|
|
|
{
|
|
|
|
|
struct ehci_hcd *ehci = hcd_to_ehci(hcd);
|
|
|
|
|
u32 __iomem *status_reg = &ehci->regs->port_status[
|
|
|
|
|
(wIndex & 0xff) - 1];
|
|
|
|
|
u32 temp;
|
|
|
|
|
unsigned long flags;
|
|
|
|
|
int retval = 0;
|
|
|
|
|
|
|
|
|
|
spin_lock_irqsave(&ehci->lock, flags);
|
|
|
|
|
|
|
|
|
|
if (typeReq == SetPortFeature && wValue == USB_PORT_FEAT_SUSPEND) {
|
|
|
|
|
temp = ehci_readl(ehci, status_reg);
|
|
|
|
|
if ((temp & PORT_PE) == 0 || (temp & PORT_RESET) != 0) {
|
|
|
|
|
retval = -EPIPE;
|
|
|
|
|
goto done;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
temp &= ~PORT_WKCONN_E;
|
|
|
|
|
temp |= PORT_WKDISC_E | PORT_WKOC_E;
|
|
|
|
|
ehci_writel(ehci, temp | PORT_SUSPEND, status_reg);
|
|
|
|
|
|
|
|
|
|
omap_ehci_erratum_i693(ehci);
|
|
|
|
|
|
|
|
|
|
set_bit((wIndex & 0xff) - 1, &ehci->suspended_ports);
|
|
|
|
|
goto done;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
spin_unlock_irqrestore(&ehci->lock, flags);
|
|
|
|
|
|
|
|
|
|
/* Handle the hub control events here */
|
|
|
|
|
return ehci_hub_control(hcd, typeReq, wValue, wIndex, buf, wLength);
|
|
|
|
|
done:
|
|
|
|
|
spin_unlock_irqrestore(&ehci->lock, flags);
|
|
|
|
|
return retval;
|
|
|
|
|
}
|
|
|
|
|
|
2011-07-28 14:59:53 +00:00
|
|
|
static void disable_put_regulator(
|
|
|
|
|
struct ehci_hcd_omap_platform_data *pdata)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
for (i = 0 ; i < OMAP3_HS_USB_PORTS ; i++) {
|
|
|
|
|
if (pdata->regulator[i]) {
|
|
|
|
|
regulator_disable(pdata->regulator[i]);
|
|
|
|
|
regulator_put(pdata->regulator[i]);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2009-10-14 08:44:14 +00:00
|
|
|
|
|
|
|
|
/* configure so an HC device and id are always provided */
|
|
|
|
|
/* always called with process context; sleeping is OK */
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* ehci_hcd_omap_probe - initialize TI-based HCDs
|
|
|
|
|
*
|
|
|
|
|
* Allocates basic resources for this USB host controller, and
|
|
|
|
|
* then invokes the start() method for the HCD associated with it
|
|
|
|
|
* through the hotplug entry's driver_data.
|
|
|
|
|
*/
|
|
|
|
|
static int ehci_hcd_omap_probe(struct platform_device *pdev)
|
|
|
|
|
{
|
2011-03-01 14:38:21 +00:00
|
|
|
struct device *dev = &pdev->dev;
|
|
|
|
|
struct ehci_hcd_omap_platform_data *pdata = dev->platform_data;
|
|
|
|
|
struct resource *res;
|
|
|
|
|
struct usb_hcd *hcd;
|
|
|
|
|
void __iomem *regs;
|
|
|
|
|
int ret = -ENODEV;
|
|
|
|
|
int irq;
|
2011-04-21 14:22:43 +00:00
|
|
|
int i;
|
|
|
|
|
char supply[7];
|
2009-10-14 08:44:14 +00:00
|
|
|
|
2011-03-01 14:38:21 +00:00
|
|
|
if (usb_disabled())
|
|
|
|
|
return -ENODEV;
|
2009-10-14 08:44:14 +00:00
|
|
|
|
2011-03-01 14:38:21 +00:00
|
|
|
if (!dev->parent) {
|
|
|
|
|
dev_err(dev, "Missing parent device\n");
|
|
|
|
|
return -ENODEV;
|
2009-10-14 08:44:14 +00:00
|
|
|
}
|
|
|
|
|
|
2011-03-01 14:38:21 +00:00
|
|
|
irq = platform_get_irq_byname(pdev, "ehci-irq");
|
|
|
|
|
if (irq < 0) {
|
|
|
|
|
dev_err(dev, "EHCI irq failed\n");
|
|
|
|
|
return -ENODEV;
|
|
|
|
|
}
|
2009-10-14 08:44:14 +00:00
|
|
|
|
2011-03-01 14:38:21 +00:00
|
|
|
res = platform_get_resource_byname(pdev,
|
|
|
|
|
IORESOURCE_MEM, "ehci");
|
|
|
|
|
if (!res) {
|
|
|
|
|
dev_err(dev, "UHH EHCI get resource failed\n");
|
|
|
|
|
return -ENODEV;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
regs = ioremap(res->start, resource_size(res));
|
|
|
|
|
if (!regs) {
|
|
|
|
|
dev_err(dev, "UHH EHCI ioremap failed\n");
|
|
|
|
|
return -ENOMEM;
|
2009-10-14 08:44:14 +00:00
|
|
|
}
|
|
|
|
|
|
2011-03-01 14:38:21 +00:00
|
|
|
hcd = usb_create_hcd(&ehci_omap_hc_driver, dev,
|
|
|
|
|
dev_name(dev));
|
2009-10-14 08:44:14 +00:00
|
|
|
if (!hcd) {
|
2011-03-01 14:38:21 +00:00
|
|
|
dev_err(dev, "failed to create hcd with err %d\n", ret);
|
2009-10-14 08:44:14 +00:00
|
|
|
ret = -ENOMEM;
|
2011-03-01 14:38:21 +00:00
|
|
|
goto err_io;
|
2009-10-14 08:44:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
hcd->rsrc_start = res->start;
|
|
|
|
|
hcd->rsrc_len = resource_size(res);
|
2011-03-01 14:38:21 +00:00
|
|
|
hcd->regs = regs;
|
2009-10-14 08:44:14 +00:00
|
|
|
|
2011-04-21 14:22:43 +00:00
|
|
|
/* get ehci regulator and enable */
|
|
|
|
|
for (i = 0 ; i < OMAP3_HS_USB_PORTS ; i++) {
|
|
|
|
|
if (pdata->port_mode[i] != OMAP_EHCI_PORT_MODE_PHY) {
|
|
|
|
|
pdata->regulator[i] = NULL;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
snprintf(supply, sizeof(supply), "hsusb%d", i);
|
|
|
|
|
pdata->regulator[i] = regulator_get(dev, supply);
|
|
|
|
|
if (IS_ERR(pdata->regulator[i])) {
|
|
|
|
|
pdata->regulator[i] = NULL;
|
|
|
|
|
dev_dbg(dev,
|
|
|
|
|
"failed to get ehci port%d regulator\n", i);
|
|
|
|
|
} else {
|
|
|
|
|
regulator_enable(pdata->regulator[i]);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2011-10-11 07:52:11 +00:00
|
|
|
pm_runtime_enable(dev);
|
|
|
|
|
pm_runtime_get_sync(dev);
|
2009-10-14 08:44:14 +00:00
|
|
|
|
2011-03-01 14:38:21 +00:00
|
|
|
/*
|
|
|
|
|
* An undocumented "feature" in the OMAP3 EHCI controller,
|
|
|
|
|
* causes suspended ports to be taken out of suspend when
|
|
|
|
|
* the USBCMD.Run/Stop bit is cleared (for example when
|
|
|
|
|
* we do ehci_bus_suspend).
|
|
|
|
|
* This breaks suspend-resume if the root-hub is allowed
|
|
|
|
|
* to suspend. Writing 1 to this undocumented register bit
|
|
|
|
|
* disables this feature and restores normal behavior.
|
|
|
|
|
*/
|
|
|
|
|
ehci_write(regs, EHCI_INSNREG04,
|
|
|
|
|
EHCI_INSNREG04_DISABLE_UNSUSPEND);
|
2009-10-14 08:44:14 +00:00
|
|
|
|
2012-05-04 11:24:47 +00:00
|
|
|
ret = usb_add_hcd(hcd, irq, IRQF_SHARED);
|
|
|
|
|
if (ret) {
|
|
|
|
|
dev_err(dev, "failed to add hcd with err %d\n", ret);
|
2012-06-21 10:44:31 +00:00
|
|
|
goto err_pm_runtime;
|
2012-05-04 11:24:47 +00:00
|
|
|
}
|
|
|
|
|
|
2012-06-05 12:34:27 +00:00
|
|
|
/* get clocks */
|
|
|
|
|
utmi_p1_fck = clk_get(dev, "utmi_p1_gfclk");
|
|
|
|
|
if (IS_ERR(utmi_p1_fck)) {
|
|
|
|
|
ret = PTR_ERR(utmi_p1_fck);
|
|
|
|
|
dev_err(dev, "utmi_p1_gfclk failed error:%d\n", ret);
|
|
|
|
|
goto err_add_hcd;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
xclk60mhsp1_ck = clk_get(dev, "xclk60mhsp1_ck");
|
|
|
|
|
if (IS_ERR(xclk60mhsp1_ck)) {
|
|
|
|
|
ret = PTR_ERR(xclk60mhsp1_ck);
|
|
|
|
|
dev_err(dev, "xclk60mhsp1_ck failed error:%d\n", ret);
|
|
|
|
|
goto err_utmi_p1_fck;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
utmi_p2_fck = clk_get(dev, "utmi_p2_gfclk");
|
|
|
|
|
if (IS_ERR(utmi_p2_fck)) {
|
|
|
|
|
ret = PTR_ERR(utmi_p2_fck);
|
|
|
|
|
dev_err(dev, "utmi_p2_gfclk failed error:%d\n", ret);
|
|
|
|
|
goto err_xclk60mhsp1_ck;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
xclk60mhsp2_ck = clk_get(dev, "xclk60mhsp2_ck");
|
|
|
|
|
if (IS_ERR(xclk60mhsp2_ck)) {
|
|
|
|
|
ret = PTR_ERR(xclk60mhsp2_ck);
|
|
|
|
|
dev_err(dev, "xclk60mhsp2_ck failed error:%d\n", ret);
|
|
|
|
|
goto err_utmi_p2_fck;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
usbhost_p1_fck = clk_get(dev, "usb_host_hs_utmi_p1_clk");
|
|
|
|
|
if (IS_ERR(usbhost_p1_fck)) {
|
|
|
|
|
ret = PTR_ERR(usbhost_p1_fck);
|
|
|
|
|
dev_err(dev, "usbhost_p1_fck failed error:%d\n", ret);
|
|
|
|
|
goto err_xclk60mhsp2_ck;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
usbhost_p2_fck = clk_get(dev, "usb_host_hs_utmi_p2_clk");
|
|
|
|
|
if (IS_ERR(usbhost_p2_fck)) {
|
|
|
|
|
ret = PTR_ERR(usbhost_p2_fck);
|
|
|
|
|
dev_err(dev, "usbhost_p2_fck failed error:%d\n", ret);
|
|
|
|
|
goto err_usbhost_p1_fck;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
init_60m_fclk = clk_get(dev, "init_60m_fclk");
|
|
|
|
|
if (IS_ERR(init_60m_fclk)) {
|
|
|
|
|
ret = PTR_ERR(init_60m_fclk);
|
|
|
|
|
dev_err(dev, "init_60m_fclk failed error:%d\n", ret);
|
|
|
|
|
goto err_usbhost_p2_fck;
|
|
|
|
|
}
|
|
|
|
|
|
2009-10-14 08:44:14 +00:00
|
|
|
return 0;
|
|
|
|
|
|
2012-06-05 12:34:27 +00:00
|
|
|
err_usbhost_p2_fck:
|
|
|
|
|
clk_put(usbhost_p2_fck);
|
|
|
|
|
|
|
|
|
|
err_usbhost_p1_fck:
|
|
|
|
|
clk_put(usbhost_p1_fck);
|
|
|
|
|
|
|
|
|
|
err_xclk60mhsp2_ck:
|
|
|
|
|
clk_put(xclk60mhsp2_ck);
|
|
|
|
|
|
|
|
|
|
err_utmi_p2_fck:
|
|
|
|
|
clk_put(utmi_p2_fck);
|
|
|
|
|
|
|
|
|
|
err_xclk60mhsp1_ck:
|
|
|
|
|
clk_put(xclk60mhsp1_ck);
|
|
|
|
|
|
|
|
|
|
err_utmi_p1_fck:
|
|
|
|
|
clk_put(utmi_p1_fck);
|
|
|
|
|
|
2009-10-14 08:44:14 +00:00
|
|
|
err_add_hcd:
|
2012-06-21 10:44:31 +00:00
|
|
|
usb_remove_hcd(hcd);
|
|
|
|
|
|
|
|
|
|
err_pm_runtime:
|
2011-07-28 14:59:53 +00:00
|
|
|
disable_put_regulator(pdata);
|
2011-10-11 07:52:11 +00:00
|
|
|
pm_runtime_put_sync(dev);
|
2012-06-21 10:44:31 +00:00
|
|
|
usb_put_hcd(hcd);
|
2009-10-14 08:44:14 +00:00
|
|
|
|
2011-03-01 14:38:21 +00:00
|
|
|
err_io:
|
2011-07-28 14:59:53 +00:00
|
|
|
iounmap(regs);
|
2009-10-14 08:44:14 +00:00
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* ehci_hcd_omap_remove - shutdown processing for EHCI HCDs
|
|
|
|
|
* @pdev: USB Host Controller being removed
|
|
|
|
|
*
|
|
|
|
|
* Reverses the effect of usb_ehci_hcd_omap_probe(), first invoking
|
|
|
|
|
* the HCD's stop() method. It is always called from a thread
|
|
|
|
|
* context, normally "rmmod", "apmd", or something similar.
|
|
|
|
|
*/
|
|
|
|
|
static int ehci_hcd_omap_remove(struct platform_device *pdev)
|
|
|
|
|
{
|
2012-03-19 06:42:47 +00:00
|
|
|
struct device *dev = &pdev->dev;
|
|
|
|
|
struct usb_hcd *hcd = dev_get_drvdata(dev);
|
|
|
|
|
struct ehci_hcd_omap_platform_data *pdata = dev->platform_data;
|
2009-10-14 08:44:14 +00:00
|
|
|
|
|
|
|
|
usb_remove_hcd(hcd);
|
2011-07-28 14:59:53 +00:00
|
|
|
disable_put_regulator(dev->platform_data);
|
|
|
|
|
iounmap(hcd->regs);
|
2009-10-14 08:44:14 +00:00
|
|
|
usb_put_hcd(hcd);
|
2012-06-05 12:34:27 +00:00
|
|
|
|
|
|
|
|
clk_put(utmi_p1_fck);
|
|
|
|
|
clk_put(utmi_p2_fck);
|
|
|
|
|
clk_put(xclk60mhsp1_ck);
|
|
|
|
|
clk_put(xclk60mhsp2_ck);
|
|
|
|
|
clk_put(usbhost_p1_fck);
|
|
|
|
|
clk_put(usbhost_p2_fck);
|
|
|
|
|
clk_put(init_60m_fclk);
|
|
|
|
|
|
2011-10-11 07:52:11 +00:00
|
|
|
pm_runtime_put_sync(dev);
|
|
|
|
|
pm_runtime_disable(dev);
|
|
|
|
|
|
2012-03-19 06:42:47 +00:00
|
|
|
if (pdata->phy_reset) {
|
|
|
|
|
if (gpio_is_valid(pdata->reset_gpio_port[0]))
|
|
|
|
|
gpio_free(pdata->reset_gpio_port[0]);
|
|
|
|
|
|
|
|
|
|
if (gpio_is_valid(pdata->reset_gpio_port[1]))
|
|
|
|
|
gpio_free(pdata->reset_gpio_port[1]);
|
|
|
|
|
}
|
2009-10-14 08:44:14 +00:00
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void ehci_hcd_omap_shutdown(struct platform_device *pdev)
|
|
|
|
|
{
|
2011-03-01 14:38:21 +00:00
|
|
|
struct usb_hcd *hcd = dev_get_drvdata(&pdev->dev);
|
2009-10-14 08:44:14 +00:00
|
|
|
|
|
|
|
|
if (hcd->driver->shutdown)
|
|
|
|
|
hcd->driver->shutdown(hcd);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static struct platform_driver ehci_hcd_omap_driver = {
|
|
|
|
|
.probe = ehci_hcd_omap_probe,
|
|
|
|
|
.remove = ehci_hcd_omap_remove,
|
|
|
|
|
.shutdown = ehci_hcd_omap_shutdown,
|
|
|
|
|
/*.suspend = ehci_hcd_omap_suspend, */
|
|
|
|
|
/*.resume = ehci_hcd_omap_resume, */
|
|
|
|
|
.driver = {
|
|
|
|
|
.name = "ehci-omap",
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
|
|
static const struct hc_driver ehci_omap_hc_driver = {
|
|
|
|
|
.description = hcd_name,
|
|
|
|
|
.product_desc = "OMAP-EHCI Host Controller",
|
|
|
|
|
.hcd_priv_size = sizeof(struct ehci_hcd),
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* generic hardware linkage
|
|
|
|
|
*/
|
|
|
|
|
.irq = ehci_irq,
|
|
|
|
|
.flags = HCD_MEMORY | HCD_USB2,
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* basic lifecycle operations
|
|
|
|
|
*/
|
2012-07-09 19:55:14 +00:00
|
|
|
.reset = omap_ehci_init,
|
2009-10-14 08:44:14 +00:00
|
|
|
.start = ehci_run,
|
|
|
|
|
.stop = ehci_stop,
|
|
|
|
|
.shutdown = ehci_shutdown,
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* managing i/o requests and associated device resources
|
|
|
|
|
*/
|
|
|
|
|
.urb_enqueue = ehci_urb_enqueue,
|
|
|
|
|
.urb_dequeue = ehci_urb_dequeue,
|
|
|
|
|
.endpoint_disable = ehci_endpoint_disable,
|
|
|
|
|
.endpoint_reset = ehci_endpoint_reset,
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* scheduling support
|
|
|
|
|
*/
|
|
|
|
|
.get_frame_number = ehci_get_frame,
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* root hub support
|
|
|
|
|
*/
|
|
|
|
|
.hub_status_data = ehci_hub_status_data,
|
2012-06-05 12:34:27 +00:00
|
|
|
.hub_control = omap_ehci_hub_control,
|
2009-10-14 08:44:14 +00:00
|
|
|
.bus_suspend = ehci_bus_suspend,
|
|
|
|
|
.bus_resume = ehci_bus_resume,
|
|
|
|
|
|
|
|
|
|
.clear_tt_buffer_complete = ehci_clear_tt_buffer_complete,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
MODULE_ALIAS("platform:omap-ehci");
|
|
|
|
|
MODULE_AUTHOR("Texas Instruments, Inc.");
|
|
|
|
|
MODULE_AUTHOR("Felipe Balbi <felipe.balbi@nokia.com>");
|
|
|
|
|
|
