Re: [STLinux Kernel] [PATCH] ARM: STi: DT: STih407: Re-order #include <*.dtsi> files

From: Maxime Coquelin
Date: Fri May 15 2015 - 05:50:26 EST

HI Lee,

On 05/11/2015 04:12 PM, Lee Jones wrote:
This patch fixes a regression where serial is enabled by the first
(board) DTSI, then disabled by the second (SoC) file. To enable
serial and keep it enabled, we need to include the file which enables
it last.

Reported-by: LAVA [via Peter Griffin <peter.griffin@xxxxxxxxxx>]
Signed-off-by: Lee Jones <lee.jones@xxxxxxxxxx>
arch/arm/boot/dts/stih407-b2120.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/stih407-b2120.dts b/arch/arm/boot/dts/stih407-b2120.dts
index af48714..6d93475 100644
--- a/arch/arm/boot/dts/stih407-b2120.dts
+++ b/arch/arm/boot/dts/stih407-b2120.dts
@@ -7,8 +7,8 @@
* published by the Free Software Foundation.
-#include "stihxxx-b2120.dtsi"
#include "stih407.dtsi"
+#include "stihxxx-b2120.dtsi"
/ {
model = "STiH407 B2120";
compatible = "st,stih407-b2120", "st,stih407";

Applied to STi DT branch for v4.2.

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at