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 <[email protected]>
Acked-by: Lee Jones <[email protected]>
Signed-off-by: Maxime Coquelin <[email protected]>

diff --git a/arch/arm/boot/dts/stih415-b2000.dts b/arch/arm/boot/dts/stih415-b2000.dts
index d4af53160435f02f7a1fb3b6dd4788893b092ecb..bdfbd3765db2a48c6cd775b04d4e08e91f381f93 100644 (file)
--- 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 442b019e9a3a40da7f84031bdf5090a155719e7a..71903a87bd3151484bf152b1e06f04b07312d1f5 100644 (file)
--- 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 a5eb6eee10bfec5af14c3aa277bb81ab75939f8d..488e80a5d69d57507fda4745578679cd3f6c0469 100644 (file)
--- 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 276f28da573abe3cb7ea90f6e39a842954328f20..4e2df66b99eaf2443e03a8062eebd1b2ea6f7686 100644 (file)
--- 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";
 };