summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorCooper Jr., Franklin <fcooper@ti.com>2017-06-16 17:25:29 -0500
committerTom Rini <trini@konsulko.com>2017-07-10 14:26:00 -0400
commit0d3f97db7174b6ecff9b5fb4c9a48b343360a154 (patch)
tree65d1c7ce0ff47d7a384585d5053fdb481e2c51d6 /arch
parentdf5ec72d7adf5cdb452e79228fe3d344ef47167d (diff)
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/dts/keystone-k2g-evm.dts5
-rw-r--r--arch/arm/dts/keystone-k2g.dtsi5
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>;