ohci and ehci-platform clks, phy, be and dt support
Subsystems (4)
v8 cover ohci and ehci-platform clks, phy, be and dt support
Hi All,
Although v7 was intended as the final version here is a v8, compared to v7 this contains 2 small fixes to the dt-bindings documentation so that the examples there match the dt-node naming rules.
Besides that I've also rolled v2 of my patches to also add support for specifying controller endianness through dt into this set.
Regards,
Hans
PATCH v8 1/4 ohci-platform: Add support for devicetree instantiation
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.
--- Documentation/devicetree/bindings/usb/usb-ohci.txt | 22 +++ drivers/usb/host/ohci-platform.c | 164 ++++++++++++++++++--- 2 files changed, 162 insertions(+), 24 deletions(-) create mode 100644 Documentation/devicetree/bindings/usb/usb-ohci.txt
Documentation/devicetree/bindings/usb/usb-ohci.txt new file +22 -0
@@ -0,0 +1,22 @@ +USB OHCI controllers + +Required properties: +- compatible : "usb-ohci" +- reg : ohci controller register range (address and length) +- interrupts : ohci controller interrupt + +Optional properties: +- clocks : a list of phandle + clock specifier pairs +- phys : phandle + phy specifier pair +- phy-names : "usb" + +Example: + + ohci0: usb at 01c14400 { + compatible = "allwinner,sun4i-a10-ohci", "usb-ohci"; + reg = <0x01c14400 0x100>; + interrupts = <64>; + clocks = <&usb_clk 6>, <&ahb_gates 2>; + phys = <&usbphy 1>; + phy-names = "usb"; + };
drivers/usb/host/ohci-platform.c +140 -24
254 lines not on this page · raw message
Signature · 1 line
1.8.5.3
PATCH v8 2/4 ehci-platform: Add support for clks and phy passed through devicetree
In reply to Hans de GoedeCurrently 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.
--- 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 +18 -7
@@ -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. -If controller implementation operates with big endian descriptors, -"big-endian-desc" property should be specified. -If both big endian registers and descriptors are used by the controller -implementation, "big-endian" property can be specified instead of having -both "big-endian-regs" and "big-endian-desc". + +Optional 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 + - clocks : a list of phandle + clock specifier pairs + - phys : phandle + phy specifier pair + - phy-names : "usb" Example (Sequoia 440EPx): ehci at e0000300 {
@@ -23,3 +24,13 @@ Example (Sequoia 440EPx): reg = <0 e0000300 90 0 e0000390 70>; big-endian; }; + +Example (Allwinner sun4i A10 SoC): + ehci0: usb at 01c14000 { + compatible = "allwinner,sun4i-a10-ehci", "usb-ehci"; + reg = <0x01c14000 0x100>; + interrupts = <39>; + clocks = <&ahb_gates 1>; + phys = <&usbphy 1>; + phy-names = "usb"; + };
Documentation/devicetree/bindings/usb/via,vt8500-ehci.txt deleted +0 -15
@@ -1,15 +0,0 @@ -VIA/Wondermedia VT8500 EHCI Controller ------------------------------------------------------ - -Required properties: -- compatible : "via,vt8500-ehci" -- reg : Should contain 1 register ranges(address and length) -- interrupts : ehci controller interrupt - -Example: - - ehci at d8007900 { - compatible = "via,vt8500-ehci"; - reg = <0xd8007900 0x200>; - interrupts = <43>; - };
Documentation/devicetree/bindings/usb/vt8500-ehci.txt deleted +0 -12
@@ -1,12 +0,0 @@ -VIA VT8500 and Wondermedia WM8xxx SoC USB controllers. - -Required properties: - - compatible: Should be "via,vt8500-ehci" or "wm,prizm-ehci". - - reg: Address range of the ehci registers. size should be 0x200 - - interrupts: Should contain the ehci interrupt. - -usb: ehci at D8007100 { - compatible = "wm,prizm-ehci", "usb-ehci"; - reg = <0xD8007100 0x200>; - interrupts = <1>; -};
drivers/usb/host/Kconfig +1 -0
@@ -255,6 +255,7 @@ config USB_EHCI_ATH79 config USB_EHCI_HCD_PLATFORM tristate "Generic EHCI driver for a platform device" + depends on !PPC_OF default n ---help--- Adds an EHCI host driver for a generic platform device, which
drivers/usb/host/ehci-platform.c +123 -26
244 lines not on this page · raw message
Signature · 1 line
1.8.5.3
PATCH v8 3/4 ohci-platform: Add support for controllers with big-endian regs / descriptors
In reply to Hans de GoedeNote this commit uses the same devicetree booleans for this as the ones already existing in the usb-ehci bindings, see:Documentation/devicetree/bindings/usb/usb-ehci.txt
--- Documentation/devicetree/bindings/usb/usb-ohci.txt | 3 +++ drivers/usb/host/ohci-platform.c | 27 ++++++++++++++++++++++ 2 files changed, 30 insertions(+)
Documentation/devicetree/bindings/usb/usb-ohci.txt +3 -0
@@ -6,6 +6,9 @@ Required properties: - interrupts : ohci controller interrupt Optional 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 - clocks : a list of phandle + clock specifier pairs - phys : phandle + phy specifier pair - phy-names : "usb"
drivers/usb/host/ohci-platform.c +27 -0
@@ -128,6 +128,7 @@ static int ohci_platform_probe(struct platform_device *dev)struct resource *res_mem;struct usb_ohci_pdata *pdata =dev_get_platdata (&dev->dev);struct ohci_platform_priv *priv; +struct ohci_hcd *ohci;int err, irq, clk =0 ;if (usb_disabled ())
@@ -164,8 +165,34 @@ static int ohci_platform_probe(struct platform_device *dev)platform_set_drvdata (dev, hcd); dev->dev.platform_data = pdata; priv =hcd_to_ohci_priv (hcd); + ohci =hcd_to_ohci (hcd);if (pdata == &ohci_platform_defaults && dev->dev.of_node) { +if (of_property_read_bool (dev->dev.of_node,"big-endian-regs" )) + ohci->flags |=OHCI_QUIRK_BE_MMIO ; + +if (of_property_read_bool (dev->dev.of_node,"big-endian-desc" )) + ohci->flags |=OHCI_QUIRK_BE_DESC ; + +if (of_property_read_bool (dev->dev.of_node,"big-endian" )) + ohci->flags |=OHCI_QUIRK_BE_MMIO |OHCI_QUIRK_BE_DESC ; + +#ifndef CONFIG_USB_OHCI_BIG_ENDIAN_MMIO +if (ohci->flags &OHCI_QUIRK_BE_MMIO ) { +dev_err (&dev->dev, +"Error big-endian-regs not compiled in\n" ); + err = -EINVAL ; + goto err_put_hcd; + } +#endif +#ifndef CONFIG_USB_OHCI_BIG_ENDIAN_DESC +if (ohci->flags &OHCI_QUIRK_BE_DESC ) { +dev_err (&dev->dev, +"Error big-endian-desc not compiled in\n" ); + err = -EINVAL ; + goto err_put_hcd; + } +#endif priv->phy =devm_phy_get (&dev->dev,"usb" );if (IS_ERR (priv->phy)) { err =PTR_ERR (priv->phy);
Signature · 1 line
1.8.5.3
PATCH v8 3/4 ohci-platform: Add support for controllers with big-endian regs / descriptors
Hello.
Quoted 5 lines · Hans de Goede
Note this commit uses the same devicetree booleans for this as the ones already existing in the usb-ehci bindings, see:
Documentation/devicetree/bindings/usb/usb-ehci.txtSigned-off-by Hans de Goede <[email protected]>
[...]
Quoted 4 lines
drivers/usb/host/ohci-platform.c +0
-0
[...]
Quoted 1 line
drivers/usb/host/ohci-platform.c +0
-0@@ -164,8 +165,34 @@ static int ohci_platform_probe(struct platform_device *dev)
[...]
drivers/usb/host/ohci-platform.c static int ohci_platform_probe(struct platform_device *dev) · line 191
Quoted 12 lines
drivers/usb/host/ohci-platform.c +12
-0+#ifndef CONFIG_USB_OHCI_BIG_ENDIAN_MMIO +if (ohci->flags &OHCI_QUIRK_BE_MMIO ) { +dev_err (&dev->dev, +"Error big-endian-regs not compiled in\n" ); + err = -EINVAL ; + goto err_put_hcd; + } +#endif +#ifndef CONFIG_USB_OHCI_BIG_ENDIAN_DESC +if (ohci->flags &OHCI_QUIRK_BE_DESC ) { +dev_err (&dev->dev, +"Error big-endian-desc not compiled in\n" );
Small grammar nits (sorry): some punctuation like comma or semicolon
wouldn't hurt after "Error" word here and above. The same for ehci-platfrom.c. Also, "support" word wouldn't hurt after the property names in the same message.
WBR, Sergei
PATCH v8 4/4 ehci-platform: Add support for controllers with big-endian regs / descriptors
In reply to Hans de GoedeThis uses the already documented devicetree booleans for this, see:Documentation/devicetree/bindings/usb/usb-ehci.txt
--- drivers/usb/host/ehci-platform.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-)
drivers/usb/host/ehci-platform.c +31 -2
@@ -55,8 +55,10 @@ static int ehci_platform_reset(struct usb_hcd *hcd) hcd->has_tt = pdata->has_tt; ehci->has_synopsys_hc_bug = pdata->has_synopsys_hc_bug; - ehci->big_endian_desc = pdata->big_endian_desc; - ehci->big_endian_mmio = pdata->big_endian_mmio; +if (pdata->big_endian_desc) + ehci->big_endian_desc =1 ; +if (pdata->big_endian_mmio) + ehci->big_endian_mmio =1 ;if (pdata->pre_setup) { retval = pdata->pre_setup (hcd);
@@ -142,6 +144,7 @@ static int ehci_platform_probe(struct platform_device *dev)struct resource *res_mem;struct usb_ehci_pdata *pdata =dev_get_platdata (&dev->dev);struct ehci_platform_priv *priv; +struct ehci_hcd *ehci;int err, irq, clk =0 ;if (usb_disabled ())
@@ -177,8 +180,34 @@ static int ehci_platform_probe(struct platform_device *dev)platform_set_drvdata (dev, hcd); dev->dev.platform_data = pdata; priv =hcd_to_ehci_priv (hcd); + ehci =hcd_to_ehci (hcd);if (pdata == &ehci_platform_defaults && dev->dev.of_node) { +if (of_property_read_bool (dev->dev.of_node,"big-endian-regs" )) + ehci->big_endian_mmio =1 ; + +if (of_property_read_bool (dev->dev.of_node,"big-endian-desc" )) + ehci->big_endian_desc =1 ; + +if (of_property_read_bool (dev->dev.of_node,"big-endian" )) + ehci->big_endian_mmio = ehci->big_endian_desc =1 ; + +#ifndef CONFIG_USB_EHCI_BIG_ENDIAN_MMIO +if (ehci->big_endian_mmio) { +dev_err (&dev->dev, +"Error big-endian-regs not compiled in\n" ); + err = -EINVAL ; + goto err_put_hcd; + } +#endif +#ifndef CONFIG_USB_EHCI_BIG_ENDIAN_DESC +if (ehci->big_endian_desc) { +dev_err (&dev->dev, +"Error big-endian-desc not compiled in\n" ); + err = -EINVAL ; + goto err_put_hcd; + } +#endif priv->phy =devm_phy_get (&dev->dev,"usb" );if (IS_ERR (priv->phy)) { err =PTR_ERR (priv->phy);
Signature · 1 line
1.8.5.3