From c0a80b71254fb8710dbd1942a3916fbcdc02835e Mon Sep 17 00:00:00 2001 From: David Bauer Date: Fri, 17 Apr 2020 02:05:23 +0200 Subject: [PATCH] ath79: rename qca9557.dtsi to qca955x.dtsi There are at least 3 different chips in the Scorpion series of SoCs. Rename the common DTSI to better reflect it's purpose for the whole series. Also rename the compatible bindings from qca,ar9557 and qca,qca9557 to qca,qca9550. Signed-off-by: David Bauer --- target/linux/ath79/dts/qca9556_avm_fritz-repeater.dtsi | 2 +- .../dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts | 2 +- target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts | 2 +- target/linux/ath79/dts/qca9557_iodata_wn-ac-dgr.dtsi | 2 +- target/linux/ath79/dts/qca9558_comfast_cf-wr650ac.dtsi | 2 +- target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi | 2 +- target/linux/ath79/dts/qca9558_domywifi_dw33d.dts | 2 +- target/linux/ath79/dts/qca9558_engenius_ecb1750.dts | 2 +- target/linux/ath79/dts/qca9558_engenius_epg5000.dts | 2 +- .../ath79/dts/qca9558_librerouter_librerouter-v1.dts | 2 +- .../dts/qca9558_mikrotik_routerboard-922uags-5hpacd.dts | 2 +- target/linux/ath79/dts/qca9558_netgear_ex7300.dtsi | 2 +- target/linux/ath79/dts/qca9558_ocedo_koala.dts | 2 +- target/linux/ath79/dts/qca9558_ocedo_ursus.dts | 2 +- target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts | 2 +- target/linux/ath79/dts/qca9558_sitecom_wlr-8100.dts | 2 +- target/linux/ath79/dts/qca9558_tplink_archer-c.dtsi | 2 +- target/linux/ath79/dts/qca9558_tplink_archer-d7.dtsi | 2 +- target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts | 2 +- target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi | 2 +- target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts | 2 +- target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi | 2 +- target/linux/ath79/dts/qca9558_tplink_tl-wr941n-v7-cn.dts | 2 +- target/linux/ath79/dts/qca9558_trendnet_tew-823dru.dts | 2 +- target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts | 2 +- target/linux/ath79/dts/{qca9557.dtsi => qca955x.dtsi} | 8 ++++---- 26 files changed, 29 insertions(+), 29 deletions(-) rename target/linux/ath79/dts/{qca9557.dtsi => qca955x.dtsi} (97%) diff --git a/target/linux/ath79/dts/qca9556_avm_fritz-repeater.dtsi b/target/linux/ath79/dts/qca9556_avm_fritz-repeater.dtsi index b1f5f1bdb3..34b47b15f7 100644 --- a/target/linux/ath79/dts/qca9556_avm_fritz-repeater.dtsi +++ b/target/linux/ath79/dts/qca9556_avm_fritz-repeater.dtsi @@ -4,7 +4,7 @@ #include #include -#include "qca9557.dtsi" +#include "qca955x.dtsi" / { chosen { diff --git a/target/linux/ath79/dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts b/target/linux/ath79/dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts index 529ac1cf3b..74cf1315b6 100644 --- a/target/linux/ath79/dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts +++ b/target/linux/ath79/dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts @@ -4,7 +4,7 @@ #include #include -#include "qca9557.dtsi" +#include "qca955x.dtsi" / { compatible = "mikrotik,routerboard-wap-g-5hact2hnd", "qca,qca9556"; diff --git a/target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts b/target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts index be1ebac41d..7f6c6b5889 100644 --- a/target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts +++ b/target/linux/ath79/dts/qca9557_buffalo_bhr-4grv2.dts @@ -4,7 +4,7 @@ #include #include -#include "qca9557.dtsi" +#include "qca955x.dtsi" / { compatible = "buffalo,bhr-4grv2", "qca,qca9557"; diff --git a/target/linux/ath79/dts/qca9557_iodata_wn-ac-dgr.dtsi b/target/linux/ath79/dts/qca9557_iodata_wn-ac-dgr.dtsi index b43ab2c6b6..2b199bfa48 100644 --- a/target/linux/ath79/dts/qca9557_iodata_wn-ac-dgr.dtsi +++ b/target/linux/ath79/dts/qca9557_iodata_wn-ac-dgr.dtsi @@ -3,7 +3,7 @@ #include #include -#include "qca9557.dtsi" +#include "qca955x.dtsi" / { aliases { diff --git a/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac.dtsi b/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac.dtsi index 8ee967ab9f..e2a71c0ce6 100644 --- a/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac.dtsi +++ b/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac.dtsi @@ -3,7 +3,7 @@ #include #include -#include "qca9557.dtsi" +#include "qca955x.dtsi" / { chosen { diff --git a/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi b/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi index 42b45c5900..25e0fee3bd 100644 --- a/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi +++ b/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi @@ -13,7 +13,7 @@ #include #include -#include "qca9557.dtsi" +#include "qca955x.dtsi" / { chosen { diff --git a/target/linux/ath79/dts/qca9558_domywifi_dw33d.dts b/target/linux/ath79/dts/qca9558_domywifi_dw33d.dts index b71bec4e04..5e6e44be74 100644 --- a/target/linux/ath79/dts/qca9558_domywifi_dw33d.dts +++ b/target/linux/ath79/dts/qca9558_domywifi_dw33d.dts @@ -4,7 +4,7 @@ #include #include -#include "qca9557.dtsi" +#include "qca955x.dtsi" / { compatible = "domywifi,dw33d", "qca,qca9558"; diff --git a/target/linux/ath79/dts/qca9558_engenius_ecb1750.dts b/target/linux/ath79/dts/qca9558_engenius_ecb1750.dts index 3ccf92a9f7..4bd028a1c6 100644 --- a/target/linux/ath79/dts/qca9558_engenius_ecb1750.dts +++ b/target/linux/ath79/dts/qca9558_engenius_ecb1750.dts @@ -4,7 +4,7 @@ #include #include -#include "qca9557.dtsi" +#include "qca955x.dtsi" / { compatible = "engenius,ecb1750", "qca,qca9557"; diff --git a/target/linux/ath79/dts/qca9558_engenius_epg5000.dts b/target/linux/ath79/dts/qca9558_engenius_epg5000.dts index 72179f1da0..850a31790f 100644 --- a/target/linux/ath79/dts/qca9558_engenius_epg5000.dts +++ b/target/linux/ath79/dts/qca9558_engenius_epg5000.dts @@ -4,7 +4,7 @@ #include #include -#include "qca9557.dtsi" +#include "qca955x.dtsi" / { model = "EnGenius EPG5000"; diff --git a/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts b/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts index 5c01126bc4..ef00d1807b 100644 --- a/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts +++ b/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts @@ -4,7 +4,7 @@ #include #include -#include "qca9557.dtsi" +#include "qca955x.dtsi" / { compatible = "librerouter,librerouter-v1", "qca,qca9558"; diff --git a/target/linux/ath79/dts/qca9558_mikrotik_routerboard-922uags-5hpacd.dts b/target/linux/ath79/dts/qca9558_mikrotik_routerboard-922uags-5hpacd.dts index 3f2a1a51a6..dd4d523368 100644 --- a/target/linux/ath79/dts/qca9558_mikrotik_routerboard-922uags-5hpacd.dts +++ b/target/linux/ath79/dts/qca9558_mikrotik_routerboard-922uags-5hpacd.dts @@ -4,7 +4,7 @@ #include #include -#include "qca9557.dtsi" +#include "qca955x.dtsi" / { compatible = "mikrotik,routerboard-922uags-5hpacd", "qca,qca9558"; diff --git a/target/linux/ath79/dts/qca9558_netgear_ex7300.dtsi b/target/linux/ath79/dts/qca9558_netgear_ex7300.dtsi index bbb43354c4..19b6d5c8cb 100644 --- a/target/linux/ath79/dts/qca9558_netgear_ex7300.dtsi +++ b/target/linux/ath79/dts/qca9558_netgear_ex7300.dtsi @@ -3,7 +3,7 @@ #include #include -#include "qca9557.dtsi" +#include "qca955x.dtsi" / { chosen { diff --git a/target/linux/ath79/dts/qca9558_ocedo_koala.dts b/target/linux/ath79/dts/qca9558_ocedo_koala.dts index 77c332cc4e..de24a2c569 100644 --- a/target/linux/ath79/dts/qca9558_ocedo_koala.dts +++ b/target/linux/ath79/dts/qca9558_ocedo_koala.dts @@ -4,7 +4,7 @@ #include #include -#include "qca9557.dtsi" +#include "qca955x.dtsi" / { compatible = "ocedo,koala", "qca,qca9557"; diff --git a/target/linux/ath79/dts/qca9558_ocedo_ursus.dts b/target/linux/ath79/dts/qca9558_ocedo_ursus.dts index 5ae2e2bbb9..b790ed11a2 100644 --- a/target/linux/ath79/dts/qca9558_ocedo_ursus.dts +++ b/target/linux/ath79/dts/qca9558_ocedo_ursus.dts @@ -4,7 +4,7 @@ #include #include -#include "qca9557.dtsi" +#include "qca955x.dtsi" / { compatible = "ocedo,ursus", "qca,qca9558"; diff --git a/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts b/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts index 83e76e463e..e068fd7520 100644 --- a/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts +++ b/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts @@ -4,7 +4,7 @@ #include #include -#include "qca9557.dtsi" +#include "qca955x.dtsi" / { compatible = "openmesh,om5p-ac-v2", "qca,qca9557"; diff --git a/target/linux/ath79/dts/qca9558_sitecom_wlr-8100.dts b/target/linux/ath79/dts/qca9558_sitecom_wlr-8100.dts index d3d9635693..98f2789564 100644 --- a/target/linux/ath79/dts/qca9558_sitecom_wlr-8100.dts +++ b/target/linux/ath79/dts/qca9558_sitecom_wlr-8100.dts @@ -4,7 +4,7 @@ #include #include -#include "qca9557.dtsi" +#include "qca955x.dtsi" / { model = "Sitecom WLR-8100 (X8 AC1750)"; diff --git a/target/linux/ath79/dts/qca9558_tplink_archer-c.dtsi b/target/linux/ath79/dts/qca9558_tplink_archer-c.dtsi index 9f5d7a6fcf..1a550137dd 100644 --- a/target/linux/ath79/dts/qca9558_tplink_archer-c.dtsi +++ b/target/linux/ath79/dts/qca9558_tplink_archer-c.dtsi @@ -3,7 +3,7 @@ #include #include -#include "qca9557.dtsi" +#include "qca955x.dtsi" / { chosen { diff --git a/target/linux/ath79/dts/qca9558_tplink_archer-d7.dtsi b/target/linux/ath79/dts/qca9558_tplink_archer-d7.dtsi index a65d4e2b53..aab8eac7ce 100644 --- a/target/linux/ath79/dts/qca9558_tplink_archer-d7.dtsi +++ b/target/linux/ath79/dts/qca9558_tplink_archer-d7.dtsi @@ -3,7 +3,7 @@ #include #include -#include "qca9557.dtsi" +#include "qca955x.dtsi" / { chosen { diff --git a/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts b/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts index f802de271e..8e79e12617 100644 --- a/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts +++ b/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts @@ -4,7 +4,7 @@ #include #include -#include "qca9557.dtsi" +#include "qca955x.dtsi" / { model = "TP-Link RE350K v1"; diff --git a/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi b/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi index 8827990eb5..2dde5585cd 100644 --- a/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi +++ b/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi @@ -3,7 +3,7 @@ #include #include -#include "qca9557.dtsi" +#include "qca955x.dtsi" / { chosen { diff --git a/target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts b/target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts index 4f6d39e92e..0003bd1924 100644 --- a/target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts +++ b/target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts @@ -4,7 +4,7 @@ #include #include -#include "qca9557.dtsi" +#include "qca955x.dtsi" / { compatible = "tplink,tl-wdr4900-v2", "qca,qca9558"; diff --git a/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi b/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi index a3f2b11212..72062e5d1e 100644 --- a/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi +++ b/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi @@ -3,7 +3,7 @@ #include #include -#include "qca9557.dtsi" +#include "qca955x.dtsi" / { chosen { diff --git a/target/linux/ath79/dts/qca9558_tplink_tl-wr941n-v7-cn.dts b/target/linux/ath79/dts/qca9558_tplink_tl-wr941n-v7-cn.dts index 13dacc2ff8..fb60631a3c 100644 --- a/target/linux/ath79/dts/qca9558_tplink_tl-wr941n-v7-cn.dts +++ b/target/linux/ath79/dts/qca9558_tplink_tl-wr941n-v7-cn.dts @@ -4,7 +4,7 @@ #include #include -#include "qca9557.dtsi" +#include "qca955x.dtsi" / { compatible = "tplink,tl-wr941n-v7-cn", "qca,qca9558"; diff --git a/target/linux/ath79/dts/qca9558_trendnet_tew-823dru.dts b/target/linux/ath79/dts/qca9558_trendnet_tew-823dru.dts index 4bacf4723f..fb7d5fe40c 100644 --- a/target/linux/ath79/dts/qca9558_trendnet_tew-823dru.dts +++ b/target/linux/ath79/dts/qca9558_trendnet_tew-823dru.dts @@ -4,7 +4,7 @@ #include #include -#include "qca9557.dtsi" +#include "qca955x.dtsi" / { compatible = "trendnet,tew-823dru", "qca,qca9558"; diff --git a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts index 2f00d0ba4d..ac4a70fbde 100644 --- a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts +++ b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts @@ -4,7 +4,7 @@ #include #include -#include "qca9557.dtsi" +#include "qca955x.dtsi" / { compatible = "zyxel,nbg6716", "qca,qca9558"; diff --git a/target/linux/ath79/dts/qca9557.dtsi b/target/linux/ath79/dts/qca955x.dtsi similarity index 97% rename from target/linux/ath79/dts/qca9557.dtsi rename to target/linux/ath79/dts/qca955x.dtsi index ede658af6d..5bcaccaa14 100644 --- a/target/linux/ath79/dts/qca9557.dtsi +++ b/target/linux/ath79/dts/qca955x.dtsi @@ -3,7 +3,7 @@ #include "ath79.dtsi" / { - compatible = "qca,qca9557"; + compatible = "qca,qca9550"; #address-cells = <1>; #size-cells = <1>; @@ -30,7 +30,7 @@ ahb { apb { ddr_ctrl: memory-controller@18000000 { - compatible = "qca,ar9557-ddr-controller", + compatible = "qca,qca9550-ddr-controller", "qca,ar7240-ddr-controller"; reg = <0x18000000 0x100>; @@ -78,7 +78,7 @@ }; gpio: gpio@18040000 { - compatible = "qca,ar9557-gpio", + compatible = "qca,qca9550-gpio", "qca,ar9340-gpio"; reg = <0x18040000 0x28>; @@ -110,7 +110,7 @@ }; pll: pll-controller@18050000 { - compatible = "qca,ar9557-pll", + compatible = "qca,qca9550-pll", "qca,qca9550-pll", "syscon"; reg = <0x18050000 0x50>; -- 2.30.2