lkml.org 
[lkml]   [2015]   [May]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [STLinux Kernel] [PATCH] ARM: STi: DT: STih407: Re-order #include <*.dtsi> files
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@linaro.org>]
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> ---
> 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


\
 
 \ /
  Last update: 2015-05-15 12:01    [W:0.034 / U:0.860 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site