aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2011-11-21 16:44:10 -0500
committerOlof Johansson <olof@lixom.net>2011-12-07 23:48:05 -0500
commit31c1ec9282d28f4eecb5f2e431f67accdf420ac2 (patch)
treecee8bbd1787e26703169a9afb85655b516e00316 /arch/arm/boot
parent88950f3b6d0f49b6b5a2f68bd1f67406c2c73922 (diff)
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>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/tegra-harmony.dts16
-rw-r--r--arch/arm/boot/dts/tegra-seaboard.dts16
-rw-r--r--arch/arm/boot/dts/tegra-trimslice.dts16
-rw-r--r--arch/arm/boot/dts/tegra-ventana.dts16
4 files changed, 64 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/tegra-harmony.dts b/arch/arm/boot/dts/tegra-harmony.dts
index ca6fa1084c9..ac179a05cfe 100644
--- a/arch/arm/boot/dts/tegra-harmony.dts
+++ b/arch/arm/boot/dts/tegra-harmony.dts
@@ -47,10 +47,26 @@
47 ext-mic-en-gpios = <&gpio 185 0>; 47 ext-mic-en-gpios = <&gpio 185 0>;
48 }; 48 };
49 49
50 serial@70006000 {
51 status = "disable";
52 };
53
54 serial@70006040 {
55 status = "disable";
56 };
57
58 serial@70006200 {
59 status = "disable";
60 };
61
50 serial@70006300 { 62 serial@70006300 {
51 clock-frequency = < 216000000 >; 63 clock-frequency = < 216000000 >;
52 }; 64 };
53 65
66 serial@70006400 {
67 status = "disable";
68 };
69
54 sdhci@c8000200 { 70 sdhci@c8000200 {
55 cd-gpios = <&gpio 69 0>; /* gpio PI5 */ 71 cd-gpios = <&gpio 69 0>; /* gpio PI5 */
56 wp-gpios = <&gpio 57 0>; /* gpio PH1 */ 72 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 92da1f1ed3a..cbb2f085ac2 100644
--- a/arch/arm/boot/dts/tegra-seaboard.dts
+++ b/arch/arm/boot/dts/tegra-seaboard.dts
@@ -27,10 +27,26 @@
27 clock-frequency = <400000>; 27 clock-frequency = <400000>;
28 }; 28 };
29 29
30 serial@70006000 {
31 status = "disable";
32 };
33
34 serial@70006040 {
35 status = "disable";
36 };
37
38 serial@70006200 {
39 status = "disable";
40 };
41
30 serial@70006300 { 42 serial@70006300 {
31 clock-frequency = < 216000000 >; 43 clock-frequency = < 216000000 >;
32 }; 44 };
33 45
46 serial@70006400 {
47 status = "disable";
48 };
49
34 sdhci@c8000400 { 50 sdhci@c8000400 {
35 cd-gpios = <&gpio 69 0>; /* gpio PI5 */ 51 cd-gpios = <&gpio 69 0>; /* gpio PI5 */
36 wp-gpios = <&gpio 57 0>; /* gpio PH1 */ 52 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 b1aaa45407d..6060ce0ae77 100644
--- a/arch/arm/boot/dts/tegra-trimslice.dts
+++ b/arch/arm/boot/dts/tegra-trimslice.dts
@@ -30,6 +30,22 @@
30 clock-frequency = < 216000000 >; 30 clock-frequency = < 216000000 >;
31 }; 31 };
32 32
33 serial@70006040 {
34 status = "disable";
35 };
36
37 serial@70006200 {
38 status = "disable";
39 };
40
41 serial@70006300 {
42 status = "disable";
43 };
44
45 serial@70006400 {
46 status = "disable";
47 };
48
33 sdhci@c8000600 { 49 sdhci@c8000600 {
34 cd-gpios = <&gpio 121 0>; 50 cd-gpios = <&gpio 121 0>;
35 wp-gpios = <&gpio 122 0>; 51 wp-gpios = <&gpio 122 0>;
diff --git a/arch/arm/boot/dts/tegra-ventana.dts b/arch/arm/boot/dts/tegra-ventana.dts
index 0f14ee373e7..5ac0aa300fe 100644
--- a/arch/arm/boot/dts/tegra-ventana.dts
+++ b/arch/arm/boot/dts/tegra-ventana.dts
@@ -26,10 +26,26 @@
26 clock-frequency = <400000>; 26 clock-frequency = <400000>;
27 }; 27 };
28 28
29 serial@70006000 {
30 status = "disable";
31 };
32
33 serial@70006040 {
34 status = "disable";
35 };
36
37 serial@70006200 {
38 status = "disable";
39 };
40
29 serial@70006300 { 41 serial@70006300 {
30 clock-frequency = < 216000000 >; 42 clock-frequency = < 216000000 >;
31 }; 43 };
32 44
45 serial@70006400 {
46 status = "disable";
47 };
48
33 sdhci@c8000400 { 49 sdhci@c8000400 {
34 cd-gpios = <&gpio 69 0>; /* gpio PI5 */ 50 cd-gpios = <&gpio 69 0>; /* gpio PI5 */
35 wp-gpios = <&gpio 57 0>; /* gpio PH1 */ 51 wp-gpios = <&gpio 57 0>; /* gpio PH1 */