summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@linaro.org>2014-08-11 15:03:08 +0200
committerGrant Likely <grant.likely@linaro.org>2014-08-11 15:03:08 +0200
commitb775e642bf958a02210ac4d4edd1a1b7067c49fa (patch)
treea3425ead7b2738e6a05249a3c3667d1069782330 /arch/arm
parentof: Fixing OF Selftest build error (diff)
parentof: Migrate of_find_node_by_name() users to for_each_node_by_name() (diff)
downloadlinux-b775e642bf958a02210ac4d4edd1a1b7067c49fa.tar.xz
linux-b775e642bf958a02210ac4d4edd1a1b7067c49fa.zip
Merge branch 'devicetree/next-console' into devicetree/next
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/versatile-ab.dts4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/versatile-ab.dts b/arch/arm/boot/dts/versatile-ab.dts
index e01e5a081def..88e94c5506a1 100644
--- a/arch/arm/boot/dts/versatile-ab.dts
+++ b/arch/arm/boot/dts/versatile-ab.dts
@@ -15,6 +15,10 @@
i2c0 = &i2c0;
};
+ chosen {
+ stdout-path = &uart0;
+ };
+
memory {
reg = <0x0 0x08000000>;
};