Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

dt-bindings: switch Exynos EHCI/OHCI bindings to use array of generic PHYs

Commit 69bec7259853 ("USB: core: let USB device know device node") added
support for attaching devicetree node for USB devices. Those nodes are
children of their USB host controller. However Exynos EHCI and OHCI
driver bindings already define child-nodes for each physical root hub
port and assigns respective PHY controller and parameters to them. This
leads to the conflict. A workaround for it has been merged as commit
01d4071486fe ("usb: exynos: add workaround for the USB device bindings
conflict"), but it disabled support for USB device binding for Exynos
EHCI/OHCI controllers.

To resolve it properly, lets move PHYs from the sub-nodes to a standard
array under the 'phys' property.

Suggested-by: Måns Rullgård <mans@mansr.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Acked-by: Krzysztof Kozlowski <krzk@kernel.org>
Link: https://lore.kernel.org/r/20190726081453.9456-2-m.szyprowski@samsung.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Marek Szyprowski and committed by
Greg Kroah-Hartman
c27989cc 2a0f4f16

+14 -27
+14 -27
Documentation/devicetree/bindings/usb/exynos-usb.txt
··· 12 12 - interrupts: interrupt number to the cpu. 13 13 - clocks: from common clock binding: handle to usb clock. 14 14 - clock-names: from common clock binding: Shall be "usbhost". 15 - - port: if in the SoC there are EHCI phys, they should be listed here. 16 - One phy per port. Each port should have following entries: 17 - - reg: port number on EHCI controller, e.g 18 - On Exynos5250, port 0 is USB2.0 otg phy 19 - port 1 is HSIC phy0 20 - port 2 is HSIC phy1 21 - - phys: from the *Generic PHY* bindings; specifying phy used by port. 15 + - phys: from the *Generic PHY* bindings; array specifying phy(s) used 16 + by the root port. 17 + - phy-names: from the *Generic PHY* bindings; array of the names for 18 + each phy for the root ports, must be a subset of the following: 19 + "host", "hsic0", "hsic1". 22 20 23 21 Optional properties: 24 22 - samsung,vbus-gpio: if present, specifies the GPIO that ··· 33 35 clocks = <&clock 285>; 34 36 clock-names = "usbhost"; 35 37 36 - #address-cells = <1>; 37 - #size-cells = <0>; 38 - port@0 { 39 - reg = <0>; 40 - phys = <&usb2phy 1>; 41 - }; 38 + phys = <&usb2phy 1>; 39 + phy-names = "host"; 42 40 }; 43 41 44 42 OHCI ··· 46 52 - interrupts: interrupt number to the cpu. 47 53 - clocks: from common clock binding: handle to usb clock. 48 54 - clock-names: from common clock binding: Shall be "usbhost". 49 - - port: if in the SoC there are OHCI phys, they should be listed here. 50 - One phy per port. Each port should have following entries: 51 - - reg: port number on OHCI controller, e.g 52 - On Exynos5250, port 0 is USB2.0 otg phy 53 - port 1 is HSIC phy0 54 - port 2 is HSIC phy1 55 - - phys: from the *Generic PHY* bindings, specifying phy used by port. 55 + - phys: from the *Generic PHY* bindings; array specifying phy(s) used 56 + by the root port. 57 + - phy-names: from the *Generic PHY* bindings; array of the names for 58 + each phy for the root ports, must be a subset of the following: 59 + "host", "hsic0", "hsic1". 56 60 57 61 Example: 58 62 usb@12120000 { ··· 61 69 clocks = <&clock 285>; 62 70 clock-names = "usbhost"; 63 71 64 - #address-cells = <1>; 65 - #size-cells = <0>; 66 - port@0 { 67 - reg = <0>; 68 - phys = <&usb2phy 1>; 69 - }; 70 - 72 + phys = <&usb2phy 1>; 73 + phy-names = "host"; 71 74 }; 72 75 73 76 DWC3