diff options
| author | Afzal Mohammed <afzal@ti.com> | 2012-11-06 15:17:24 (GMT) |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2012-11-09 06:01:54 (GMT) |
| commit | d75542263a0b005876d112bbf9ffb23180cc3149 (patch) | |
| tree | e1eb3207e8408950a24a15e70fdd18d4d91415ac /drivers/usb/musb | |
| parent | baef653a500476ccb2d08cf4bb648c56c0170e21 (diff) | |
| download | linux-d75542263a0b005876d112bbf9ffb23180cc3149.tar.xz | |
Revert "usb: musb: dsps: remove explicit NOP device creation"
This reverts commit d8c3ef256f88b7c6ecd673d03073b5645be9c5e4.
Above mentioned change was made along with multi usb phy change and
adding DT support for nop transceiver. But other two changes did not
make it to mainline. This in effect makes dsps musb wrapper unusable
even for single instance.
Hence revert it so that at least single instance can be supported.
Cc: stable@vger.kernel.org # v3.7
Signed-off-by: Afzal Mohammed <afzal@ti.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/musb')
| -rw-r--r-- | drivers/usb/musb/musb_dsps.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/musb/musb_dsps.c b/drivers/usb/musb/musb_dsps.c index 6053af1..e770f79 100644 --- a/drivers/usb/musb/musb_dsps.c +++ b/drivers/usb/musb/musb_dsps.c @@ -411,7 +411,8 @@ static int dsps_musb_init(struct musb *musb) /* mentor core register starts at offset of 0x400 from musb base */ musb->mregs += wrp->musb_core_offset; - /* Get the NOP PHY */ + /* NOP driver needs change if supporting dual instance */ + usb_nop_xceiv_register(); musb->xceiv = usb_get_phy(USB_PHY_TYPE_USB2); if (IS_ERR_OR_NULL(musb->xceiv)) return -ENODEV; |