| Message ID | 1431353569-13291-1-git-send-email-lee.jones@linaro.org |
|---|---|
| State | Accepted |
| Commit | 2cdce7a98b1fbd3839aec5fc79a0f237c9b75dcc |
| Headers | show |
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. -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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";
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(-)