arm/dt: tegra: Fix serial nodes to match board files

Mark any serial ports that aren't registered by the board files as disabled
in the device-tree files.

In practice, none of the now-disabled ports ended up succeeding device
probing because of the missing clock-frequency property. However,
explicitly marking the devices disabled has the advantage of squashing
the dev_warn() the failed probe causes, and documenting that we intend
the port not to be used, rather than accidentally left out the property.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Olof Johansson <olof@lixom.net>

diff --git a/arch/arm/boot/dts/tegra-harmony.dts b/arch/arm/boot/dts/tegra-harmony.dts
index ca6fa1084c9dd69012babfcdd2b7c85a0c8aa10b..ac179a05cfe329718b41dcd964457faa35e939b8 100644 (file)
--- a/arch/arm/boot/dts/tegra-harmony.dts
+++ b/arch/arm/boot/dts/tegra-harmony.dts
@@ -47,10 +47,26 @@
                ext-mic-en-gpios = <&gpio 185 0>;
        };
 
+       serial@70006000 {
+               status = "disable";
+       };
+
+       serial@70006040 {
+               status = "disable";
+       };
+
+       serial@70006200 {
+               status = "disable";
+       };
+
        serial@70006300 {
                clock-frequency = < 216000000 >;
        };
 
+       serial@70006400 {
+               status = "disable";
+       };
+
        sdhci@c8000200 {
                cd-gpios = <&gpio 69 0>; /* gpio PI5 */
                wp-gpios = <&gpio 57 0>; /* gpio PH1 */

diff --git a/arch/arm/boot/dts/tegra-seaboard.dts b/arch/arm/boot/dts/tegra-seaboard.dts
index 92da1f1ed3a3a1e378d8a05c833daf96379b4145..cbb2f085ac23d62b5b7cb3e1da24e4a10d492b93 100644 (file)
--- a/arch/arm/boot/dts/tegra-seaboard.dts
+++ b/arch/arm/boot/dts/tegra-seaboard.dts
@@ -27,10 +27,26 @@
                clock-frequency = <400000>;
        };
 
+       serial@70006000 {
+               status = "disable";
+       };
+
+       serial@70006040 {
+               status = "disable";
+       };
+
+       serial@70006200 {
+               status = "disable";
+       };
+
        serial@70006300 {
                clock-frequency = < 216000000 >;
        };
 
+       serial@70006400 {
+               status = "disable";
+       };
+
        sdhci@c8000400 {
                cd-gpios = <&gpio 69 0>; /* gpio PI5 */
                wp-gpios = <&gpio 57 0>; /* gpio PH1 */

diff --git a/arch/arm/boot/dts/tegra-trimslice.dts b/arch/arm/boot/dts/tegra-trimslice.dts
index b1aaa45407d44194d300860114a6bfac2f2ea760..6060ce0ae77cd81a02619a6c707503c021ab4376 100644 (file)
--- a/arch/arm/boot/dts/tegra-trimslice.dts
+++ b/arch/arm/boot/dts/tegra-trimslice.dts
@@ -30,6 +30,22 @@
                clock-frequency = < 216000000 >;
        };
 
+       serial@70006040 {
+               status = "disable";
+       };
+
+       serial@70006200 {
+               status = "disable";
+       };
+
+       serial@70006300 {
+               status = "disable";
+       };
+
+       serial@70006400 {
+               status = "disable";
+       };
+
        sdhci@c8000600 {
                cd-gpios = <&gpio 121 0>;
                wp-gpios = <&gpio 122 0>;

diff --git a/arch/arm/boot/dts/tegra-ventana.dts b/arch/arm/boot/dts/tegra-ventana.dts
index 0f14ee373e76a4dd1d051ab6c76a1c984a730102..5ac0aa300fe033206f6edc6cf9221c2761255352 100644 (file)
--- a/arch/arm/boot/dts/tegra-ventana.dts
+++ b/arch/arm/boot/dts/tegra-ventana.dts
@@ -26,10 +26,26 @@
                clock-frequency = <400000>;
        };
 
+       serial@70006000 {
+               status = "disable";
+       };
+
+       serial@70006040 {
+               status = "disable";
+       };
+
+       serial@70006200 {
+               status = "disable";
+       };
+
        serial@70006300 {
                clock-frequency = < 216000000 >;
        };
 
+       serial@70006400 {
+               status = "disable";
+       };
+
        sdhci@c8000400 {
                cd-gpios = <&gpio 69 0>; /* gpio PI5 */
                wp-gpios = <&gpio 57 0>; /* gpio PH1 */