Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This resolves the conflict in: drivers/usb/host/ehci-fsl.c And picks up loads of xhci bugfixes to make it easier for others to test with. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
- Loading branch information
Showing
62 changed files
with
1,740 additions
and
1,255 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
ST SPEAr SoC USB controllers: | ||
----------------------------- | ||
|
||
EHCI: | ||
----- | ||
|
||
Required properties: | ||
- compatible: "st,spear600-ehci" | ||
- interrupt-parent: Should be the phandle for the interrupt controller | ||
that services interrupts for this device | ||
- interrupts: Should contain the EHCI interrupt | ||
|
||
Example: | ||
|
||
ehci@e1800000 { | ||
compatible = "st,spear600-ehci", "usb-ehci"; | ||
reg = <0xe1800000 0x1000>; | ||
interrupt-parent = <&vic1>; | ||
interrupts = <27>; | ||
}; | ||
|
||
|
||
OHCI: | ||
----- | ||
|
||
Required properties: | ||
- compatible: "st,spear600-ohci" | ||
- interrupt-parent: Should be the phandle for the interrupt controller | ||
that services interrupts for this device | ||
- interrupts: Should contain the OHCI interrupt | ||
|
||
Example: | ||
|
||
ohci@e1900000 { | ||
compatible = "st,spear600-ohci", "usb-ohci"; | ||
reg = <0xe1800000 0x1000>; | ||
interrupt-parent = <&vic1>; | ||
interrupts = <26>; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.