From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lee Jones Subject: [PATCH] ARM: STi: DT: STih407: Re-order #include <*.dtsi> files Date: Mon, 11 May 2015 15:12:49 +0100 Message-ID: <1431353569-13291-1-git-send-email-lee.jones@linaro.org> Return-path: Sender: linux-kernel-owner@vger.kernel.org To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: kernel@stlinux.com, devicetree@vger.kernel.org, Lee Jones List-Id: devicetree@vger.kernel.org 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 ] Signed-off-by: Lee Jones --- 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. */ /dts-v1/; -#include "stihxxx-b2120.dtsi" #include "stih407.dtsi" +#include "stihxxx-b2120.dtsi" / { model = "STiH407 B2120"; compatible = "st,stih407-b2120", "st,stih407"; -- 1.9.1