diff options
author | Javier Martinez Canillas <javier@osg.samsung.com> | 2016-12-19 09:44:34 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-26 02:24:42 -0500 |
commit | 5921b26bf7445591055bbe385b91d2ea866e7278 (patch) | |
tree | 0eae4a319ad5801e942a3177adb371bf5083b9ff /arch/arm/boot | |
parent | bec062cd47bd0184ec88a80c06f695acae8999ff (diff) |
ARM: dts: omap3: Add an empty chosen node to top level DTSI
commit 23ab4c6183ac0679d80888b5c4cc1d528fcc21c2 upstream.
Commit 008a2ebcd677 ("ARM: dts: omap3: 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: 008a2ebcd677 ("ARM: dts: omap3: 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/boot')
-rw-r--r-- | arch/arm/boot/dts/omap3.dtsi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi index 353d818ce5a6..2008648b8c9f 100644 --- a/arch/arm/boot/dts/omap3.dtsi +++ b/arch/arm/boot/dts/omap3.dtsi | |||
@@ -17,6 +17,7 @@ | |||
17 | interrupt-parent = <&intc>; | 17 | interrupt-parent = <&intc>; |
18 | #address-cells = <1>; | 18 | #address-cells = <1>; |
19 | #size-cells = <1>; | 19 | #size-cells = <1>; |
20 | chosen { }; | ||
20 | 21 | ||
21 | aliases { | 22 | aliases { |
22 | i2c0 = &i2c1; | 23 | i2c0 = &i2c1; |