diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-08-29 12:20:52 +0900 |
---|---|---|
committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-08-30 09:07:04 +0900 |
commit | 6c9e46efaed5855e4ee60a770eb27b92683b0a67 (patch) | |
tree | 1289d69400d14a61e941776f783068f319de01c5 /arch/arm/dts/uniphier-pro5-4kbox.dts | |
parent | 111689e744e638fb29c74003719fe03891866742 (diff) | |
download | u-boot-6c9e46efaed5855e4ee60a770eb27b92683b0a67.tar.gz |
ARM: dts: uniphier: sync with Linux
Import updates queued up for Linux 4.14-rc1.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'arch/arm/dts/uniphier-pro5-4kbox.dts')
-rw-r--r-- | arch/arm/dts/uniphier-pro5-4kbox.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/dts/uniphier-pro5-4kbox.dts b/arch/arm/dts/uniphier-pro5-4kbox.dts index d59309000b..05597d385e 100644 --- a/arch/arm/dts/uniphier-pro5-4kbox.dts +++ b/arch/arm/dts/uniphier-pro5-4kbox.dts @@ -8,7 +8,7 @@ */ /dts-v1/; -/include/ "uniphier-pro5.dtsi" +#include "uniphier-pro5.dtsi" / { model = "UniPhier Pro5 4KBOX Board"; @@ -26,7 +26,7 @@ i2c6 = &i2c6; }; - memory { + memory@80000000 { device_type = "memory"; reg = <0x80000000 0x40000000>; }; |