Skip to content

Commit 50623c5

Browse files
committed
ARM: tegra: Move Tegra124 to the new XUSB pad controller binding
Use the new XUSB pad controller binding on Tegra124. Signed-off-by: Thierry Reding <[email protected]>
1 parent 3227bf1 commit 50623c5

File tree

1 file changed

+125
-7
lines changed

1 file changed

+125
-7
lines changed

arch/arm/boot/dts/tegra124.dtsi

Lines changed: 125 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#include <dt-bindings/gpio/tegra-gpio.h>
33
#include <dt-bindings/memory/tegra124-mc.h>
44
#include <dt-bindings/pinctrl/pinctrl-tegra.h>
5-
#include <dt-bindings/pinctrl/pinctrl-tegra-xusb.h>
65
#include <dt-bindings/interrupt-controller/arm-gic.h>
76
#include <dt-bindings/reset/tegra124-car.h>
87
#include <dt-bindings/thermal/tegra124-soctherm.h>
@@ -51,9 +50,6 @@
5150
reset-names = "pex", "afi", "pcie_x";
5251
status = "disabled";
5352

54-
phys = <&padctl TEGRA_XUSB_PADCTL_PCIE>;
55-
phy-names = "pcie";
56-
5753
pci@1,0 {
5854
device_type = "pci";
5955
assigned-addresses = <0x82000800 0 0x01000000 0 0x1000>;
@@ -622,8 +618,6 @@
622618
<&tegra_car 123>,
623619
<&tegra_car 129>;
624620
reset-names = "sata", "sata-oob", "sata-cold";
625-
phys = <&padctl TEGRA_XUSB_PADCTL_SATA>;
626-
phy-names = "sata-phy";
627621
status = "disabled";
628622
};
629623

@@ -648,7 +642,131 @@
648642
resets = <&tegra_car 142>;
649643
reset-names = "padctl";
650644

651-
#phy-cells = <1>;
645+
pads {
646+
usb2 {
647+
status = "disabled";
648+
649+
lanes {
650+
usb2-0 {
651+
status = "disabled";
652+
#phy-cells = <0>;
653+
};
654+
655+
usb2-1 {
656+
status = "disabled";
657+
#phy-cells = <0>;
658+
};
659+
660+
usb2-2 {
661+
status = "disabled";
662+
#phy-cells = <0>;
663+
};
664+
};
665+
};
666+
667+
ulpi {
668+
status = "disabled";
669+
670+
lanes {
671+
ulpi-0 {
672+
status = "disabled";
673+
#phy-cells = <0>;
674+
};
675+
};
676+
};
677+
678+
hsic {
679+
status = "disabled";
680+
681+
lanes {
682+
hsic-0 {
683+
status = "disabled";
684+
#phy-cells = <0>;
685+
};
686+
687+
hsic-1 {
688+
status = "disabled";
689+
#phy-cells = <0>;
690+
};
691+
};
692+
};
693+
694+
pcie {
695+
status = "disabled";
696+
697+
lanes {
698+
pcie-0 {
699+
status = "disabled";
700+
#phy-cells = <0>;
701+
};
702+
703+
pcie-1 {
704+
status = "disabled";
705+
#phy-cells = <0>;
706+
};
707+
708+
pcie-2 {
709+
status = "disabled";
710+
#phy-cells = <0>;
711+
};
712+
713+
pcie-3 {
714+
status = "disabled";
715+
#phy-cells = <0>;
716+
};
717+
718+
pcie-4 {
719+
status = "disabled";
720+
#phy-cells = <0>;
721+
};
722+
};
723+
};
724+
725+
sata {
726+
status = "disabled";
727+
728+
lanes {
729+
sata-0 {
730+
status = "disabled";
731+
#phy-cells = <0>;
732+
};
733+
};
734+
};
735+
};
736+
737+
ports {
738+
usb2-0 {
739+
status = "disabled";
740+
};
741+
742+
usb2-1 {
743+
status = "disabled";
744+
};
745+
746+
usb2-2 {
747+
status = "disabled";
748+
};
749+
750+
ulpi-0 {
751+
status = "disabled";
752+
};
753+
754+
hsic-0 {
755+
status = "disabled";
756+
};
757+
758+
hsic-1 {
759+
status = "disabled";
760+
};
761+
762+
usb3-0 {
763+
status = "disabled";
764+
};
765+
766+
usb3-1 {
767+
status = "disabled";
768+
};
769+
};
652770
};
653771

654772
sdhci@0,700b0000 {

0 commit comments

Comments
 (0)