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

ARM: dts: exynos: Use standard arrays of generic PHYs for EHCI/OHCI devices

Move USB PHYs to a standard arrays for Exynos EHCI/OHCI devices. This
resolves the conflict between Exynos EHCI/OHCI sub-nodes and generic USB
device bindings. Once the Exynos EHCI/OHCI sub-nodes are removed, the
boards can finally provide sub-nodes for the USB devices using generic USB
device bindings.

Suggested-by: Måns Rullgård <mans@mansr.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Link: https://lore.kernel.org/r/20190726081453.9456-4-m.szyprowski@samsung.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Marek Szyprowski and committed by
Greg Kroah-Hartman
314de2f6 214b606e

+22 -79
+4 -24
arch/arm/boot/dts/exynos4.dtsi
··· 380 380 clocks = <&clock CLK_USB_HOST>; 381 381 clock-names = "usbhost"; 382 382 status = "disabled"; 383 - #address-cells = <1>; 384 - #size-cells = <0>; 385 - port@0 { 386 - reg = <0>; 387 - phys = <&exynos_usbphy 1>; 388 - status = "disabled"; 389 - }; 390 - port@1 { 391 - reg = <1>; 392 - phys = <&exynos_usbphy 2>; 393 - status = "disabled"; 394 - }; 395 - port@2 { 396 - reg = <2>; 397 - phys = <&exynos_usbphy 3>; 398 - status = "disabled"; 399 - }; 383 + phys = <&exynos_usbphy 1>, <&exynos_usbphy 2>, <&exynos_usbphy 3>; 384 + phy-names = "host", "hsic0", "hsic1"; 400 385 }; 401 386 402 387 ohci: ohci@12590000 { ··· 391 406 clocks = <&clock CLK_USB_HOST>; 392 407 clock-names = "usbhost"; 393 408 status = "disabled"; 394 - #address-cells = <1>; 395 - #size-cells = <0>; 396 - port@0 { 397 - reg = <0>; 398 - phys = <&exynos_usbphy 1>; 399 - status = "disabled"; 400 - }; 409 + phys = <&exynos_usbphy 1>; 410 + phy-names = "host"; 401 411 }; 402 412 403 413 gpu: gpu@13000000 {
+2 -6
arch/arm/boot/dts/exynos4210-universal_c210.dts
··· 204 204 205 205 &ehci { 206 206 status = "okay"; 207 - port@0 { 208 - status = "okay"; 209 - }; 207 + phys = <&exynos_usbphy 1>; 208 + phy-names = "host"; 210 209 }; 211 210 212 211 &exynos_usbphy { ··· 519 520 520 521 &ohci { 521 522 status = "okay"; 522 - port@0 { 523 - status = "okay"; 524 - }; 525 523 }; 526 524 527 525 &pinctrl_1 {
+2 -7
arch/arm/boot/dts/exynos4412-itop-elite.dts
··· 146 146 /* In order to reset USB ethernet */ 147 147 samsung,vbus-gpio = <&gpc0 1 GPIO_ACTIVE_HIGH>; 148 148 149 - port@0 { 150 - status = "okay"; 151 - }; 152 - 153 - port@2 { 154 - status = "okay"; 155 - }; 149 + phys = <&exynos_usbphy 1>, <&exynos_usbphy 3>; 150 + phy-names = "host", "hsic1"; 156 151 }; 157 152 158 153 &exynos_usbphy {
+2 -6
arch/arm/boot/dts/exynos4412-odroidu3.dts
··· 105 105 }; 106 106 107 107 &ehci { 108 - port@1 { 109 - status = "okay"; 110 - }; 111 - port@2 { 112 - status = "okay"; 113 - }; 108 + phys = <&exynos_usbphy 2>, <&exynos_usbphy 3>; 109 + phy-names = "hsic0", "hsic1"; 114 110 }; 115 111 116 112 &sound {
+2 -3
arch/arm/boot/dts/exynos4412-odroidx.dts
··· 72 72 }; 73 73 74 74 &ehci { 75 - port@1 { 76 - status = "okay"; 77 - }; 75 + phys = <&exynos_usbphy 2>; 76 + phy-names = "hsic0"; 78 77 }; 79 78 80 79 &mshc_0 {
+2 -7
arch/arm/boot/dts/exynos4412-origen.dts
··· 88 88 &ehci { 89 89 samsung,vbus-gpio = <&gpx3 5 1>; 90 90 status = "okay"; 91 - 92 - port@1 { 93 - status = "okay"; 94 - }; 95 - port@2 { 96 - status = "okay"; 97 - }; 91 + phys = <&exynos_usbphy 2>, <&exynos_usbphy 3>; 92 + phy-names = "hsic0", "hsic1"; 98 93 }; 99 94 100 95 &fimd {
+4 -12
arch/arm/boot/dts/exynos5250.dtsi
··· 617 617 618 618 clocks = <&clock CLK_USB2>; 619 619 clock-names = "usbhost"; 620 - #address-cells = <1>; 621 - #size-cells = <0>; 622 - port@0 { 623 - reg = <0>; 624 - phys = <&usb2_phy_gen 1>; 625 - }; 620 + phys = <&usb2_phy_gen 1>; 621 + phy-names = "host"; 626 622 }; 627 623 628 624 ohci: usb@12120000 { ··· 628 632 629 633 clocks = <&clock CLK_USB2>; 630 634 clock-names = "usbhost"; 631 - #address-cells = <1>; 632 - #size-cells = <0>; 633 - port@0 { 634 - reg = <0>; 635 - phys = <&usb2_phy_gen 1>; 636 - }; 635 + phys = <&usb2_phy_gen 1>; 636 + phy-names = "host"; 637 637 }; 638 638 639 639 usb2_phy_gen: phy@12130000 {
+4 -14
arch/arm/boot/dts/exynos54xx.dtsi
··· 189 189 compatible = "samsung,exynos4210-ehci"; 190 190 reg = <0x12110000 0x100>; 191 191 interrupts = <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>; 192 - 193 - #address-cells = <1>; 194 - #size-cells = <0>; 195 - port@0 { 196 - reg = <0>; 197 - phys = <&usb2_phy 1>; 198 - }; 192 + phys = <&usb2_phy 1>; 193 + phy-names = "host"; 199 194 }; 200 195 201 196 usbhost1: usb@12120000 { 202 197 compatible = "samsung,exynos4210-ohci"; 203 198 reg = <0x12120000 0x100>; 204 199 interrupts = <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>; 205 - 206 - #address-cells = <1>; 207 - #size-cells = <0>; 208 - port@0 { 209 - reg = <0>; 210 - phys = <&usb2_phy 1>; 211 - }; 200 + phys = <&usb2_phy 1>; 201 + phy-names = "host"; 212 202 }; 213 203 214 204 usb2_phy: phy@12130000 {