Date: | 2014-07-05 05:39:34 (9 years 8 months ago) |
---|---|
Author: | Apelete Seketeli |
Commit: | c5bd3533d1dda60046c52739d4e85e1977d3f33f |
Message: | 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> |
Files: |
drivers/usb/musb/jz4740.c (3 diffs) |
Change Details
drivers/usb/musb/jz4740.c | ||
---|---|---|
19 | 19 | #include <linux/kernel.h> |
20 | 20 | #include <linux/module.h> |
21 | 21 | #include <linux/platform_device.h> |
22 | #include <linux/usb/usb_phy_generic.h> | |
22 | 23 | |
23 | 24 | #include "musb_core.h" |
24 | 25 | |
... | ... | |
80 | 81 | |
81 | 82 | static int jz4740_musb_init(struct musb *musb) |
82 | 83 | { |
84 | usb_phy_generic_register(); | |
83 | 85 | musb->xceiv = usb_get_phy(USB_PHY_TYPE_USB2); |
84 | 86 | if (!musb->xceiv) { |
85 | 87 | pr_err("HS UDC: no transceiver configured\n"); |
... | ... | |
182 | 184 | struct jz4740_glue *glue = platform_get_drvdata(pdev); |
183 | 185 | |
184 | 186 | platform_device_unregister(glue->musb); |
187 | usb_phy_generic_unregister(pdev); | |
185 | 188 | clk_disable_unprepare(glue->clk); |
186 | 189 | |
187 | 190 | return 0; |
Branches:
ben-wpan
ben-wpan-stefan
5396a9238205f20f811ea57898980d3ca82df0b6
jz-2.6.34
jz-2.6.34-rc5
jz-2.6.34-rc6
jz-2.6.34-rc7
jz-2.6.35
jz-2.6.36
jz-2.6.37
jz-2.6.38
jz-2.6.39
jz-3.0
jz-3.1
jz-3.11
jz-3.12
jz-3.13
jz-3.15
jz-3.16
jz-3.18-dt
jz-3.2
jz-3.3
jz-3.4
jz-3.5
jz-3.6
jz-3.6-rc2-pwm
jz-3.9
jz-3.9-clk
jz-3.9-rc8
jz47xx
jz47xx-2.6.38
master
Tags:
od-2011-09-04
od-2011-09-18
v2.6.34-rc5
v2.6.34-rc6
v2.6.34-rc7
v3.9