From 0d3f97db7174b6ecff9b5fb4c9a48b343360a154 Mon Sep 17 00:00:00 2001 From: "Cooper Jr., Franklin" Date: Fri, 16 Jun 2017 17:25:29 -0500 Subject: [PATCH] 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 Reviewed-by: Tom Rini --- arch/arm/dts/keystone-k2g-evm.dts | 5 +++++ arch/arm/dts/keystone-k2g.dtsi | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/dts/keystone-k2g-evm.dts b/arch/arm/dts/keystone-k2g-evm.dts index 2c99df4460..f6fce33b98 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 f05afb723f..7b2fae6860 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>; -- 2.25.1