Patchwork [U-Boot] Tegra114: fdt: Move aliases from dtsi to dts file as per other Tegras

login
register
mail settings
Submitter Tom Warren
Date March 12, 2013, 4:08 p.m.
Message ID <1363104519-30029-1-git-send-email-twarren@nvidia.com>
Download mbox | patch
Permalink /patch/227069/
State Accepted
Delegated to: Tom Warren
Headers show

Comments

Tom Warren - March 12, 2013, 4:08 p.m.
All other Tegra boards have their aliase nodes in the .dts file

Signed-off-by: Tom Warren <twarren@nvidia.com>
---
 arch/arm/dts/tegra114.dtsi            |    8 --------
 board/nvidia/dts/tegra114-dalmore.dts |    8 ++++++++
 2 files changed, 8 insertions(+), 8 deletions(-)
Stephen Warren - March 12, 2013, 5:37 p.m.
On 03/12/2013 10:08 AM, Tom Warren wrote:
> All other Tegra boards have their aliase nodes in the .dts file

Reviewed-by: Stephen Warren <swarren@nvidia.com>

Patch

diff --git a/arch/arm/dts/tegra114.dtsi b/arch/arm/dts/tegra114.dtsi
index dfeac53..701c0f9 100644
--- a/arch/arm/dts/tegra114.dtsi
+++ b/arch/arm/dts/tegra114.dtsi
@@ -3,14 +3,6 @@ 
 / {
 	compatible = "nvidia,tegra114";
 
-	aliases {
-		i2c0 = "/i2c@7000d000";
-		i2c1 = "/i2c@7000c000";
-		i2c2 = "/i2c@7000c400";
-		i2c3 = "/i2c@7000c500";
-		i2c4 = "/i2c@7000c700";
-	};
-
 	tegra_car: clock {
 		compatible = "nvidia,tegra114-car";
 		reg = <0x60006000 0x1000>;
diff --git a/board/nvidia/dts/tegra114-dalmore.dts b/board/nvidia/dts/tegra114-dalmore.dts
index 3e1e1ea..30cf1fb 100644
--- a/board/nvidia/dts/tegra114-dalmore.dts
+++ b/board/nvidia/dts/tegra114-dalmore.dts
@@ -6,6 +6,14 @@ 
 	model = "NVIDIA Dalmore";
 	compatible = "nvidia,dalmore", "nvidia,tegra114";
 
+	aliases {
+		i2c0 = "/i2c@7000d000";
+		i2c1 = "/i2c@7000c000";
+		i2c2 = "/i2c@7000c400";
+		i2c3 = "/i2c@7000c500";
+		i2c4 = "/i2c@7000c700";
+	};
+
 	memory {
 		device_type = "memory";
 		reg = <0x80000000 0x80000000>;