summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/exynos3250-rinato.dts
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2018-06-22 22:20:35 +0300
committerThomas Gleixner <tglx@linutronix.de>2018-06-22 22:20:35 +0300
commit7731b8bc94e599c9a79e428f3359ff2c34b7576a (patch)
tree879f18ccbe274122f2d4f095b43cbc7f953e0ada /arch/arm/boot/dts/exynos3250-rinato.dts
parent48e315618dc4dc8904182cd221e3d395d5d97005 (diff)
parent9ffc59d57228d74809700be6f7ecb1db10292f05 (diff)
downloadlinux-7731b8bc94e599c9a79e428f3359ff2c34b7576a.tar.xz
Merge branch 'linus' into x86/urgent
Required to queue a dependent fix.
Diffstat (limited to 'arch/arm/boot/dts/exynos3250-rinato.dts')
-rw-r--r--arch/arm/boot/dts/exynos3250-rinato.dts4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/exynos3250-rinato.dts b/arch/arm/boot/dts/exynos3250-rinato.dts
index 2c3460781cc6..2a6b828c01b7 100644
--- a/arch/arm/boot/dts/exynos3250-rinato.dts
+++ b/arch/arm/boot/dts/exynos3250-rinato.dts
@@ -24,6 +24,10 @@
i2c7 = &i2c_max77836;
};
+ chosen {
+ stdout-path = &serial_1;
+ };
+
memory@40000000 {
device_type = "memory";
reg = <0x40000000 0x1ff00000>;