summaryrefslogtreecommitdiff
path: root/arch/arm/dts/uniphier-ld11-global.dts
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2017-08-29 12:20:52 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2017-08-30 09:07:04 +0900
commit6c9e46efaed5855e4ee60a770eb27b92683b0a67 (patch)
tree1289d69400d14a61e941776f783068f319de01c5 /arch/arm/dts/uniphier-ld11-global.dts
parent111689e744e638fb29c74003719fe03891866742 (diff)
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-ld11-global.dts')
-rw-r--r--arch/arm/dts/uniphier-ld11-global.dts6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/dts/uniphier-ld11-global.dts b/arch/arm/dts/uniphier-ld11-global.dts
index 7a650a02486..5ffe7dedf72 100644
--- a/arch/arm/dts/uniphier-ld11-global.dts
+++ b/arch/arm/dts/uniphier-ld11-global.dts
@@ -9,7 +9,7 @@
*/
/dts-v1/;
-/include/ "uniphier-ld11.dtsi"
+#include "uniphier-ld11.dtsi"
/ {
model = "UniPhier LD11 Global Board (REF_LD11_GP)";
@@ -68,3 +68,7 @@
&usb2 {
status = "okay";
};
+
+&nand {
+ status = "okay";
+};