Commit 0aedc008 authored by Anton Vorontsov's avatar Anton Vorontsov Committed by Kumar Gala

powerpc/85xx: Fix P1020RDB boot hang due USB2

Since USB2 is shared with local bus, either local bus or USB2
should be disabled. By default U-Boot enables local bus, so we
have to disable USB2, otherwise kernel hangs:

 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: irq 28, io base 0xffe22000
 fsl-ehci fsl-ehci.0: USB 2.0 started, EHCI 1.00
 hub 1-0:1.0: USB hub found
 hub 1-0:1.0: 1 port detected
 fsl-ehci fsl-ehci.1: Freescale On-Chip EHCI Host Controller
 fsl-ehci fsl-ehci.1: new USB bus registered, assigned bus number 2
 <hangs here>

Note that U-Boot doesn't clear 'status' property when it enables
USB2, so we have to comment out the whole node.

To enable USB2, one can issue
'setenv hwconfig usb2:dr_mode=<host|peripheral>' command at the
U-Boot prompt.
Signed-off-by: default avatarAnton Vorontsov <avorontsov@mvista.com>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent 7541ef78
...@@ -475,6 +475,11 @@ usb@22000 { ...@@ -475,6 +475,11 @@ usb@22000 {
phy_type = "ulpi"; phy_type = "ulpi";
}; };
/* USB2 is shared with localbus, so it must be disabled
by default. We can't put 'status = "disabled";' here
since U-Boot doesn't clear the status property when
it enables USB2. OTOH, U-Boot does create a new node
when there isn't any. So, just comment it out.
usb@23000 { usb@23000 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -484,6 +489,7 @@ usb@23000 { ...@@ -484,6 +489,7 @@ usb@23000 {
interrupts = <46 0x2>; interrupts = <46 0x2>;
phy_type = "ulpi"; phy_type = "ulpi";
}; };
*/
sdhci@2e000 { sdhci@2e000 {
compatible = "fsl,p1020-esdhc", "fsl,esdhc"; compatible = "fsl,p1020-esdhc", "fsl,esdhc";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment