From ae476cf83a45e09ef81966a6bdb763f8ff0599ea Mon Sep 17 00:00:00 2001
From: Stephen Warren <swarren@nvidia.com>
Date: Thu, 2 Feb 2012 12:24:19 -0700
Subject: [PATCH] --- yaml --- r: 296646 b: refs/heads/master c:
 8c690fdf465be9d97229f6bb0e6346624d6753a9 h: refs/heads/master v: v3

---
 [refs]                                       |  2 +-
 trunk/arch/arm/boot/dts/tegra-cardhu.dts     | 16 ++++++++++++++++
 trunk/arch/arm/mach-tegra/board-dt-tegra30.c |  2 +-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 38620c75793e..8f1a2c4c888f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 86e51a2ee471062184d2f74b46c45d344a2b9b38
+refs/heads/master: 8c690fdf465be9d97229f6bb0e6346624d6753a9
diff --git a/trunk/arch/arm/boot/dts/tegra-cardhu.dts b/trunk/arch/arm/boot/dts/tegra-cardhu.dts
index 70c41fc897d7..0419690c8784 100644
--- a/trunk/arch/arm/boot/dts/tegra-cardhu.dts
+++ b/trunk/arch/arm/boot/dts/tegra-cardhu.dts
@@ -14,6 +14,22 @@
 		clock-frequency = < 408000000 >;
 	};
 
+	serial@70006040 {
+		status = "disable";
+	};
+
+	serial@70006200 {
+		status = "disable";
+	};
+
+	serial@70006300 {
+		status = "disable";
+	};
+
+	serial@70006400 {
+		status = "disable";
+	};
+
 	i2c@7000c000 {
 		clock-frequency = <100000>;
 	};
diff --git a/trunk/arch/arm/mach-tegra/board-dt-tegra30.c b/trunk/arch/arm/mach-tegra/board-dt-tegra30.c
index b4124b12a779..11f7abd775b3 100644
--- a/trunk/arch/arm/mach-tegra/board-dt-tegra30.c
+++ b/trunk/arch/arm/mach-tegra/board-dt-tegra30.c
@@ -56,7 +56,7 @@ struct of_dev_auxdata tegra30_auxdata_lookup[] __initdata = {
 
 static __initdata struct tegra_clk_init_table tegra_dt_clk_init_table[] = {
 	/* name		parent		rate		enabled */
-	{ "uartd",	"pll_p",	408000000,	true },
+	{ "uarta",	"pll_p",	408000000,	true },
 	{ NULL,		NULL,		0,		0},
 };