[source] apm821xx: dts: append SoC compatible to DTS

LEDE Commits lede-commits at lists.infradead.org
Wed Dec 20 16:06:28 PST 2017


mkresin pushed a commit to source.git, branch master:
https://git.lede-project.org/64b36fee8ebbe942c97e23e4066bb48ffd7bce26

commit 64b36fee8ebbe942c97e23e4066bb48ffd7bce26
Author: Christian Lamparter <chunkeey at gmail.com>
AuthorDate: Sun Dec 17 14:59:56 2017 +0100

    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 at gmail.com>
---
 target/linux/apm821xx/dts/MR24.dts         | 2 +-
 target/linux/apm821xx/dts/MX60.dts         | 2 +-
 target/linux/apm821xx/dts/apollo3g-duo.dts | 1 +
 target/linux/apm821xx/dts/apollo3g.dts     | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/target/linux/apm821xx/dts/MR24.dts b/target/linux/apm821xx/dts/MR24.dts
index 75bb322..8b58ce1 100644
--- 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 6c75363..64c8540 100644
--- 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 53459b0..4f6cc50 100644
--- 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 4d31eda..d841352 100644
--- 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";
 };



More information about the lede-commits mailing list