aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/tegra20.dtsi
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2013-03-06 13:28:33 -0500
committerStephen Warren <swarren@nvidia.com>2013-04-04 19:17:39 -0400
commit5d324410d4de8dec7e9d8d9f66832ed7e0a947bc (patch)
tree50f9fa94f09921a0e6145fa6a2bf134fb570c96f /arch/arm/boot/dts/tegra20.dtsi
parentfc5c306bbdf30d84c9fffd5d283a9811b24dcbf6 (diff)
ARM: tegra: fix sort order of USB PHY nodes
The USB PHY nodes are all grouped together rather than being sorted based on reg address like all other nodes fix this. I apologize for the churn; I should have noticed this during review of the patches that caused this. Signed-off-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'arch/arm/boot/dts/tegra20.dtsi')
-rw-r--r--arch/arm/boot/dts/tegra20.dtsi50
1 files changed, 25 insertions, 25 deletions
diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi
index 7712411f73c4..c9121337ed2c 100644
--- a/arch/arm/boot/dts/tegra20.dtsi
+++ b/arch/arm/boot/dts/tegra20.dtsi
@@ -442,31 +442,6 @@
442 #size-cells = <0>; 442 #size-cells = <0>;
443 }; 443 };
444 444
445 phy1: usb-phy@c5000400 {
446 compatible = "nvidia,tegra20-usb-phy";
447 reg = <0xc5000400 0x3c00>;
448 phy_type = "utmi";
449 nvidia,has-legacy-mode;
450 clocks = <&tegra_car 22>, <&tegra_car 127>;
451 clock-names = "phy", "pll_u";
452 };
453
454 phy2: usb-phy@c5004400 {
455 compatible = "nvidia,tegra20-usb-phy";
456 reg = <0xc5004400 0x3c00>;
457 phy_type = "ulpi";
458 clocks = <&tegra_car 94>, <&tegra_car 127>;
459 clock-names = "phy", "pll_u";
460 };
461
462 phy3: usb-phy@c5008400 {
463 compatible = "nvidia,tegra20-usb-phy";
464 reg = <0xc5008400 0x3C00>;
465 phy_type = "utmi";
466 clocks = <&tegra_car 22>, <&tegra_car 127>;
467 clock-names = "phy", "pll_u";
468 };
469
470 usb@c5000000 { 445 usb@c5000000 {
471 compatible = "nvidia,tegra20-ehci", "usb-ehci"; 446 compatible = "nvidia,tegra20-ehci", "usb-ehci";
472 reg = <0xc5000000 0x4000>; 447 reg = <0xc5000000 0x4000>;
@@ -479,6 +454,15 @@
479 status = "disabled"; 454 status = "disabled";
480 }; 455 };
481 456
457 phy1: usb-phy@c5000400 {
458 compatible = "nvidia,tegra20-usb-phy";
459 reg = <0xc5000400 0x3c00>;
460 phy_type = "utmi";
461 nvidia,has-legacy-mode;
462 clocks = <&tegra_car 22>, <&tegra_car 127>;
463 clock-names = "phy", "pll_u";
464 };
465
482 usb@c5004000 { 466 usb@c5004000 {
483 compatible = "nvidia,tegra20-ehci", "usb-ehci"; 467 compatible = "nvidia,tegra20-ehci", "usb-ehci";
484 reg = <0xc5004000 0x4000>; 468 reg = <0xc5004000 0x4000>;
@@ -489,6 +473,14 @@
489 status = "disabled"; 473 status = "disabled";
490 }; 474 };
491 475
476 phy2: usb-phy@c5004400 {
477 compatible = "nvidia,tegra20-usb-phy";
478 reg = <0xc5004400 0x3c00>;
479 phy_type = "ulpi";
480 clocks = <&tegra_car 94>, <&tegra_car 127>;
481 clock-names = "phy", "pll_u";
482 };
483
492 usb@c5008000 { 484 usb@c5008000 {
493 compatible = "nvidia,tegra20-ehci", "usb-ehci"; 485 compatible = "nvidia,tegra20-ehci", "usb-ehci";
494 reg = <0xc5008000 0x4000>; 486 reg = <0xc5008000 0x4000>;
@@ -499,6 +491,14 @@
499 status = "disabled"; 491 status = "disabled";
500 }; 492 };
501 493
494 phy3: usb-phy@c5008400 {
495 compatible = "nvidia,tegra20-usb-phy";
496 reg = <0xc5008400 0x3c00>;
497 phy_type = "utmi";
498 clocks = <&tegra_car 22>, <&tegra_car 127>;
499 clock-names = "phy", "pll_u";
500 };
501
502 sdhci@c8000000 { 502 sdhci@c8000000 {
503 compatible = "nvidia,tegra20-sdhci"; 503 compatible = "nvidia,tegra20-sdhci";
504 reg = <0xc8000000 0x200>; 504 reg = <0xc8000000 0x200>;