[PATCH 4.9 085/130] ARM: dts: dra7: Add an empty chosen node to top level DTSI

From: Greg Kroah-Hartman
Date: Tue Jan 24 2017 - 03:13:47 EST


4.9-stable review patch. If anyone has any objections, please let me know.

------------------

From: Javier Martinez Canillas <javier@xxxxxxxxxxxxxxx>

commit 7f6c857b12911ed56b2056f9d5491e16b5fc95ea upstream.

Commit 55871eb6e2cc ("ARM: dts: dra7: 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: 55871eb6e2cc ("ARM: dts: dra7: Remove skeleton.dtsi usage")
Reported-by: Pali Rohar <pali.rohar@xxxxxxxxx>
Signed-off-by: Javier Martinez Canillas <javier@xxxxxxxxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

---
arch/arm/boot/dts/dra7.dtsi | 1 +
1 file changed, 1 insertion(+)

--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -18,6 +18,7 @@

compatible = "ti,dra7xx";
interrupt-parent = <&crossbar_mpu>;
+ chosen { };

aliases {
i2c0 = &i2c1;