Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 7c1029ba17f3d2596b05a6521d438c9bdc09a673

Authored by Anatolij Gustschin
Committed by Greg Kroah-Hartman
1 parent eb614c8b46
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

USB: fsl-mph-dr-of: fix regression on mpc5121e 

fsl-ehci probing fails on mpc5121e:
...
ehci_hcd: USB 2.0 'Enhanced' Host Controller (EHCI) Driver
fsl-ehci fsl-ehci.0: Freescale On-Chip EHCI Host Controller
fsl-ehci fsl-ehci.0: new USB bus registered, assigned bus number 1
fsl-ehci fsl-ehci.0: Could not get controller version
fsl-ehci fsl-ehci.0: can't setup
fsl-ehci fsl-ehci.0: USB bus 1 deregistered
fsl-ehci fsl-ehci.0: init fsl-ehci.0 fail, -22
fsl-ehci: probe of fsl-ehci.0 failed with error -22

Fix it by returning appropriate version info for mpc5121, too.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 1 changed file with 3 additions and 0 deletions Side-by-side Diff

drivers/usb/host/fsl-mph-dr-of.c
Diff comments   View file @ 7c1029b
... ... @@ -142,6 +142,9 @@
142 142 return ver;
143 143 }
144 144  
  145 + if (of_device_is_compatible(np, "fsl,mpc5121-usb2-dr"))
  146 + return FSL_USB_VER_OLD;
  147 +
145 148 if (of_device_is_compatible(np, "fsl-usb2-mph")) {
146 149 if (of_device_is_compatible(np, "fsl-usb2-mph-v1.6"))
147 150 ver = FSL_USB_VER_1_6;