diff options
| author |   Maxime Coquelin <maxime.coquelin@st.com> | 2014-05-20 11:10:54 +0200 |
|---|---|---|
| committer | Maxime Coquelin <maxime.coquelin@st.com> | 2014-05-21 14:20:23 +0200 |
| commit | 59b26c8092eac8c5c2c3ae6926e139a7bb7eb067 (patch) | |
| tree | cbb9a4b0920123a7082363bff89a8d1065d2b917 | |
| parent | ARM: dts: Sort STi boards in Makefile (diff) | |
| download | linux-dev-59b26c8092eac8c5c2c3ae6926e139a7bb7eb067.tar.xz linux-dev-59b26c8092eac8c5c2c3ae6926e139a7bb7eb067.zip | |
ARM: dts: Fix STi boards compatibles
The compatible strings have to be ordered from specific to generic.
This patch fixes this for STi boards, which did the exact opposite.
Cc: Olof Johansson <olof@lixom.net>
Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Maxime Coquelin <maxime.coquelin@st.com>
| -rw-r--r-- | arch/arm/boot/dts/stih415-b2000.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/stih415-b2020.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/stih416-b2000.dts | 3 | ||||
| -rw-r--r-- | arch/arm/boot/dts/stih416-b2020.dts | 3 |
4 files changed, 4 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/stih415-b2000.dts b/arch/arm/boot/dts/stih415-b2000.dts index d4af53160435..bdfbd3765db2 100644 --- a/arch/arm/boot/dts/stih415-b2000.dts +++ b/arch/arm/boot/dts/stih415-b2000.dts @@ -11,5 +11,5 @@ #include "stih41x-b2000.dtsi" / { model = "STiH415 B2000 Board"; - compatible = "st,stih415", "st,stih415-b2000"; + compatible = "st,stih415-b2000", "st,stih415"; }; diff --git a/arch/arm/boot/dts/stih415-b2020.dts b/arch/arm/boot/dts/stih415-b2020.dts index 442b019e9a3a..71903a87bd31 100644 --- a/arch/arm/boot/dts/stih415-b2020.dts +++ b/arch/arm/boot/dts/stih415-b2020.dts @@ -11,5 +11,5 @@ #include "stih41x-b2020.dtsi" / { model = "STiH415 B2020 Board"; - compatible = "st,stih415", "st,stih415-b2020"; + compatible = "st,stih415-b2020", "st,stih415"; }; diff --git a/arch/arm/boot/dts/stih416-b2000.dts b/arch/arm/boot/dts/stih416-b2000.dts index a5eb6eee10bf..488e80a5d69d 100644 --- a/arch/arm/boot/dts/stih416-b2000.dts +++ b/arch/arm/boot/dts/stih416-b2000.dts @@ -9,8 +9,7 @@ /dts-v1/; #include "stih416.dtsi" #include "stih41x-b2000.dtsi" - / { - compatible = "st,stih416", "st,stih416-b2000"; model = "STiH416 B2000"; + compatible = "st,stih416-b2000", "st,stih416"; }; diff --git a/arch/arm/boot/dts/stih416-b2020.dts b/arch/arm/boot/dts/stih416-b2020.dts index 276f28da573a..4e2df66b99ea 100644 --- a/arch/arm/boot/dts/stih416-b2020.dts +++ b/arch/arm/boot/dts/stih416-b2020.dts @@ -11,6 +11,5 @@ #include "stih41x-b2020.dtsi" / { model = "STiH416 B2020"; - compatible = "st,stih416", "st,stih416-b2020"; - + compatible = "st,stih416-b2020", "st,stih416"; }; |