From 8d6f128d390753ea8f4deae5cc9a1d75435164b4 Mon Sep 17 00:00:00 2001 From: Mathias Kresin Date: Thu, 6 Dec 2018 11:16:47 +0100 Subject: [PATCH] ath79: add SoC or family compatible Add missing SoC specific compatibles and/or inherit the family compatibles like "ubnt,xm". Signed-off-by: Mathias Kresin --- target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dts | 2 +- target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi | 3 --- target/linux/ath79/dts/ar7240_on_n150r.dts | 2 +- target/linux/ath79/dts/ar7240_tplink_tl-wr740n-v1.dts | 2 +- target/linux/ath79/dts/ar7240_tplink_tl-wr740n-v3.dts | 2 +- target/linux/ath79/dts/ar7240_tplink_tl-wr741-v1.dts | 2 +- target/linux/ath79/dts/ar7240_tplink_tl-wr743nd-v1.dts | 2 +- target/linux/ath79/dts/ar7240_tplink_tl-wr841-v5.dts | 2 +- target/linux/ath79/dts/ar7240_tplink_tl-wr941-v4.dts | 2 +- target/linux/ath79/dts/ar7241_ubnt_airrouter.dts | 2 +- target/linux/ath79/dts/ar7241_ubnt_bullet-m.dts | 2 +- target/linux/ath79/dts/ar7241_ubnt_nano-m.dts | 2 +- target/linux/ath79/dts/ar7241_ubnt_rocket-m.dts | 2 +- target/linux/ath79/dts/ar9331_etactica_eg200.dts | 2 +- target/linux/ath79/dts/ar9331_tplink_tl-wr740nd-v4.dts | 2 +- target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dts | 2 +- target/linux/ath79/dts/ar9341_tplink_tl-wr842n-v2.dts | 2 +- target/linux/ath79/dts/ar9342_ubnt_bullet-m-xw.dts | 2 +- target/linux/ath79/dts/ar9342_ubnt_lap-120.dts | 2 +- target/linux/ath79/dts/ar9342_ubnt_nanostation-ac-loco.dts | 2 +- target/linux/ath79/dts/ar9342_ubnt_nanostation-ac.dts | 2 +- target/linux/ath79/dts/ar9342_ubnt_wa.dtsi | 2 +- target/linux/ath79/dts/ar9344_tplink_tl-wdr3600.dts | 2 +- target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dts | 2 +- target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi | 3 --- target/linux/ath79/dts/qca9563_phicomm_k2t.dts | 2 +- 26 files changed, 24 insertions(+), 30 deletions(-) diff --git a/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dts b/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dts index d80406433f..b3ceecf932 100644 --- a/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dts +++ b/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dts @@ -5,6 +5,6 @@ / { model = "Netgear WNR612 v2"; - compatible = "netgear,wnr612-v2"; + compatible = "netgear,wnr612-v2", "qca,ar7240"; }; diff --git a/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi b/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi index df7bf2ea02..005dcac3dc 100644 --- a/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi +++ b/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi @@ -7,9 +7,6 @@ #include "ar7240.dtsi" / { - compatible = "netgear,wnr612-v2", "qca,ar7240"; - model = "Netgear WNR612 V2"; - aliases { led-boot = &power; led-failsafe = &power; diff --git a/target/linux/ath79/dts/ar7240_on_n150r.dts b/target/linux/ath79/dts/ar7240_on_n150r.dts index cb4cf92865..a318846a83 100644 --- a/target/linux/ath79/dts/ar7240_on_n150r.dts +++ b/target/linux/ath79/dts/ar7240_on_n150r.dts @@ -5,6 +5,6 @@ / { model = "ON Network N150R"; - compatible = "on,n150r"; + compatible = "on,n150r", "qca,ar7240"; }; diff --git a/target/linux/ath79/dts/ar7240_tplink_tl-wr740n-v1.dts b/target/linux/ath79/dts/ar7240_tplink_tl-wr740n-v1.dts index a87e105c83..be18fdd052 100644 --- a/target/linux/ath79/dts/ar7240_tplink_tl-wr740n-v1.dts +++ b/target/linux/ath79/dts/ar7240_tplink_tl-wr740n-v1.dts @@ -5,5 +5,5 @@ / { model = "TP-Link TL-WR740N v1/v2"; - compatible = "tplink,tl-wr740n-v1"; + compatible = "tplink,tl-wr740n-v1", "qca,ar7240"; }; diff --git a/target/linux/ath79/dts/ar7240_tplink_tl-wr740n-v3.dts b/target/linux/ath79/dts/ar7240_tplink_tl-wr740n-v3.dts index 4c1aa57c4c..d0addda44a 100644 --- a/target/linux/ath79/dts/ar7240_tplink_tl-wr740n-v3.dts +++ b/target/linux/ath79/dts/ar7240_tplink_tl-wr740n-v3.dts @@ -5,5 +5,5 @@ / { model = "TP-Link TL-WR740N v3"; - compatible = "tplink,tl-wr740n-v3"; + compatible = "tplink,tl-wr740n-v3", "qca,ar7240"; }; diff --git a/target/linux/ath79/dts/ar7240_tplink_tl-wr741-v1.dts b/target/linux/ath79/dts/ar7240_tplink_tl-wr741-v1.dts index 1d795be23b..af9c907559 100644 --- a/target/linux/ath79/dts/ar7240_tplink_tl-wr741-v1.dts +++ b/target/linux/ath79/dts/ar7240_tplink_tl-wr741-v1.dts @@ -5,5 +5,5 @@ / { model = "TP-Link TL-WR741N/ND v1/v2"; - compatible = "tplink,tl-wr741-v1"; + compatible = "tplink,tl-wr741-v1", "qca,ar7240"; }; diff --git a/target/linux/ath79/dts/ar7240_tplink_tl-wr743nd-v1.dts b/target/linux/ath79/dts/ar7240_tplink_tl-wr743nd-v1.dts index 5fff1a5986..2c55dff97e 100644 --- a/target/linux/ath79/dts/ar7240_tplink_tl-wr743nd-v1.dts +++ b/target/linux/ath79/dts/ar7240_tplink_tl-wr743nd-v1.dts @@ -5,5 +5,5 @@ / { model = "TP-Link TL-WR743ND v1"; - compatible = "tplink,tl-wr743nd-v1"; + compatible = "tplink,tl-wr743nd-v1", "qca,ar7240"; }; diff --git a/target/linux/ath79/dts/ar7240_tplink_tl-wr841-v5.dts b/target/linux/ath79/dts/ar7240_tplink_tl-wr841-v5.dts index bcb82f3c8c..e881821d6c 100644 --- a/target/linux/ath79/dts/ar7240_tplink_tl-wr841-v5.dts +++ b/target/linux/ath79/dts/ar7240_tplink_tl-wr841-v5.dts @@ -5,5 +5,5 @@ / { model = "TP-Link TL-WR841N/ND v5/v6"; - compatible = "tplink,tl-wr841-v5"; + compatible = "tplink,tl-wr841-v5", "qca,ar7240"; }; diff --git a/target/linux/ath79/dts/ar7240_tplink_tl-wr941-v4.dts b/target/linux/ath79/dts/ar7240_tplink_tl-wr941-v4.dts index c67d803651..8d844d54f7 100644 --- a/target/linux/ath79/dts/ar7240_tplink_tl-wr941-v4.dts +++ b/target/linux/ath79/dts/ar7240_tplink_tl-wr941-v4.dts @@ -5,5 +5,5 @@ / { model = "TP-Link TL-WR941N/ND v4"; - compatible = "tplink,tl-wr941-v4"; + compatible = "tplink,tl-wr941-v4", "qca,ar7240"; }; diff --git a/target/linux/ath79/dts/ar7241_ubnt_airrouter.dts b/target/linux/ath79/dts/ar7241_ubnt_airrouter.dts index fbe289f05a..9e38bf8087 100644 --- a/target/linux/ath79/dts/ar7241_ubnt_airrouter.dts +++ b/target/linux/ath79/dts/ar7241_ubnt_airrouter.dts @@ -4,7 +4,7 @@ #include "ar7241_ubnt_xm.dtsi" / { - compatible = "ubnt,airrouter", "qca,ar7241"; + compatible = "ubnt,airrouter", "ubnt,xm", "qca,ar7241"; model = "Ubiquiti AirRouter"; aliases { diff --git a/target/linux/ath79/dts/ar7241_ubnt_bullet-m.dts b/target/linux/ath79/dts/ar7241_ubnt_bullet-m.dts index 9298ef1c7d..e16b5fa0be 100644 --- a/target/linux/ath79/dts/ar7241_ubnt_bullet-m.dts +++ b/target/linux/ath79/dts/ar7241_ubnt_bullet-m.dts @@ -4,7 +4,7 @@ #include "ar7241_ubnt_xm_outdoor.dtsi" / { - compatible = "ubnt,bullet-m", "qca,ar7241"; + compatible = "ubnt,bullet-m", "ubnt,xm", "qca,ar7241"; model = "Ubiquiti Bullet M"; }; diff --git a/target/linux/ath79/dts/ar7241_ubnt_nano-m.dts b/target/linux/ath79/dts/ar7241_ubnt_nano-m.dts index bf6b868ef4..ebdc4306e5 100644 --- a/target/linux/ath79/dts/ar7241_ubnt_nano-m.dts +++ b/target/linux/ath79/dts/ar7241_ubnt_nano-m.dts @@ -4,6 +4,6 @@ #include "ar7241_ubnt_xm_outdoor.dtsi" / { - compatible = "ubnt,nano-m", "qca,ar7241"; + compatible = "ubnt,nano-m", "ubnt,xm", "qca,ar7241"; model = "Ubiquiti Nanostation M"; }; diff --git a/target/linux/ath79/dts/ar7241_ubnt_rocket-m.dts b/target/linux/ath79/dts/ar7241_ubnt_rocket-m.dts index 8931d926cd..35f5205b41 100644 --- a/target/linux/ath79/dts/ar7241_ubnt_rocket-m.dts +++ b/target/linux/ath79/dts/ar7241_ubnt_rocket-m.dts @@ -4,7 +4,7 @@ #include "ar7241_ubnt_xm_outdoor.dtsi" / { - compatible = "ubnt,rocket-m", "qca,ar7241"; + compatible = "ubnt,rocket-m", "ubnt,xm", "qca,ar7241"; model = "Ubiquiti Rocket M"; }; diff --git a/target/linux/ath79/dts/ar9331_etactica_eg200.dts b/target/linux/ath79/dts/ar9331_etactica_eg200.dts index cfd37d6059..2ea900eb8d 100644 --- a/target/linux/ath79/dts/ar9331_etactica_eg200.dts +++ b/target/linux/ath79/dts/ar9331_etactica_eg200.dts @@ -8,7 +8,7 @@ / { model = "eTactica EG200"; - compatible = "etactica,eg200", "rme-eg200"; + compatible = "etactica,eg200", "qca,ar9331"; aliases { serial0 = &uart; diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-wr740nd-v4.dts b/target/linux/ath79/dts/ar9331_tplink_tl-wr740nd-v4.dts index f3683f858b..1b0283ebfb 100644 --- a/target/linux/ath79/dts/ar9331_tplink_tl-wr740nd-v4.dts +++ b/target/linux/ath79/dts/ar9331_tplink_tl-wr740nd-v4.dts @@ -5,5 +5,5 @@ / { model = "TP-Link TL-WR740N/ND v4"; - compatible = "tplink,tl-wr740nd-v4"; + compatible = "tplink,tl-wr740nd-v4", "qca,ar9331"; }; diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dts b/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dts index 46c140763a..31c5a0b1b8 100644 --- a/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dts +++ b/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dts @@ -5,5 +5,5 @@ / { model = "TP-Link TL-WR741N/ND v4"; - compatible = "tplink,tl-wr741nd-v4"; + compatible = "tplink,tl-wr741nd-v4", "qca,ar9331"; }; diff --git a/target/linux/ath79/dts/ar9341_tplink_tl-wr842n-v2.dts b/target/linux/ath79/dts/ar9341_tplink_tl-wr842n-v2.dts index 100e7dbf46..f9105fb0b6 100644 --- a/target/linux/ath79/dts/ar9341_tplink_tl-wr842n-v2.dts +++ b/target/linux/ath79/dts/ar9341_tplink_tl-wr842n-v2.dts @@ -8,7 +8,7 @@ / { model = "TP-Link TL-WR842N/ND v2"; - compatible = "tplink,tl-wr842n-v2"; + compatible = "tplink,tl-wr842n-v2", "qca,ar9341"; aliases { serial0 = &uart; diff --git a/target/linux/ath79/dts/ar9342_ubnt_bullet-m-xw.dts b/target/linux/ath79/dts/ar9342_ubnt_bullet-m-xw.dts index ea19c6bea4..ad98075610 100644 --- a/target/linux/ath79/dts/ar9342_ubnt_bullet-m-xw.dts +++ b/target/linux/ath79/dts/ar9342_ubnt_bullet-m-xw.dts @@ -7,7 +7,7 @@ #include "ar9342_ubnt_xw.dtsi" / { - compatible = "ubnt,bullet-m-xw", "ubnt,xw"; + compatible = "ubnt,bullet-m-xw", "ubnt,xw", "qca,ar9342"; model = "Ubiquiti Bullet M (XW)"; }; diff --git a/target/linux/ath79/dts/ar9342_ubnt_lap-120.dts b/target/linux/ath79/dts/ar9342_ubnt_lap-120.dts index 26b734e626..82f864b8e3 100644 --- a/target/linux/ath79/dts/ar9342_ubnt_lap-120.dts +++ b/target/linux/ath79/dts/ar9342_ubnt_lap-120.dts @@ -6,7 +6,7 @@ #include "ar9342_ubnt_wa.dtsi" / { - compatible = "ubnt,lap-120", "ubnt,wa"; + compatible = "ubnt,lap-120", "ubnt,wa", "qca,ar9342"; model = "Ubiquiti LiteAP ac (LAP-120)"; }; diff --git a/target/linux/ath79/dts/ar9342_ubnt_nanostation-ac-loco.dts b/target/linux/ath79/dts/ar9342_ubnt_nanostation-ac-loco.dts index ea6e1cb6a4..9b26d1a628 100644 --- a/target/linux/ath79/dts/ar9342_ubnt_nanostation-ac-loco.dts +++ b/target/linux/ath79/dts/ar9342_ubnt_nanostation-ac-loco.dts @@ -7,7 +7,7 @@ #include "ar9342_ubnt_wa.dtsi" / { - compatible = "ubnt,nanostation-ac-loco", "ubnt,wa"; + compatible = "ubnt,nanostation-ac-loco", "ubnt,wa", "qca,ar9342"; model = "Ubiquiti Nanostation AC loco (WA)"; }; diff --git a/target/linux/ath79/dts/ar9342_ubnt_nanostation-ac.dts b/target/linux/ath79/dts/ar9342_ubnt_nanostation-ac.dts index 164587dc3f..29b6fdab5e 100644 --- a/target/linux/ath79/dts/ar9342_ubnt_nanostation-ac.dts +++ b/target/linux/ath79/dts/ar9342_ubnt_nanostation-ac.dts @@ -7,7 +7,7 @@ #include "ar9342_ubnt_wa.dtsi" / { - compatible = "ubnt,nanostation-ac", "ubnt,wa"; + compatible = "ubnt,nanostation-ac","ubnt,wa", "qca,ar9342"; model = "Ubiquiti Nanostation AC (WA)"; gpio-leds { diff --git a/target/linux/ath79/dts/ar9342_ubnt_wa.dtsi b/target/linux/ath79/dts/ar9342_ubnt_wa.dtsi index 55fddd3383..df5cb4be69 100644 --- a/target/linux/ath79/dts/ar9342_ubnt_wa.dtsi +++ b/target/linux/ath79/dts/ar9342_ubnt_wa.dtsi @@ -6,7 +6,7 @@ #include "ar9344.dtsi" / { - compatible = "ubnt,wa", "qca,ar9344"; + compatible = "ubnt,wa", "qca,ar9342"; model = "Ubiquiti Networks WA board"; keys { diff --git a/target/linux/ath79/dts/ar9344_tplink_tl-wdr3600.dts b/target/linux/ath79/dts/ar9344_tplink_tl-wdr3600.dts index 95ee3490aa..9f708242f9 100644 --- a/target/linux/ath79/dts/ar9344_tplink_tl-wdr3600.dts +++ b/target/linux/ath79/dts/ar9344_tplink_tl-wdr3600.dts @@ -5,5 +5,5 @@ / { model = "TP-Link WDR3600"; - compatible = "tplink,tl-wdr3600"; + compatible = "tplink,tl-wdr3600", "qca,ar9344"; }; diff --git a/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dts b/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dts index a6359309d2..ba6b4f846a 100644 --- a/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dts +++ b/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dts @@ -5,5 +5,5 @@ / { model = "TP-Link WDR4300"; - compatible = "tplink,tl-wdr4300"; + compatible = "tplink,tl-wdr4300", "qca,ar9344"; }; diff --git a/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi b/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi index 7204dd0f4f..07de5f32c9 100644 --- a/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi +++ b/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi @@ -6,9 +6,6 @@ #include "ar9344.dtsi" / { - model = "TP-Link WDR4300"; - compatible = "tplink,tl-wdr4300"; - aliases { led-boot = &system; led-failsafe = &system; diff --git a/target/linux/ath79/dts/qca9563_phicomm_k2t.dts b/target/linux/ath79/dts/qca9563_phicomm_k2t.dts index e0f019c73c..011bad064e 100644 --- a/target/linux/ath79/dts/qca9563_phicomm_k2t.dts +++ b/target/linux/ath79/dts/qca9563_phicomm_k2t.dts @@ -8,7 +8,7 @@ / { model = "Phicomm K2T"; - compatible = "phicomm,k2t"; + compatible = "phicomm,k2t", "qca,qca9563"; aliases { led-boot = &status_red; -- 2.30.2