* [PATCH] ARM: STi: DT: STih407: Re-order #include <*.dtsi> files
@ 2015-05-11 14:12 Lee Jones
2015-05-11 14:23 ` [STLinux Kernel] " Peter Griffin
2015-05-15 9:49 ` Maxime Coquelin
0 siblings, 2 replies; 3+ messages in thread
From: Lee Jones @ 2015-05-11 14:12 UTC (permalink / raw)
To: linux-arm-kernel
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";
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* [STLinux Kernel] [PATCH] ARM: STi: DT: STih407: Re-order #include <*.dtsi> files
2015-05-11 14:12 [PATCH] ARM: STi: DT: STih407: Re-order #include <*.dtsi> files Lee Jones
@ 2015-05-11 14:23 ` Peter Griffin
2015-05-15 9:49 ` Maxime Coquelin
1 sibling, 0 replies; 3+ messages in thread
From: Peter Griffin @ 2015-05-11 14:23 UTC (permalink / raw)
To: linux-arm-kernel
Hi Lee,
On Mon, 11 May 2015, 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>
Acked-by: Peter Griffin <peter.griffin@linaro.org>
regards,
Peter.
^ permalink raw reply [flat|nested] 3+ messages in thread
* [STLinux Kernel] [PATCH] ARM: STi: DT: STih407: Re-order #include <*.dtsi> files
2015-05-11 14:12 [PATCH] ARM: STi: DT: STih407: Re-order #include <*.dtsi> files Lee Jones
2015-05-11 14:23 ` [STLinux Kernel] " Peter Griffin
@ 2015-05-15 9:49 ` Maxime Coquelin
1 sibling, 0 replies; 3+ messages in thread
From: Maxime Coquelin @ 2015-05-15 9:49 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-05-15 9:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-11 14:12 [PATCH] ARM: STi: DT: STih407: Re-order #include <*.dtsi> files Lee Jones
2015-05-11 14:23 ` [STLinux Kernel] " Peter Griffin
2015-05-15 9:49 ` Maxime Coquelin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).