Skip to content

Commit

Permalink
ARM: tegra: Move Tegra124 to the new XUSB pad controller binding
Browse files Browse the repository at this point in the history
Use the new XUSB pad controller binding on Tegra124.

Signed-off-by: Thierry Reding <treding@nvidia.com>
  • Loading branch information
Thierry Reding committed Apr 29, 2016
1 parent 3227bf1 commit 50623c5
Showing 1 changed file with 125 additions and 7 deletions.
132 changes: 125 additions & 7 deletions arch/arm/boot/dts/tegra124.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
#include <dt-bindings/gpio/tegra-gpio.h>
#include <dt-bindings/memory/tegra124-mc.h>
#include <dt-bindings/pinctrl/pinctrl-tegra.h>
#include <dt-bindings/pinctrl/pinctrl-tegra-xusb.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/reset/tegra124-car.h>
#include <dt-bindings/thermal/tegra124-soctherm.h>
Expand Down Expand Up @@ -51,9 +50,6 @@
reset-names = "pex", "afi", "pcie_x";
status = "disabled";

phys = <&padctl TEGRA_XUSB_PADCTL_PCIE>;
phy-names = "pcie";

pci@1,0 {
device_type = "pci";
assigned-addresses = <0x82000800 0 0x01000000 0 0x1000>;
Expand Down Expand Up @@ -622,8 +618,6 @@
<&tegra_car 123>,
<&tegra_car 129>;
reset-names = "sata", "sata-oob", "sata-cold";
phys = <&padctl TEGRA_XUSB_PADCTL_SATA>;
phy-names = "sata-phy";
status = "disabled";
};

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

#phy-cells = <1>;
pads {
usb2 {
status = "disabled";

lanes {
usb2-0 {
status = "disabled";
#phy-cells = <0>;
};

usb2-1 {
status = "disabled";
#phy-cells = <0>;
};

usb2-2 {
status = "disabled";
#phy-cells = <0>;
};
};
};

ulpi {
status = "disabled";

lanes {
ulpi-0 {
status = "disabled";
#phy-cells = <0>;
};
};
};

hsic {
status = "disabled";

lanes {
hsic-0 {
status = "disabled";
#phy-cells = <0>;
};

hsic-1 {
status = "disabled";
#phy-cells = <0>;
};
};
};

pcie {
status = "disabled";

lanes {
pcie-0 {
status = "disabled";
#phy-cells = <0>;
};

pcie-1 {
status = "disabled";
#phy-cells = <0>;
};

pcie-2 {
status = "disabled";
#phy-cells = <0>;
};

pcie-3 {
status = "disabled";
#phy-cells = <0>;
};

pcie-4 {
status = "disabled";
#phy-cells = <0>;
};
};
};

sata {
status = "disabled";

lanes {
sata-0 {
status = "disabled";
#phy-cells = <0>;
};
};
};
};

ports {
usb2-0 {
status = "disabled";
};

usb2-1 {
status = "disabled";
};

usb2-2 {
status = "disabled";
};

ulpi-0 {
status = "disabled";
};

hsic-0 {
status = "disabled";
};

hsic-1 {
status = "disabled";
};

usb3-0 {
status = "disabled";
};

usb3-1 {
status = "disabled";
};
};
};

sdhci@0,700b0000 {
Expand Down

0 comments on commit 50623c5

Please sign in to comment.