summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/rk3288-veyron.dtsi
diff options
context:
space:
mode:
authorWolfram Sang <wsa@the-dreams.de>2018-12-11 20:58:20 +0100
committerWolfram Sang <wsa@the-dreams.de>2018-12-11 20:58:20 +0100
commit66693960f574aa830986e1603657af36423b24eb (patch)
tree035aae54d64d79e514f95e18cc3dcf411a98c55e /arch/arm/boot/dts/rk3288-veyron.dtsi
parent3ca3f86f7f4856222a8b697d60d32717160a1a1b (diff)
parent40e020c129cfc991e8ab4736d2665351ffd1468d (diff)
downloadlinux-66693960f574aa830986e1603657af36423b24eb.tar.gz
linux-66693960f574aa830986e1603657af36423b24eb.tar.bz2
linux-66693960f574aa830986e1603657af36423b24eb.zip
Merge tag 'v4.20-rc6' into i2c/for-5.0
Linux 4.20-rc6
Diffstat (limited to 'arch/arm/boot/dts/rk3288-veyron.dtsi')
-rw-r--r--arch/arm/boot/dts/rk3288-veyron.dtsi6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/rk3288-veyron.dtsi b/arch/arm/boot/dts/rk3288-veyron.dtsi
index 2075120cfc4d..d8bf939a3aff 100644
--- a/arch/arm/boot/dts/rk3288-veyron.dtsi
+++ b/arch/arm/boot/dts/rk3288-veyron.dtsi
@@ -10,7 +10,11 @@
#include "rk3288.dtsi"
/ {
- memory@0 {
+ /*
+ * The default coreboot on veyron devices ignores memory@0 nodes
+ * and would instead create another memory node.
+ */
+ memory {
device_type = "memory";
reg = <0x0 0x0 0x0 0x80000000>;
};