aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>2022-04-04 18:56:11 +0200
committerKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>2022-04-04 18:56:11 +0200
commit061d09499fd1fcf793291009d9a21899c4fb871f (patch)
tree70870ba0cbab99d0383d0e7e321647a6f16ad215
parentARM: dts: s5pv210: align EHCI/OHCI nodes with dtschema (diff)
downloadlinux-dev-061d09499fd1fcf793291009d9a21899c4fb871f.tar.xz
linux-dev-061d09499fd1fcf793291009d9a21899c4fb871f.zip
ARM: dts: s5pv210: Use standard arrays of generic PHYs for EHCI/OHCI device
Move USB PHYs to a standard arrays for S5PV210 EHCI/OHCI devices. This resolves the conflict between S5PV210 EHCI/OHCI sub-nodes and generic USB device bindings. Suggested-by: Måns Rullgård <mans@mansr.com> Suggested-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Link: https://lore.kernel.org/r/20220314181948.246434-3-krzysztof.kozlowski@canonical.com
-rw-r--r--arch/arm/boot/dts/s5pv210.dtsi18
1 files changed, 4 insertions, 14 deletions
diff --git a/arch/arm/boot/dts/s5pv210.dtsi b/arch/arm/boot/dts/s5pv210.dtsi
index a7aca54832d9..4ea1e638432a 100644
--- a/arch/arm/boot/dts/s5pv210.dtsi
+++ b/arch/arm/boot/dts/s5pv210.dtsi
@@ -434,14 +434,9 @@
interrupt-parent = <&vic1>;
clocks = <&clocks CLK_USB_HOST>;
clock-names = "usbhost";
- #address-cells = <1>;
- #size-cells = <0>;
+ phys = <&usbphy 1>;
+ phy-names = "host";
status = "disabled";
-
- port@0 {
- reg = <0>;
- phys = <&usbphy 1>;
- };
};
ohci: usb@ec300000 {
@@ -451,14 +446,9 @@
interrupt-parent = <&vic1>;
clocks = <&clocks CLK_USB_HOST>;
clock-names = "usbhost";
- #address-cells = <1>;
- #size-cells = <0>;
+ phys = <&usbphy 1>;
+ phy-names = "host";
status = "disabled";
-
- port@0 {
- reg = <0>;
- phys = <&usbphy 1>;
- };
};
mfc: codec@f1700000 {