| Message ID | 64db29bc30a37de5d70895718042bc5aacf65c86.1513455854.git.chunkeey@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | Mathias Kresin |
| Headers | show |
| Series | [LEDE-DEV,1/9] apm821xx: explicitly build the rootfs.img.gz target | expand |
diff --git a/target/linux/apm821xx/dts/MR24.dts b/target/linux/apm821xx/dts/MR24.dts index 75bb32255c..8b58ce1991 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 6c753639b2..64c8540d4d 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 53459b0cc0..4f6cc506f5 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 4d31edae4a..d841352292 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"; };
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> --- 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(-)