From: Cooper Jr., Franklin <fcooper@ti.com>
Date: Fri, 16 Jun 2017 22:25:29 +0000 (-0500)
Subject: ARM: dts: keystone-k2g-evm: Add unit address to memory node
X-Git-Tag: v2017.09-rc1~231
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d3f97db7174b6ecff9b5fb4c9a48b343360a154;p=pandora-u-boot.git

ARM: dts: keystone-k2g-evm: Add unit address to memory node

Upstream Linux has the unit address being added to the various 66AK2Gx
boards dts. Therefore, update the dts to mimic this change.

Also remove memory node from the base K2G dtsi file.

Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
---

diff --git a/arch/arm/dts/keystone-k2g-evm.dts b/arch/arm/dts/keystone-k2g-evm.dts
index 2c99df44600..f6fce33b98b 100644
--- a/arch/arm/dts/keystone-k2g-evm.dts
+++ b/arch/arm/dts/keystone-k2g-evm.dts
@@ -18,6 +18,11 @@
 	chosen {
 		stdout-path = &uart0;
 	};
+
+	memory@80000000 {
+		device_type = "memory";
+		reg = <0x80000000 0x80000000>;
+	};
 };
 
 &mdio {
diff --git a/arch/arm/dts/keystone-k2g.dtsi b/arch/arm/dts/keystone-k2g.dtsi
index f05afb723f8..7b2fae68605 100644
--- a/arch/arm/dts/keystone-k2g.dtsi
+++ b/arch/arm/dts/keystone-k2g.dtsi
@@ -30,11 +30,6 @@
 		i2c2 = &i2c2;
 	};
 
-	memory {
-		device_type = "memory";
-		reg = <0x80000000 0x80000000>;
-	};
-
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;