From 00a2749d7be5b0e6cb6435187ec8fea600b44627 Mon Sep 17 00:00:00 2001
From: Allen Martin <amartin@nvidia.com>
Date: Fri, 31 Aug 2012 08:30:00 +0000
Subject: tegra20: rename tegra2 -> tegra20

This is make naming consistent with the kernel and devicetree and in
preparation of pulling out the common tegra20 code.

Signed-off-by: Allen Martin <amartin@nvidia.com>
Acked-by: Stephen Warren <swarren@wwwdotorg.org>
Tested-by: Thierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: Tom Warren <twarren@nvidia.com>
---
 board/avionic-design/common/tamonten.c      |  4 +-
 board/avionic-design/dts/tegra2-medcom.dts  | 58 -----------------------------
 board/avionic-design/dts/tegra2-plutux.dts  | 58 -----------------------------
 board/avionic-design/dts/tegra2-tec.dts     | 58 -----------------------------
 board/avionic-design/dts/tegra20-medcom.dts | 58 +++++++++++++++++++++++++++++
 board/avionic-design/dts/tegra20-plutux.dts | 58 +++++++++++++++++++++++++++++
 board/avionic-design/dts/tegra20-tec.dts    | 58 +++++++++++++++++++++++++++++
 7 files changed, 176 insertions(+), 176 deletions(-)
 delete mode 100644 board/avionic-design/dts/tegra2-medcom.dts
 delete mode 100644 board/avionic-design/dts/tegra2-plutux.dts
 delete mode 100644 board/avionic-design/dts/tegra2-tec.dts
 create mode 100644 board/avionic-design/dts/tegra20-medcom.dts
 create mode 100644 board/avionic-design/dts/tegra20-plutux.dts
 create mode 100644 board/avionic-design/dts/tegra20-tec.dts

(limited to 'board/avionic-design')

diff --git a/board/avionic-design/common/tamonten.c b/board/avionic-design/common/tamonten.c
index 2c14462..a0a4d1d 100644
--- a/board/avionic-design/common/tamonten.c
+++ b/board/avionic-design/common/tamonten.c
@@ -28,7 +28,7 @@
 #include <asm/io.h>
 #include <asm/gpio.h>
 #include <asm/arch/board.h>
-#include <asm/arch/tegra2.h>
+#include <asm/arch/tegra20.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/clk_rst.h>
 #include <asm/arch/clock.h>
@@ -78,7 +78,7 @@ int board_mmc_init(bd_t *bd)
 	pin_mux_mmc();
 
 	/* init dev 0, SD slot, with 4-bit bus */
-	tegra2_mmc_init(0, 4, GPIO_PI6, GPIO_PH2);
+	tegra20_mmc_init(0, 4, GPIO_PI6, GPIO_PH2);
 
 	return 0;
 }
diff --git a/board/avionic-design/dts/tegra2-medcom.dts b/board/avionic-design/dts/tegra2-medcom.dts
deleted file mode 100644
index fc52f9c..0000000
--- a/board/avionic-design/dts/tegra2-medcom.dts
+++ /dev/null
@@ -1,58 +0,0 @@
-/dts-v1/;
-
-/include/ ARCH_CPU_DTS
-
-/ {
-	model = "Avionic Design Medcom-Wide";
-	compatible = "avionic-design,medcom", "nvidia,tegra20";
-
-	aliases {
-		usb0 = "/usb@c5008000";
-	};
-
-	memory {
-		reg = <0x00000000 0x20000000>;
-	};
-
-	clocks {
-		clk_32k: clk_32k {
-			clock-frequency = <32000>;
-		};
-
-		osc {
-			clock-frequency = <12000000>;
-		};
-	};
-
-	clock@60006000 {
-		clocks = <&clk_32k &osc>;
-	};
-
-	serial@70006300 {
-		clock-frequency = <216000000>;
-	};
-
-	i2c@7000c000 {
-		status = "disabled";
-	};
-
-	i2c@7000c400 {
-		status = "disabled";
-	};
-
-	i2c@7000c500 {
-		status = "disabled";
-	};
-
-	i2c@7000d000 {
-		status = "disabled";
-	};
-
-	usb@c5000000 {
-		status = "disabled";
-	};
-
-	usb@c5004000 {
-		status = "disabled";
-	};
-};
diff --git a/board/avionic-design/dts/tegra2-plutux.dts b/board/avionic-design/dts/tegra2-plutux.dts
deleted file mode 100644
index cef49ad..0000000
--- a/board/avionic-design/dts/tegra2-plutux.dts
+++ /dev/null
@@ -1,58 +0,0 @@
-/dts-v1/;
-
-/include/ ARCH_CPU_DTS
-
-/ {
-	model = "Avionic Design Plutux";
-	compatible = "avionic-design,plutux", "nvidia,tegra20";
-
-	aliases {
-		usb0 = "/usb@c5008000";
-	};
-
-	memory {
-		reg = <0x00000000 0x20000000>;
-	};
-
-	clocks {
-		clk_32k: clk_32k {
-			clock-frequency = <32000>;
-		};
-
-		osc {
-			clock-frequency = <12000000>;
-		};
-	};
-
-	clock@60006000 {
-		clocks = <&clk_32k &osc>;
-	};
-
-	serial@70006300 {
-		clock-frequency = <216000000>;
-	};
-
-	i2c@7000c000 {
-		status = "disabled";
-	};
-
-	i2c@7000c400 {
-		status = "disabled";
-	};
-
-	i2c@7000c500 {
-		status = "disabled";
-	};
-
-	i2c@7000d000 {
-		status = "disabled";
-	};
-
-	usb@c5000000 {
-		status = "disabled";
-	};
-
-	usb@c5004000 {
-		status = "disabled";
-	};
-};
diff --git a/board/avionic-design/dts/tegra2-tec.dts b/board/avionic-design/dts/tegra2-tec.dts
deleted file mode 100644
index 9faebd8..0000000
--- a/board/avionic-design/dts/tegra2-tec.dts
+++ /dev/null
@@ -1,58 +0,0 @@
-/dts-v1/;
-
-/include/ ARCH_CPU_DTS
-
-/ {
-	model = "Avionic Design Tamonten Evaluation Carrier";
-	compatible = "avionic-design,tec", "nvidia,tegra20";
-
-	aliases {
-		usb0 = "/usb@c5008000";
-	};
-
-	memory {
-		reg = <0x00000000 0x20000000>;
-	};
-
-	clocks {
-		clk_32k: clk_32k {
-			clock-frequency = <32000>;
-		};
-
-		osc {
-			clock-frequency = <12000000>;
-		};
-	};
-
-	clock@60006000 {
-		clocks = <&clk_32k &osc>;
-	};
-
-	serial@70006300 {
-		clock-frequency = <216000000>;
-	};
-
-	i2c@7000c000 {
-		status = "disabled";
-	};
-
-	i2c@7000c400 {
-		status = "disabled";
-	};
-
-	i2c@7000c500 {
-		status = "disabled";
-	};
-
-	i2c@7000d000 {
-		status = "disabled";
-	};
-
-	usb@c5000000 {
-		status = "disabled";
-	};
-
-	usb@c5004000 {
-		status = "disabled";
-	};
-};
diff --git a/board/avionic-design/dts/tegra20-medcom.dts b/board/avionic-design/dts/tegra20-medcom.dts
new file mode 100644
index 0000000..fc52f9c
--- /dev/null
+++ b/board/avionic-design/dts/tegra20-medcom.dts
@@ -0,0 +1,58 @@
+/dts-v1/;
+
+/include/ ARCH_CPU_DTS
+
+/ {
+	model = "Avionic Design Medcom-Wide";
+	compatible = "avionic-design,medcom", "nvidia,tegra20";
+
+	aliases {
+		usb0 = "/usb@c5008000";
+	};
+
+	memory {
+		reg = <0x00000000 0x20000000>;
+	};
+
+	clocks {
+		clk_32k: clk_32k {
+			clock-frequency = <32000>;
+		};
+
+		osc {
+			clock-frequency = <12000000>;
+		};
+	};
+
+	clock@60006000 {
+		clocks = <&clk_32k &osc>;
+	};
+
+	serial@70006300 {
+		clock-frequency = <216000000>;
+	};
+
+	i2c@7000c000 {
+		status = "disabled";
+	};
+
+	i2c@7000c400 {
+		status = "disabled";
+	};
+
+	i2c@7000c500 {
+		status = "disabled";
+	};
+
+	i2c@7000d000 {
+		status = "disabled";
+	};
+
+	usb@c5000000 {
+		status = "disabled";
+	};
+
+	usb@c5004000 {
+		status = "disabled";
+	};
+};
diff --git a/board/avionic-design/dts/tegra20-plutux.dts b/board/avionic-design/dts/tegra20-plutux.dts
new file mode 100644
index 0000000..cef49ad
--- /dev/null
+++ b/board/avionic-design/dts/tegra20-plutux.dts
@@ -0,0 +1,58 @@
+/dts-v1/;
+
+/include/ ARCH_CPU_DTS
+
+/ {
+	model = "Avionic Design Plutux";
+	compatible = "avionic-design,plutux", "nvidia,tegra20";
+
+	aliases {
+		usb0 = "/usb@c5008000";
+	};
+
+	memory {
+		reg = <0x00000000 0x20000000>;
+	};
+
+	clocks {
+		clk_32k: clk_32k {
+			clock-frequency = <32000>;
+		};
+
+		osc {
+			clock-frequency = <12000000>;
+		};
+	};
+
+	clock@60006000 {
+		clocks = <&clk_32k &osc>;
+	};
+
+	serial@70006300 {
+		clock-frequency = <216000000>;
+	};
+
+	i2c@7000c000 {
+		status = "disabled";
+	};
+
+	i2c@7000c400 {
+		status = "disabled";
+	};
+
+	i2c@7000c500 {
+		status = "disabled";
+	};
+
+	i2c@7000d000 {
+		status = "disabled";
+	};
+
+	usb@c5000000 {
+		status = "disabled";
+	};
+
+	usb@c5004000 {
+		status = "disabled";
+	};
+};
diff --git a/board/avionic-design/dts/tegra20-tec.dts b/board/avionic-design/dts/tegra20-tec.dts
new file mode 100644
index 0000000..9faebd8
--- /dev/null
+++ b/board/avionic-design/dts/tegra20-tec.dts
@@ -0,0 +1,58 @@
+/dts-v1/;
+
+/include/ ARCH_CPU_DTS
+
+/ {
+	model = "Avionic Design Tamonten Evaluation Carrier";
+	compatible = "avionic-design,tec", "nvidia,tegra20";
+
+	aliases {
+		usb0 = "/usb@c5008000";
+	};
+
+	memory {
+		reg = <0x00000000 0x20000000>;
+	};
+
+	clocks {
+		clk_32k: clk_32k {
+			clock-frequency = <32000>;
+		};
+
+		osc {
+			clock-frequency = <12000000>;
+		};
+	};
+
+	clock@60006000 {
+		clocks = <&clk_32k &osc>;
+	};
+
+	serial@70006300 {
+		clock-frequency = <216000000>;
+	};
+
+	i2c@7000c000 {
+		status = "disabled";
+	};
+
+	i2c@7000c400 {
+		status = "disabled";
+	};
+
+	i2c@7000c500 {
+		status = "disabled";
+	};
+
+	i2c@7000d000 {
+		status = "disabled";
+	};
+
+	usb@c5000000 {
+		status = "disabled";
+	};
+
+	usb@c5004000 {
+		status = "disabled";
+	};
+};
-- 
cgit v1.1