OSDN Git Service

ARM: STi: DT: STih407: Re-order #include <*.dtsi> files
authorLee Jones <lee.jones@linaro.org>
Mon, 11 May 2015 14:12:00 +0000 (16:12 +0200)
committerMaxime Coquelin <maxime.coquelin@st.com>
Thu, 14 May 2015 15:42:34 +0000 (17:42 +0200)
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@linaro.org>]
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Maxime Coquelin <maxime.coquelin@st.com>
arch/arm/boot/dts/stih407-b2120.dts

index af48714..6d93475 100644 (file)
@@ -7,8 +7,8 @@
  * published by the Free Software Foundation.
  */
 /dts-v1/;
-#include "stihxxx-b2120.dtsi"
 #include "stih407.dtsi"
+#include "stihxxx-b2120.dtsi"
 / {
        model = "STiH407 B2120";
        compatible = "st,stih407-b2120", "st,stih407";