apm821xx: dts: append SoC compatible to DTS

This patch appends the "apm,bluestone" or "amcc,apollo3g"
machine compatible string to the current device tree source.

Please note that unlike other archs the PPC DT code does
not regard the machine's compatible string as a priority
list. This is explained in the kernel's usage-model.txt as follows:
"PowerPC uses a slightly different scheme where it calls the .probe()
hook from each machine_desc, and the first one returning TRUE is used.
However, this approach does not take into account the priority of the
compatible list, and probably should be avoided for new architecture
support."

For this reason, the "apm,bluestone" compatible string can't be
added to the WNDR4700. As otherwise the target specific pci
fix-up code will get ignored and this causes the ath9k WIFI
to not get initialized.

Signed-off-by: Christian Lamparter <chunkeey@gmail.com>

diff --git a/target/linux/apm821xx/dts/MR24.dts b/target/linux/apm821xx/dts/MR24.dts
index 75bb32255c7e1bee5f50f24bd390639e6809ef85..8b58ce1991516e1043bfd197332b2c4c1852016f 100644 (file)
--- a/target/linux/apm821xx/dts/MR24.dts
+++ b/target/linux/apm821xx/dts/MR24.dts
@@ -16,7 +16,7 @@
 
 / {
        model = "Meraki MR24 Access Point";
-       compatible = "meraki,ikarem";
+       compatible = "meraki,ikarem", "apm,bluestone";
 
        aliases {
                serial0 = &UART1;

diff --git a/target/linux/apm821xx/dts/MX60.dts b/target/linux/apm821xx/dts/MX60.dts
index 6c753639b2d65df9b8a2cea875436ccf73b09553..64c8540d4d6447f52d930bda2bf9a2878b40cbaa 100644 (file)
--- a/target/linux/apm821xx/dts/MX60.dts
+++ b/target/linux/apm821xx/dts/MX60.dts
@@ -16,7 +16,7 @@
 
 / {
        model = "Meraki MX60/MX60W Security Appliance";
-       compatible = "meraki,buckminster";
+       compatible = "meraki,buckminster", "apm,bluestone";
 
        aliases {
                serial0 = &UART1;

diff --git a/target/linux/apm821xx/dts/apollo3g-duo.dts b/target/linux/apm821xx/dts/apollo3g-duo.dts
index 53459b0cc04b5c63779d902d66c869ebf8cc413e..4f6cc506f57bf66cbdc20dbde64571de69dbe7f8 100644 (file)
--- a/target/linux/apm821xx/dts/apollo3g-duo.dts
+++ b/target/linux/apm821xx/dts/apollo3g-duo.dts
@@ -14,6 +14,7 @@
 #include "apollo3g.dtsi"
 
 / {
+       compatible = "wd,mybooklive-duo", "amcc,apollo3g";
        model = "MyBook Live Duo";
 };
 

diff --git a/target/linux/apm821xx/dts/apollo3g.dts b/target/linux/apm821xx/dts/apollo3g.dts
index 4d31edae4a2d36930570d4f9450344164b34fb02..d841352292f5d4aee359edbef61bebff0ec38144 100644 (file)
--- a/target/linux/apm821xx/dts/apollo3g.dts
+++ b/target/linux/apm821xx/dts/apollo3g.dts
@@ -12,5 +12,6 @@
 #include "apollo3g.dtsi"
 
 / {
+       compatible = "wd,mybooklive", "amcc,apollo3g";
        model = "MyBook Live";
 };