From: Stephen Warren swarren@nvidia.com
This complies with my OCD.
Signed-off-by: Stephen Warren swarren@nvidia.com --- arch/arm/dts/tegra124-nyan-big.dts | 2 +- arch/arm/dts/tegra20-colibri.dts | 2 +- arch/arm/dts/tegra20-harmony.dts | 4 ++-- arch/arm/dts/tegra20-medcom-wide.dts | 2 +- arch/arm/dts/tegra20-paz00.dts | 2 +- arch/arm/dts/tegra20-plutux.dts | 2 +- arch/arm/dts/tegra20-seaboard.dts | 4 ++-- arch/arm/dts/tegra20-tec.dts | 2 +- arch/arm/dts/tegra20-trimslice.dts | 4 ++-- arch/arm/dts/tegra20-ventana.dts | 2 +- arch/arm/dts/tegra20-whistler.dts | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/arch/arm/dts/tegra124-nyan-big.dts b/arch/arm/dts/tegra124-nyan-big.dts index 75821fcda647..d41c995dcc14 100644 --- a/arch/arm/dts/tegra124-nyan-big.dts +++ b/arch/arm/dts/tegra124-nyan-big.dts @@ -8,7 +8,6 @@
aliases { console = &uarta; - stdout-path = &uarta; i2c0 = "/i2c@7000d000"; i2c1 = "/i2c@7000c000"; i2c2 = "/i2c@7000c400"; @@ -17,6 +16,7 @@ i2c5 = "/i2c@7000d100"; rtc0 = "/i2c@7000d000/pmic@40"; rtc1 = "/rtc@7000e000"; + stdout-path = &uarta; sdhci0 = "/sdhci@700b0600"; sdhci1 = "/sdhci@700b0400"; spi0 = "/spi@7000d400"; diff --git a/arch/arm/dts/tegra20-colibri.dts b/arch/arm/dts/tegra20-colibri.dts index 2cf24d3ee771..dbbdd59c82a1 100644 --- a/arch/arm/dts/tegra20-colibri.dts +++ b/arch/arm/dts/tegra20-colibri.dts @@ -14,10 +14,10 @@ i2c0 = "/i2c@7000d000"; i2c1 = "/i2c@7000c000"; i2c2 = "/i2c@7000c400"; + sdhci0 = "/sdhci@c8000600"; usb0 = "/usb@c5008000"; usb1 = "/usb@c5000000"; usb2 = "/usb@c5004000"; - sdhci0 = "/sdhci@c8000600"; };
host1x@50000000 { diff --git a/arch/arm/dts/tegra20-harmony.dts b/arch/arm/dts/tegra20-harmony.dts index 623eb90a8a00..23dbf2ce79ae 100644 --- a/arch/arm/dts/tegra20-harmony.dts +++ b/arch/arm/dts/tegra20-harmony.dts @@ -11,10 +11,10 @@ };
aliases { - usb0 = "/usb@c5008000"; - usb1 = "/usb@c5004000"; sdhci0 = "/sdhci@c8000600"; sdhci1 = "/sdhci@c8000200"; + usb0 = "/usb@c5008000"; + usb1 = "/usb@c5004000"; };
memory { diff --git a/arch/arm/dts/tegra20-medcom-wide.dts b/arch/arm/dts/tegra20-medcom-wide.dts index 3d37257189e0..f016961f0c45 100644 --- a/arch/arm/dts/tegra20-medcom-wide.dts +++ b/arch/arm/dts/tegra20-medcom-wide.dts @@ -11,8 +11,8 @@ };
aliases { - usb0 = "/usb@c5008000"; sdhci0 = "/sdhci@c8000600"; + usb0 = "/usb@c5008000"; };
memory { diff --git a/arch/arm/dts/tegra20-paz00.dts b/arch/arm/dts/tegra20-paz00.dts index 5c7e80558da3..eb451bef019c 100644 --- a/arch/arm/dts/tegra20-paz00.dts +++ b/arch/arm/dts/tegra20-paz00.dts @@ -11,9 +11,9 @@ };
aliases { - usb0 = "/usb@c5008000"; sdhci0 = "/sdhci@c8000600"; sdhci1 = "/sdhci@c8000000"; + usb0 = "/usb@c5008000"; };
memory { diff --git a/arch/arm/dts/tegra20-plutux.dts b/arch/arm/dts/tegra20-plutux.dts index 7f57f1d4b573..45acd3a35ef7 100644 --- a/arch/arm/dts/tegra20-plutux.dts +++ b/arch/arm/dts/tegra20-plutux.dts @@ -11,8 +11,8 @@ };
aliases { - usb0 = "/usb@c5008000"; sdhci0 = "/sdhci@c8000600"; + usb0 = "/usb@c5008000"; };
memory { diff --git a/arch/arm/dts/tegra20-seaboard.dts b/arch/arm/dts/tegra20-seaboard.dts index eada59073efc..886836bfd41c 100644 --- a/arch/arm/dts/tegra20-seaboard.dts +++ b/arch/arm/dts/tegra20-seaboard.dts @@ -16,14 +16,14 @@
aliases { /* This defines the order of our ports */ - usb0 = "/usb@c5008000"; - usb1 = "/usb@c5000000"; i2c0 = "/i2c@7000d000"; i2c1 = "/i2c@7000c000"; i2c2 = "/i2c@7000c400"; i2c3 = "/i2c@7000c500"; sdhci0 = "/sdhci@c8000600"; sdhci1 = "/sdhci@c8000400"; + usb0 = "/usb@c5008000"; + usb1 = "/usb@c5000000"; };
memory { diff --git a/arch/arm/dts/tegra20-tec.dts b/arch/arm/dts/tegra20-tec.dts index 4f68077fafa1..830029741797 100644 --- a/arch/arm/dts/tegra20-tec.dts +++ b/arch/arm/dts/tegra20-tec.dts @@ -11,8 +11,8 @@ };
aliases { - usb0 = "/usb@c5008000"; sdhci0 = "/sdhci@c8000600"; + usb0 = "/usb@c5008000"; };
memory { diff --git a/arch/arm/dts/tegra20-trimslice.dts b/arch/arm/dts/tegra20-trimslice.dts index db13ff965178..1acdd78b5f33 100644 --- a/arch/arm/dts/tegra20-trimslice.dts +++ b/arch/arm/dts/tegra20-trimslice.dts @@ -11,11 +11,11 @@ };
aliases { - usb0 = "/usb@c5008000"; - usb1 = "/usb@c5000000"; sdhci0 = "/sdhci@c8000600"; sdhci1 = "/sdhci@c8000000"; spi0 = "/spi@7000c380"; + usb0 = "/usb@c5008000"; + usb1 = "/usb@c5000000"; };
memory { diff --git a/arch/arm/dts/tegra20-ventana.dts b/arch/arm/dts/tegra20-ventana.dts index 851e0ed8d9a4..5047d0982ba9 100644 --- a/arch/arm/dts/tegra20-ventana.dts +++ b/arch/arm/dts/tegra20-ventana.dts @@ -11,9 +11,9 @@ };
aliases { - usb0 = "/usb@c5008000"; sdhci0 = "/sdhci@c8000600"; sdhci1 = "/sdhci@c8000400"; + usb0 = "/usb@c5008000"; };
memory { diff --git a/arch/arm/dts/tegra20-whistler.dts b/arch/arm/dts/tegra20-whistler.dts index 358c5824f7cc..fb6a4fcf9133 100644 --- a/arch/arm/dts/tegra20-whistler.dts +++ b/arch/arm/dts/tegra20-whistler.dts @@ -12,9 +12,9 @@
aliases { i2c0 = "/i2c@7000d000"; - usb0 = "/usb@c5008000"; sdhci0 = "/sdhci@c8000600"; sdhci1 = "/sdhci@c8000400"; + usb0 = "/usb@c5008000"; };
memory {