Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933275AbbEOJuW (ORCPT ); Fri, 15 May 2015 05:50:22 -0400 Received: from mx07-00178001.pphosted.com ([62.209.51.94]:34713 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753678AbbEOJuU (ORCPT ); Fri, 15 May 2015 05:50:20 -0400 Message-ID: <5555C13B.1090705@st.com> Date: Fri, 15 May 2015 11:49:47 +0200 From: Maxime Coquelin User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 MIME-Version: 1.0 To: Lee Jones , , CC: , Subject: Re: [STLinux Kernel] [PATCH] ARM: STi: DT: STih407: Re-order #include <*.dtsi> files References: <1431353569-13291-1-git-send-email-lee.jones@linaro.org> In-Reply-To: <1431353569-13291-1-git-send-email-lee.jones@linaro.org> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [10.251.16.224] X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.14.151,1.0.33,0.0.0000 definitions=2015-05-15_02:2015-05-14,2015-05-15,1970-01-01 signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1273 Lines: 38 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 ] > 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"; Applied to STi DT branch for v4.2. Thanks! Maxime -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/