diff options
| author | Lee Jones <lee.jones@linaro.org> | 2015-05-11 16:12:00 +0200 |
|---|---|---|
| committer | Maxime Coquelin <maxime.coquelin@st.com> | 2015-05-14 17:42:34 +0200 |
| commit | 2cdce7a98b1fbd3839aec5fc79a0f237c9b75dcc (patch) | |
| tree | 415bffadc339d534f6f39d4f31223eaa92963642 /arch/arm/boot/dts/stih407-b2120.dts | |
| parent | ARM: STi: Ensure requested STi's SysCfg Controlled IRQs are enabled at boot (diff) | |
| download | linux-2cdce7a98b1fbd3839aec5fc79a0f237c9b75dcc.tar.xz linux-2cdce7a98b1fbd3839aec5fc79a0f237c9b75dcc.zip | |
ARM: STi: DT: STih407: Re-order #include <*.dtsi> files
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>
Signed-off-by: Maxime Coquelin <maxime.coquelin@st.com>
Diffstat (limited to 'arch/arm/boot/dts/stih407-b2120.dts')
| -rw-r--r-- | arch/arm/boot/dts/stih407-b2120.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/stih407-b2120.dts b/arch/arm/boot/dts/stih407-b2120.dts index af487145cd89..6d93475be554 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"; |