summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorJavier Martinez Canillas <javier@osg.samsung.com>2016-12-19 11:44:39 -0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-01-26 08:24:42 +0100
commit3e1c70972204add48a338ee9170a6c0358304e9a (patch)
tree922812f76400047d0887e88e1d9f28982359af44 /arch/arm
parentab6dc01db1f7df8957e451af93ece9327135bbac (diff)
downloadlinux-rpi3-3e1c70972204add48a338ee9170a6c0358304e9a.tar.gz
linux-rpi3-3e1c70972204add48a338ee9170a6c0358304e9a.tar.bz2
linux-rpi3-3e1c70972204add48a338ee9170a6c0358304e9a.zip
ARM: dts: dm814x: Add an empty chosen node to top level DTSI
commit 9536fd30d41ae4f30d04762676e5f5f602e16aa8 upstream. Commit 76155b378c59 ("ARM: dts: dm814x: Remove skeleton.dtsi usage") removed the skeleton.dtsi usage since we want to get rid of it. But this can cause issues when booting a kernel with a boot-loader that doesn't create a chosen node if this isn't present in the DTB since the decompressor relies on a pre-existing chosen node to be available to insert the command line and merge other ATAGS info. Fixes: 76155b378c59 ("ARM: dts: dm814x: Remove skeleton.dtsi usage") Reported-by: Pali Rohar <pali.rohar@gmail.com> Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com> Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/dm814x.dtsi1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/dm814x.dtsi b/arch/arm/boot/dts/dm814x.dtsi
index ff90a6ce6bdc..d87efab24fa2 100644
--- a/arch/arm/boot/dts/dm814x.dtsi
+++ b/arch/arm/boot/dts/dm814x.dtsi
@@ -12,6 +12,7 @@
interrupt-parent = <&intc>;
#address-cells = <1>;
#size-cells = <1>;
+ chosen { };
aliases {
i2c0 = &i2c1;