diff options
author | Apelete Seketeli <apelete@seketeli.net> | 2014-07-06 13:58:03 -0400 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2014-07-10 09:36:50 -0400 |
commit | 3d75bd3d0af16c7b8dda13440202fa24769d8e17 (patch) | |
tree | a589e6ff6c352734b0ea0c84d3d0954792eac9b4 | |
parent | b99b406c990def280d64ceb6739ac32001497a90 (diff) |
usb: musb: register nop transceiver driver for jz4740
Following the name change of the NOP transceiver driver in commit
4525bee (usb: phy: rename usb_nop_xceiv to usb_phy_generic), the
transceiver driver was no longer operable under its old name.
Register the transceiver driver before calling usb_get_phy() to make
sure we are noticed by an error message if it is not available.
Signed-off-by: Apelete Seketeli <apelete@seketeli.net>
Signed-off-by: Felipe Balbi <balbi@ti.com>
-rw-r--r-- | drivers/usb/musb/jz4740.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/musb/jz4740.c b/drivers/usb/musb/jz4740.c index 5f30537f1927..d1187290d4e3 100644 --- a/drivers/usb/musb/jz4740.c +++ b/drivers/usb/musb/jz4740.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
20 | #include <linux/module.h> | 20 | #include <linux/module.h> |
21 | #include <linux/platform_device.h> | 21 | #include <linux/platform_device.h> |
22 | #include <linux/usb/usb_phy_generic.h> | ||
22 | 23 | ||
23 | #include "musb_core.h" | 24 | #include "musb_core.h" |
24 | 25 | ||
@@ -80,6 +81,7 @@ static struct musb_hdrc_platform_data jz4740_musb_platform_data = { | |||
80 | 81 | ||
81 | static int jz4740_musb_init(struct musb *musb) | 82 | static int jz4740_musb_init(struct musb *musb) |
82 | { | 83 | { |
84 | usb_phy_generic_register(); | ||
83 | musb->xceiv = usb_get_phy(USB_PHY_TYPE_USB2); | 85 | musb->xceiv = usb_get_phy(USB_PHY_TYPE_USB2); |
84 | if (!musb->xceiv) { | 86 | if (!musb->xceiv) { |
85 | pr_err("HS UDC: no transceiver configured\n"); | 87 | pr_err("HS UDC: no transceiver configured\n"); |
@@ -182,6 +184,7 @@ static int jz4740_remove(struct platform_device *pdev) | |||
182 | struct jz4740_glue *glue = platform_get_drvdata(pdev); | 184 | struct jz4740_glue *glue = platform_get_drvdata(pdev); |
183 | 185 | ||
184 | platform_device_unregister(glue->musb); | 186 | platform_device_unregister(glue->musb); |
187 | usb_phy_generic_unregister(pdev); | ||
185 | clk_disable_unprepare(glue->clk); | 188 | clk_disable_unprepare(glue->clk); |
186 | 189 | ||
187 | return 0; | 190 | return 0; |