From 7e0878fccc0954f1a4f63da05f9ecaa390bd1c12 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 22 Apr 2014 23:26:21 +0200
Subject: [PATCH] ARM: orion5x: use node labels for UART and SATA on edmini_v2

This commit converts the existing devices described in the edmini_v2
Device Tree to use node labels: the UART and SATA device. Also, it
reorders the eth and mdio node label references to be sorted
alphabetically.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Link: https://lkml.kernel.org/r/1398202002-28530-18-git-send-email-thomas.petazzoni@free-electrons.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
---
 .../orion5x-lacie-ethernet-disk-mini-v2.dts   | 30 +++++++++----------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts b/arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts
index df53d25668bb..83f45a722055 100644
--- a/arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts
+++ b/arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts
@@ -28,18 +28,6 @@
 	soc {
 		ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000>,
 			 <MBUS_ID(0x09, 0x00) 0 0xf2200000 0x800>;
-
-		internal-regs {
-			serial@12000 {
-				clock-frequency = <166666667>;
-				status = "okay";
-			};
-
-			sata@80000 {
-				status = "okay";
-				nr-ports = <2>;
-			};
-		};
 	};
 
 	gpio-keys {
@@ -63,6 +51,14 @@
 	};
 };
 
+&eth {
+	status = "okay";
+
+	ethernet-port@0 {
+		phy-handle = <&ethphy>;
+	};
+};
+
 &mdio {
 	status = "okay";
 
@@ -71,10 +67,12 @@
 	};
 };
 
-&eth {
+&sata {
 	status = "okay";
+	nr-ports = <2>;
+};
 
-	ethernet-port@0 {
-		phy-handle = <&ethphy>;
-	};
+&uart0 {
+	clock-frequency = <166666667>;
+	status = "okay";
 };
-- 
2.39.5