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

ARM: dts: sunxi: Revert phy-names removal for ECHI and OHCI

This reverts commits 3d109bdca981 ("ARM: dts: sunxi: Remove useless
phy-names from EHCI and OHCI"), 0a3df8bb6dad ("ARM: dts: sunxi: h3/h5:
Remove useless phy-names from EHCI and OHCI") and 3c7ab90aaa28 ("arm64:
dts: allwinner: Remove useless phy-names from EHCI and OHCI").

It turns out that while the USB bindings were not mentionning it, the PHY
client bindings were mandating that phy-names is set when phys is. Let's
add it back.

Fixes: 3d109bdca981 ("ARM: dts: sunxi: Remove useless phy-names from EHCI and OHCI")
Fixes: 0a3df8bb6dad ("ARM: dts: sunxi: h3/h5: Remove useless phy-names from EHCI and OHCI")
Fixes: 3c7ab90aaa28 ("arm64: dts: allwinner: Remove useless phy-names from EHCI and OHCI")
Reported-by: Emmanuel Vadot <manu@bidouilliste.com>
Signed-off-by: Maxime Ripard <mripard@kernel.org>
Link: https://lore.kernel.org/r/20191002112651.100504-1-mripard@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Maxime Ripard and committed by
Greg Kroah-Hartman
e6064cf4 4d599cd3

+40
+4
arch/arm/boot/dts/sun4i-a10.dtsi
··· 520 520 interrupts = <39>; 521 521 clocks = <&ccu CLK_AHB_EHCI0>; 522 522 phys = <&usbphy 1>; 523 + phy-names = "usb"; 523 524 status = "disabled"; 524 525 }; 525 526 ··· 530 529 interrupts = <64>; 531 530 clocks = <&ccu CLK_USB_OHCI0>, <&ccu CLK_AHB_OHCI0>; 532 531 phys = <&usbphy 1>; 532 + phy-names = "usb"; 533 533 status = "disabled"; 534 534 }; 535 535 ··· 610 608 interrupts = <40>; 611 609 clocks = <&ccu CLK_AHB_EHCI1>; 612 610 phys = <&usbphy 2>; 611 + phy-names = "usb"; 613 612 status = "disabled"; 614 613 }; 615 614 ··· 620 617 interrupts = <65>; 621 618 clocks = <&ccu CLK_USB_OHCI1>, <&ccu CLK_AHB_OHCI1>; 622 619 phys = <&usbphy 2>; 620 + phy-names = "usb"; 623 621 status = "disabled"; 624 622 }; 625 623
+2
arch/arm/boot/dts/sun5i.dtsi
··· 391 391 interrupts = <39>; 392 392 clocks = <&ccu CLK_AHB_EHCI>; 393 393 phys = <&usbphy 1>; 394 + phy-names = "usb"; 394 395 status = "disabled"; 395 396 }; 396 397 ··· 401 400 interrupts = <40>; 402 401 clocks = <&ccu CLK_USB_OHCI>, <&ccu CLK_AHB_OHCI>; 403 402 phys = <&usbphy 1>; 403 + phy-names = "usb"; 404 404 status = "disabled"; 405 405 }; 406 406
+4
arch/arm/boot/dts/sun6i-a31.dtsi
··· 545 545 clocks = <&ccu CLK_AHB1_EHCI0>; 546 546 resets = <&ccu RST_AHB1_EHCI0>; 547 547 phys = <&usbphy 1>; 548 + phy-names = "usb"; 548 549 status = "disabled"; 549 550 }; 550 551 ··· 556 555 clocks = <&ccu CLK_AHB1_OHCI0>, <&ccu CLK_USB_OHCI0>; 557 556 resets = <&ccu RST_AHB1_OHCI0>; 558 557 phys = <&usbphy 1>; 558 + phy-names = "usb"; 559 559 status = "disabled"; 560 560 }; 561 561 ··· 567 565 clocks = <&ccu CLK_AHB1_EHCI1>; 568 566 resets = <&ccu RST_AHB1_EHCI1>; 569 567 phys = <&usbphy 2>; 568 + phy-names = "usb"; 570 569 status = "disabled"; 571 570 }; 572 571 ··· 578 575 clocks = <&ccu CLK_AHB1_OHCI1>, <&ccu CLK_USB_OHCI1>; 579 576 resets = <&ccu RST_AHB1_OHCI1>; 580 577 phys = <&usbphy 2>; 578 + phy-names = "usb"; 581 579 status = "disabled"; 582 580 }; 583 581
+4
arch/arm/boot/dts/sun7i-a20.dtsi
··· 623 623 interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>; 624 624 clocks = <&ccu CLK_AHB_EHCI0>; 625 625 phys = <&usbphy 1>; 626 + phy-names = "usb"; 626 627 status = "disabled"; 627 628 }; 628 629 ··· 633 632 interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>; 634 633 clocks = <&ccu CLK_USB_OHCI0>, <&ccu CLK_AHB_OHCI0>; 635 634 phys = <&usbphy 1>; 635 + phy-names = "usb"; 636 636 status = "disabled"; 637 637 }; 638 638 ··· 716 714 interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>; 717 715 clocks = <&ccu CLK_AHB_EHCI1>; 718 716 phys = <&usbphy 2>; 717 + phy-names = "usb"; 719 718 status = "disabled"; 720 719 }; 721 720 ··· 726 723 interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>; 727 724 clocks = <&ccu CLK_USB_OHCI1>, <&ccu CLK_AHB_OHCI1>; 728 725 phys = <&usbphy 2>; 726 + phy-names = "usb"; 729 727 status = "disabled"; 730 728 }; 731 729
+2
arch/arm/boot/dts/sun8i-a23-a33.dtsi
··· 307 307 clocks = <&ccu CLK_BUS_EHCI>; 308 308 resets = <&ccu RST_BUS_EHCI>; 309 309 phys = <&usbphy 1>; 310 + phy-names = "usb"; 310 311 status = "disabled"; 311 312 }; 312 313 ··· 318 317 clocks = <&ccu CLK_BUS_OHCI>, <&ccu CLK_USB_OHCI>; 319 318 resets = <&ccu RST_BUS_OHCI>; 320 319 phys = <&usbphy 1>; 320 + phy-names = "usb"; 321 321 status = "disabled"; 322 322 }; 323 323
+3
arch/arm/boot/dts/sun8i-a83t.dtsi
··· 632 632 clocks = <&ccu CLK_BUS_EHCI0>; 633 633 resets = <&ccu RST_BUS_EHCI0>; 634 634 phys = <&usbphy 1>; 635 + phy-names = "usb"; 635 636 status = "disabled"; 636 637 }; 637 638 ··· 644 643 clocks = <&ccu CLK_BUS_OHCI0>, <&ccu CLK_USB_OHCI0>; 645 644 resets = <&ccu RST_BUS_OHCI0>; 646 645 phys = <&usbphy 1>; 646 + phy-names = "usb"; 647 647 status = "disabled"; 648 648 }; 649 649 ··· 656 654 clocks = <&ccu CLK_BUS_EHCI1>; 657 655 resets = <&ccu RST_BUS_EHCI1>; 658 656 phys = <&usbphy 2>; 657 + phy-names = "usb"; 659 658 status = "disabled"; 660 659 }; 661 660
+4
arch/arm/boot/dts/sun8i-r40.dtsi
··· 273 273 clocks = <&ccu CLK_BUS_EHCI1>; 274 274 resets = <&ccu RST_BUS_EHCI1>; 275 275 phys = <&usbphy 1>; 276 + phy-names = "usb"; 276 277 status = "disabled"; 277 278 }; 278 279 ··· 285 284 <&ccu CLK_USB_OHCI1>; 286 285 resets = <&ccu RST_BUS_OHCI1>; 287 286 phys = <&usbphy 1>; 287 + phy-names = "usb"; 288 288 status = "disabled"; 289 289 }; 290 290 ··· 296 294 clocks = <&ccu CLK_BUS_EHCI2>; 297 295 resets = <&ccu RST_BUS_EHCI2>; 298 296 phys = <&usbphy 2>; 297 + phy-names = "usb"; 299 298 status = "disabled"; 300 299 }; 301 300 ··· 308 305 <&ccu CLK_USB_OHCI2>; 309 306 resets = <&ccu RST_BUS_OHCI2>; 310 307 phys = <&usbphy 2>; 308 + phy-names = "usb"; 311 309 status = "disabled"; 312 310 }; 313 311
+5
arch/arm/boot/dts/sun9i-a80.dtsi
··· 346 346 clocks = <&usb_clocks CLK_BUS_HCI0>; 347 347 resets = <&usb_clocks RST_USB0_HCI>; 348 348 phys = <&usbphy1>; 349 + phy-names = "usb"; 349 350 status = "disabled"; 350 351 }; 351 352 ··· 358 357 <&usb_clocks CLK_USB_OHCI0>; 359 358 resets = <&usb_clocks RST_USB0_HCI>; 360 359 phys = <&usbphy1>; 360 + phy-names = "usb"; 361 361 status = "disabled"; 362 362 }; 363 363 ··· 380 378 clocks = <&usb_clocks CLK_BUS_HCI1>; 381 379 resets = <&usb_clocks RST_USB1_HCI>; 382 380 phys = <&usbphy2>; 381 + phy-names = "usb"; 383 382 status = "disabled"; 384 383 }; 385 384 ··· 410 407 clocks = <&usb_clocks CLK_BUS_HCI2>; 411 408 resets = <&usb_clocks RST_USB2_HCI>; 412 409 phys = <&usbphy3>; 410 + phy-names = "usb"; 413 411 status = "disabled"; 414 412 }; 415 413 ··· 422 418 <&usb_clocks CLK_USB_OHCI2>; 423 419 resets = <&usb_clocks RST_USB2_HCI>; 424 420 phys = <&usbphy3>; 421 + phy-names = "usb"; 425 422 status = "disabled"; 426 423 }; 427 424
+6
arch/arm/boot/dts/sunxi-h3-h5.dtsi
··· 304 304 clocks = <&ccu CLK_BUS_EHCI1>, <&ccu CLK_BUS_OHCI1>; 305 305 resets = <&ccu RST_BUS_EHCI1>, <&ccu RST_BUS_OHCI1>; 306 306 phys = <&usbphy 1>; 307 + phy-names = "usb"; 307 308 status = "disabled"; 308 309 }; 309 310 ··· 316 315 <&ccu CLK_USB_OHCI1>; 317 316 resets = <&ccu RST_BUS_EHCI1>, <&ccu RST_BUS_OHCI1>; 318 317 phys = <&usbphy 1>; 318 + phy-names = "usb"; 319 319 status = "disabled"; 320 320 }; 321 321 ··· 327 325 clocks = <&ccu CLK_BUS_EHCI2>, <&ccu CLK_BUS_OHCI2>; 328 326 resets = <&ccu RST_BUS_EHCI2>, <&ccu RST_BUS_OHCI2>; 329 327 phys = <&usbphy 2>; 328 + phy-names = "usb"; 330 329 status = "disabled"; 331 330 }; 332 331 ··· 339 336 <&ccu CLK_USB_OHCI2>; 340 337 resets = <&ccu RST_BUS_EHCI2>, <&ccu RST_BUS_OHCI2>; 341 338 phys = <&usbphy 2>; 339 + phy-names = "usb"; 342 340 status = "disabled"; 343 341 }; 344 342 ··· 350 346 clocks = <&ccu CLK_BUS_EHCI3>, <&ccu CLK_BUS_OHCI3>; 351 347 resets = <&ccu RST_BUS_EHCI3>, <&ccu RST_BUS_OHCI3>; 352 348 phys = <&usbphy 3>; 349 + phy-names = "usb"; 353 350 status = "disabled"; 354 351 }; 355 352 ··· 362 357 <&ccu CLK_USB_OHCI3>; 363 358 resets = <&ccu RST_BUS_EHCI3>, <&ccu RST_BUS_OHCI3>; 364 359 phys = <&usbphy 3>; 360 + phy-names = "usb"; 365 361 status = "disabled"; 366 362 }; 367 363
+2
arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
··· 104 104 105 105 &ehci0 { 106 106 phys = <&usbphy 0>; 107 + phy-names = "usb"; 107 108 status = "okay"; 108 109 }; 109 110 ··· 151 150 152 151 &ohci0 { 153 152 phys = <&usbphy 0>; 153 + phy-names = "usb"; 154 154 status = "okay"; 155 155 }; 156 156
+2
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
··· 553 553 resets = <&ccu RST_BUS_OHCI1>, 554 554 <&ccu RST_BUS_EHCI1>; 555 555 phys = <&usbphy 1>; 556 + phy-names = "usb"; 556 557 status = "disabled"; 557 558 }; 558 559 ··· 565 564 <&ccu CLK_USB_OHCI1>; 566 565 resets = <&ccu RST_BUS_OHCI1>; 567 566 phys = <&usbphy 1>; 567 + phy-names = "usb"; 568 568 status = "disabled"; 569 569 }; 570 570
+2
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
··· 547 547 resets = <&ccu RST_BUS_OHCI3>, 548 548 <&ccu RST_BUS_EHCI3>; 549 549 phys = <&usb2phy 3>; 550 + phy-names = "usb"; 550 551 status = "disabled"; 551 552 }; 552 553 ··· 559 558 <&ccu CLK_USB_OHCI3>; 560 559 resets = <&ccu RST_BUS_OHCI3>; 561 560 phys = <&usb2phy 3>; 561 + phy-names = "usb"; 562 562 status = "disabled"; 563 563 }; 564 564