Skip to content

Commit

Permalink
arm/dt: tegra: Fix serial nodes to match board files
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Stephen Warren authored and Olof Johansson committed Dec 8, 2011
1 parent 88950f3 commit 31c1ec9
Show file tree
Hide file tree
Showing 4 changed files with 64 additions and 0 deletions.
16 changes: 16 additions & 0 deletions arch/arm/boot/dts/tegra-harmony.dts
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
16 changes: 16 additions & 0 deletions arch/arm/boot/dts/tegra-seaboard.dts
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
16 changes: 16 additions & 0 deletions arch/arm/boot/dts/tegra-trimslice.dts
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand Down
16 changes: 16 additions & 0 deletions arch/arm/boot/dts/tegra-ventana.dts
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit 31c1ec9

Please sign in to comment.