| From d75542263a0b005876d112bbf9ffb23180cc3149 Mon Sep 17 00:00:00 2001 |
| From: Afzal Mohammed <afzal@ti.com> |
| Date: Tue, 6 Nov 2012 20:47:24 +0530 |
| Subject: Revert "usb: musb: dsps: remove explicit NOP device creation" |
| |
| From: Afzal Mohammed <afzal@ti.com> |
| |
| commit d75542263a0b005876d112bbf9ffb23180cc3149 upstream. |
| |
| 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. |
| |
| Signed-off-by: Afzal Mohammed <afzal@ti.com> |
| Signed-off-by: Felipe Balbi <balbi@ti.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/usb/musb/musb_dsps.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/usb/musb/musb_dsps.c |
| +++ b/drivers/usb/musb/musb_dsps.c |
| @@ -377,7 +377,8 @@ static int dsps_musb_init(struct musb *m |
| /* 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; |
