ohci and ehci-platform clks, phy and dt support

Add support for ohci-platform instantiation from devicetree, including optionally getting clks and a phy from devicetree, and enabling / disabling those on power_on / off.

This should allow using ohci-platform from devicetree in various cases. Specifically after this commit it can be used for the ohci controller found on Allwinner sunxi SoCs.

Signed-off-by Hans de Goede <[email protected]>

Acked-by Alan Stern <[email protected]>

Documentation/devicetree/bindings/usb/usb-ohci.txt new file +5 -0

new file mode 100644
index 0000000..f9d6c73
@@ -0,0 +1,22 @@
+USB OHCI controllers
+
+Required properties:
+- compatible : "usb-ohci"
+- reg : ohci controller register range (address and length)

Hello.

Quoted 10 lines · Hans de Goede

Add support for ohci-platform instantiation from devicetree, including optionally getting clks and a phy from devicetree, and enabling / disabling those on power_on / off.

This should allow using ohci-platform from devicetree in various cases. Specifically after this commit it can be used for the ohci controller found on Allwinner sunxi SoCs.

Signed-off-by Hans de Goede <[email protected]>

Acked-by Alan Stern <[email protected]>

[...]

Have only found time to fully read the patches just now...

Quoted 11 lines

Documentation/devicetree/bindings/usb/usb-ohci.txt new file +5 -0

new file mode 100644
index 0000000..f9d6c73
@@ -0,0 +1,22 @@
+USB OHCI controllers
+
+Required properties:
+- compatible : "usb-ohci"
+- reg : ohci controller register range (address and length)

Documentation/devicetree/bindings/usb/usb-ohci.txt line 15

Quoted 10 lines

Documentation/devicetree/bindings/usb/usb-ohci.txt new file +10 -0

+- interrupts : ohci controller interrupt
+
+Optional properties:
+- clocks : a list of phandle + clock specifier pairs
+- phys : phandle + phy specifier pair
+- phy-names : "usb"
+
+Example:
+
+    ohci0: ohci at 0x01c14400 {

    Two minor nits: there should be no "0x" in the address part of the node name. And according to ePAPR [1], "the name of a node should be somewhat generic, reflecting the function of the device and not its precise programming model. If appropriate, the name should be one of the following choices:

[...]
- usb".

Same comments for "usb-ehci" binding.

Currently ehci-platform is only used in combination with devicetree when used with some Via socs. By extending it to (optionally) get clks and a phy from devicetree, and enabling / disabling those on power_on / off, it can be used more generically. Specifically after this commit it can be used for the ehci controller on Allwinner sunxi SoCs.

Since ehci-platform is intended to handle any generic enough non pci ehci device, add a "usb-ehci" compatibility string.

There already is a usb-ehci device-tree bindings document, update this with clks and phy bindings info.

Although actually quite generic so far the via,vt8500 compatibilty string had its own bindings document. Somehow we even ended up with 2 of them. Since these provide no extra information over the generic usb-ehci documentation, this patch removes them.

The ehci-ppc-of.c driver also claims the usb-ehci compatibility string, even though it mostly is ibm,usb-ehci-440epx specific. ehci-platform.c is not needed on ppc platforms, so add a !PPC_OF dependency to it to avoid 2 drivers claiming the same compatibility string getting build on ppc.

Signed-off-by Hans de Goede <[email protected]>

Acked-by Alan Stern <[email protected]>

---
 Documentation/devicetree/bindings/usb/usb-ehci.txt |  25 +++-
 .../devicetree/bindings/usb/via,vt8500-ehci.txt    |  15 ---
 .../devicetree/bindings/usb/vt8500-ehci.txt        |  12 --
 drivers/usb/host/Kconfig                           |   1 +
 drivers/usb/host/ehci-platform.c                   | 149 +++++++++++++++++----
 5 files changed, 142 insertions(+), 60 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/usb/via,vt8500-ehci.txt
 delete mode 100644 Documentation/devicetree/bindings/usb/vt8500-ehci.txt

Documentation/devicetree/bindings/usb/usb-ehci.txt +0 -2

index fa18612..fad10f3 100644
@@ -7,13 +7,14 @@ Required properties:
     (debug-port or other) can be also specified here, but only after
     definition of standard EHCI registers.
   - interrupts : one EHCI interrupt should be described here.
-If device registers are implemented in big endian mode, the device
-node should have "big-endian-regs" property.

Hi All,

This version of my ohci and ehci-platform clks, phy and dt support patch-set, really fixes the 2 small bugs Alan found.

Quoted 4 lines

Hi All,

This version of my ohci and ehci-platform clks, phy and dt support patch-set, really fixes the 2 small bugs Alan found.

All okay -- this time I can't find anything to complain about. :-)

Le mercredi 15 janvier 2014, 15:26:21 Alan Stern a ?crit :

Quoted 7 lines · Hans de Goede

Quoted 4 lines

Hi All,

This version of my ohci and ehci-platform clks, phy and dt support patch-set, really fixes the 2 small bugs Alan found.

All okay -- this time I can't find anything to complain about. :-)

There is one minor issue; which is that the ehci binding claims the driver supports the following optional boolean properties:

- big-endian-regs : boolean, set this for hcds with big-endian registers
- big-endian-desc : boolean, set this for hcds with big-endian descriptors
- big-endian : boolean, for hcds with big-endian-regs + big-endian-desc

while it does not (yet) so this is misleading. Can we at get that fixed before merging? Copy pasting the PPC ehci driver should do the job.

Quoted 12 lines · Florian Fainelli

Le mercredi 15 janvier 2014, 15:26:21 Alan Stern a ?crit :

Quoted 7 lines · Hans de Goede

Quoted 4 lines

Hi All,

This version of my ohci and ehci-platform clks, phy and dt support patch-set, really fixes the 2 small bugs Alan found.

All okay -- this time I can't find anything to complain about. :-)

There is one minor issue; which is that the ehci binding claims the driver supports the following optional boolean properties:

Quoted 6 lines

- big-endian-regs : boolean, set this for hcds with big-endian registers
- big-endian-desc : boolean, set this for hcds with big-endian descriptors
- big-endian : boolean, for hcds with big-endian-regs + big-endian-desc

while it does not (yet) so this is misleading. Can we at get that fixed before merging? Copy pasting the PPC ehci driver should do the job.

I agree it needs to be fixed. This can be done in a follow-up patch, though. It doesn't have to be in this one because nobody is using ehci-platform with DT yet.

A simple copy from the PPC driver isn't quite enough, because the platform data settings would override the DT values. ehci_platform_reset has to be changed so that it sets ehci->big_endian_desc and _mmio if the pdata flags are set, but otherwise leaves them alone.

Hans, would you like to write another patch to take care of this?

Quoted 7 lines

A simple copy from the PPC driver isn't quite enough, because the platform data settings would override the DT values. ehci_platform_reset has to be changed so that it sets ehci->big_endian_desc and _mmio if the pdata flags are set, but otherwise leaves them alone.

Hans, would you like to write another patch to take care of this?

I already took a quick look at this, setting the ehci->big_endian* flags is easy, the problem is that they won't work unless we also define CONFIG_USB_EHCI_BIG_ENDIAN_DESC and CONFIG_USB_EHCI_BIG_ENDIAN_MMIO

I would like to avoid doing something like the ugliness we've with USB_OHCI_HCD_PPC_OF_BE and USB_OHCI_HCD_PPC_OF_LE, which means just selecting these 2 config options whenever USB_EHCI_HCD_PLATFORM is enabled, but I'm not sure if that is acceptable.

The same goes for the ohci code btw.