arm/dt: tegra: Fix serial nodes to match board files
Stephen Warren [Mon, 21 Nov 2011 21:44:10 +0000 (14:44 -0700)]
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>

arch/arm/boot/dts/tegra-harmony.dts
arch/arm/boot/dts/tegra-seaboard.dts
arch/arm/boot/dts/tegra-trimslice.dts
arch/arm/boot/dts/tegra-ventana.dts

index ca6fa10..ac179a0 100644 (file)
                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 */
index 92da1f1..cbb2f08 100644 (file)
                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 */
index b1aaa45..6060ce0 100644 (file)
                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>;
index 0f14ee3..5ac0aa3 100644 (file)
                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 */