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 <mail@david-bauer.net>

diff --git a/target/linux/ath79/dts/qca9556_avm_fritz-repeater.dtsi b/target/linux/ath79/dts/qca9556_avm_fritz-repeater.dtsi
index b1f5f1bdb3418b8066a22a1f8e4381963145c1ad..34b47b15f7d1a0afb17f5ab019293ca281f4a4d0 100644 (file)
--- 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 <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
-#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 529ac1cf3b8be90ea24ff01053ea20383882f057..74cf1315b659b6bcde9389fe139b962cb646f25a 100644 (file)
--- 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 <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
-#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 be1ebac41d4df52b3290827639afa260b44f86c5..7f6c6b5889b2ba2fc8a5746e3a8079296eed7a57 100644 (file)
--- 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 <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
-#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 b43ab2c6b66bdca47192024cef1059dab628a13a..2b199bfa4893b12fa3fbe031528c6d82cf4e635d 100644 (file)
--- 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 <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
-#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 8ee967ab9f173cea6bba7ca73753f3067f121936..e2a71c0ce6508309fa90c09fa3386e2e45926cb1 100644 (file)
--- 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 <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
-#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 42b45c590098e09297f89de5c466899118a1a12f..25e0fee3bdfe1c17218dddb033cd6159a5be2813 100644 (file)
--- a/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi
+++ b/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi
@@ -13,7 +13,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
-#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 b71bec4e04d4126c59fb2a43859a59acee94fc8f..5e6e44be749ad8f3c1482ce37416632f641d6999 100644 (file)
--- a/target/linux/ath79/dts/qca9558_domywifi_dw33d.dts
+++ b/target/linux/ath79/dts/qca9558_domywifi_dw33d.dts
@@ -4,7 +4,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
-#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 3ccf92a9f7799a63a615d9ade77af5c39d705eea..4bd028a1c60e5188f350b05449c97fef37f278c0 100644 (file)
--- a/target/linux/ath79/dts/qca9558_engenius_ecb1750.dts
+++ b/target/linux/ath79/dts/qca9558_engenius_ecb1750.dts
@@ -4,7 +4,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
-#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 72179f1da0cc4d70e3e68f841e0251663e812f71..850a31790f4b207af12016f5b0f8f2268693dce7 100644 (file)
--- a/target/linux/ath79/dts/qca9558_engenius_epg5000.dts
+++ b/target/linux/ath79/dts/qca9558_engenius_epg5000.dts
@@ -4,7 +4,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
-#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 5c01126bc447663afb4138788327e9077b0d3a7d..ef00d1807beb179df89e8695689bdbbc5d709123 100644 (file)
--- 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 <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
-#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 3f2a1a51a6043f84f4dde4b342f8215cb6ba33d3..dd4d523368ac56043950ece72edf387028cd4312 100644 (file)
--- 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 <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
-#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 bbb43354c45055911c9ee486f1f724ad86dd3e28..19b6d5c8cbcc993e9d44e9f5c5b29dfa54cf11a7 100644 (file)
--- a/target/linux/ath79/dts/qca9558_netgear_ex7300.dtsi
+++ b/target/linux/ath79/dts/qca9558_netgear_ex7300.dtsi
@@ -3,7 +3,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
-#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 77c332cc4e988b542668545a9f137d6bb0db2a3d..de24a2c5699fe28e61578711f8add2cb3aef9bb5 100644 (file)
--- a/target/linux/ath79/dts/qca9558_ocedo_koala.dts
+++ b/target/linux/ath79/dts/qca9558_ocedo_koala.dts
@@ -4,7 +4,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
-#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 5ae2e2bbb90234a9760db7d439647dd19f1cedf3..b790ed11a28a93657d8816d3139c5d329e200062 100644 (file)
--- a/target/linux/ath79/dts/qca9558_ocedo_ursus.dts
+++ b/target/linux/ath79/dts/qca9558_ocedo_ursus.dts
@@ -4,7 +4,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
-#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 83e76e463eb813c025d2f69b6ed051d5c9c29292..e068fd75202dd291f64f8e84cd0637e2a874e6d7 100644 (file)
--- 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 <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
-#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 d3d96356930983d515f171e3918e2de4a5c6a69d..98f2789564acbd2295f6f3e860bcd5ded9b8a891 100644 (file)
--- 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 <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
-#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 9f5d7a6fcf5524735bb7ead97af7dc180cce3638..1a550137dd730f9b4e39246a2bba9ae2ede940dc 100644 (file)
--- 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 <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
-#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 a65d4e2b535eabf43d3ec5643f47878858619689..aab8eac7ce80c678fd6a5f22539eeacabc7bf7e1 100644 (file)
--- 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 <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
-#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 f802de271eaf11de1dfde9c07dc582b5596f40f3..8e79e126171640dbaf0f8c491a1806a5a152b431 100644 (file)
--- 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 <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
-#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 8827990eb57b191ab410a1864458803c18ed32db..2dde5585cd3ceb2cce031d28069960b9b3c6f0c2 100644 (file)
--- a/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi
+++ b/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi
@@ -3,7 +3,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
-#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 4f6d39e92e377e49807b1dd26d05788e21585e4b..0003bd1924764dcddf2256db1416d5093007c85d 100644 (file)
--- 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 <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
-#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 a3f2b11212ef9e0155be24a459dd276ff523ef90..72062e5d1ed845ce3a415ef93342a81e2dbb2707 100644 (file)
--- 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 <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
-#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 13dacc2ff8d6d723a4b89ae24bdc2ac57c1a8d63..fb60631a3cc1d4c48d7c35bec7f9fd852b27bdba 100644 (file)
--- 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 <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
-#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 4bacf4723fdd0afe3803d689df5dd55f58c3f23b..fb7d5fe40c83b17919d68c11478b1181d9e4071e 100644 (file)
--- 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 <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
-#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 2f00d0ba4df1217cfa9205ce52b851155c31445e..ac4a70fbde30cd3a80f68a93068154250cd5912a 100644 (file)
--- a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts
+++ b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts
@@ -4,7 +4,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
-#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 ede658af6df109bbf33f569e7ec05d5400db708b..5bcaccaa14b800934ba52b1ffd807fccc8b29a18 100644 (file)
--- 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>;