ath79: rename pcie-controller to pcie

pcie-controller was renamed to pcie since at least kernel 4.14. Match it
here to get rid of dtc warnings.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

diff --git a/target/linux/ath79/dts/ar7100.dtsi b/target/linux/ath79/dts/ar7100.dtsi
index a03f282a0f10bd9b6c24739d6c83cb64ba00a518..66483116199d94135a4c94e8824c100af99a5fab 100644 (file)
--- a/target/linux/ath79/dts/ar7100.dtsi
+++ b/target/linux/ath79/dts/ar7100.dtsi
@@ -113,7 +113,7 @@
                                #reset-cells = <1>;
                        };
 
-                       pcie0: pcie-controller@17010000 {
+                       pcie0: pcie@17010000 {
                                compatible = "qca,ar7100-pci";
                                #address-cells = <3>;
                                #size-cells = <2>;

diff --git a/target/linux/ath79/dts/ar724x.dtsi b/target/linux/ath79/dts/ar724x.dtsi
index c090eb5e0fc31b079492d66f9d75556a16598100..c758fc244e72b9af0919c195093c7fd89fcad670 100644 (file)
--- a/target/linux/ath79/dts/ar724x.dtsi
+++ b/target/linux/ath79/dts/ar724x.dtsi
@@ -121,7 +121,7 @@
                                #reset-cells = <1>;
                        };
 
-                       pcie: pcie-controller@180c0000 {
+                       pcie: pcie@180c0000 {
                                compatible = "qcom,ar7240-pci";
                                #address-cells = <3>;
                                #size-cells = <2>;

diff --git a/target/linux/ath79/dts/ar9344.dtsi b/target/linux/ath79/dts/ar9344.dtsi
index fb23c53d41eb7a3c7438fb5dbfc5b248bb660702..dff912f8cabd82c672428721c8badde62bed18f5 100644 (file)
--- a/target/linux/ath79/dts/ar9344.dtsi
+++ b/target/linux/ath79/dts/ar9344.dtsi
@@ -32,7 +32,7 @@
 };
 
 &ahb {
-       pcie: pcie-controller@180c0000 {
+       pcie: pcie@180c0000 {
                compatible = "qcom,ar9340-pci", "qcom,ar7240-pci";
                #address-cells = <3>;
                #size-cells = <2>;

diff --git a/target/linux/ath79/dts/qca953x.dtsi b/target/linux/ath79/dts/qca953x.dtsi
index 4300c741adbf41cff1e1c137f53d20797d16fc0c..cc26db5ba2955a59068163f19a4d1b2ba1c3227c 100644 (file)
--- a/target/linux/ath79/dts/qca953x.dtsi
+++ b/target/linux/ath79/dts/qca953x.dtsi
@@ -150,7 +150,7 @@
                        reg = <0x18070000 0x4>;
                };
 
-               pcie0: pcie-controller@180c0000 {
+               pcie0: pcie@180c0000 {
                        compatible = "qcom,ar7240-pci";
                        #address-cells = <3>;
                        #size-cells = <2>;

diff --git a/target/linux/ath79/dts/qca955x.dtsi b/target/linux/ath79/dts/qca955x.dtsi
index e7daa9d827b5d2da0339b14a173d6ba9fbb2572c..13b051de20d2d57a1af09d39435dbe12f189ece7 100644 (file)
--- a/target/linux/ath79/dts/qca955x.dtsi
+++ b/target/linux/ath79/dts/qca955x.dtsi
@@ -185,7 +185,7 @@
                        reg = <0x18070000 0x58>;
                };
 
-               pcie0: pcie-controller@180c0000 {
+               pcie0: pcie@180c0000 {
                        compatible = "qcom,qca9550-pci", "qcom,ar7240-pci";
                        #address-cells = <3>;
                        #size-cells = <2>;
@@ -222,7 +222,7 @@
                        status = "disabled";
                };
 
-               pcie1: pcie-controller@18250000 {
+               pcie1: pcie@18250000 {
                        compatible = "qcom,qca9550-pci", "qcom,ar7240-pci";
                        #address-cells = <3>;
                        #size-cells = <2>;

diff --git a/target/linux/ath79/dts/qca956x.dtsi b/target/linux/ath79/dts/qca956x.dtsi
index e46f0676e282fbf365555636e0e9d830e87cffcd..8b261568f0b5c2d0435db923f598470d868fe911 100644 (file)
--- a/target/linux/ath79/dts/qca956x.dtsi
+++ b/target/linux/ath79/dts/qca956x.dtsi
@@ -157,7 +157,7 @@
                        status = "disabled";
                };
 
-               pcie: pcie-controller@18250000 {
+               pcie: pcie@18250000 {
                        compatible = "qcom,ar7240-pci";
                        #address-cells = <3>;
                        #size-cells = <2>;

diff --git a/target/linux/ath79/patches-5.15/310-dt-bindings-PCI-qcom-ar7100-adds-binding-doc.patch b/target/linux/ath79/patches-5.15/310-dt-bindings-PCI-qcom-ar7100-adds-binding-doc.patch
index bf7eb691a5dba2fd57ad1687639a166d0e3a4801..cf0a75c791eecf17253d9b4fca59630d5f6e315f 100644 (file)
--- a/target/linux/ath79/patches-5.15/310-dt-bindings-PCI-qcom-ar7100-adds-binding-doc.patch
+++ b/target/linux/ath79/patches-5.15/310-dt-bindings-PCI-qcom-ar7100-adds-binding-doc.patch
@@ -37,7 +37,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
 +- interrupt-parent: phandle to the MIPS IRQ controller
 +
 +* Example for ar7100
-+      pcie-controller@180c0000 {
++      pcie@180c0000 {
 +              compatible = "qca,ar7100-pci";
 +              #address-cells = <3>;
 +              #size-cells = <2>;

diff --git a/target/linux/ath79/patches-5.15/312-dt-bindings-PCI-qcom-ar7240-adds-binding-doc.patch b/target/linux/ath79/patches-5.15/312-dt-bindings-PCI-qcom-ar7240-adds-binding-doc.patch
index a0af79cb4da92b035d93bfef19681290089468f8..a32c9bdcdef8703851c6142a4b5571d255854717 100644 (file)
--- a/target/linux/ath79/patches-5.15/312-dt-bindings-PCI-qcom-ar7240-adds-binding-doc.patch
+++ b/target/linux/ath79/patches-5.15/312-dt-bindings-PCI-qcom-ar7240-adds-binding-doc.patch
@@ -39,7 +39,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
 +- interrupt-controller: define to enable the builtin IRQ cascade.
 +
 +* Example for qca9557
-+      pcie-controller@180c0000 {
++      pcie@180c0000 {
 +              compatible = "qcom,ar7240-pci";
 +              #address-cells = <3>;
 +              #size-cells = <2>;

diff --git a/target/linux/ath79/patches-6.1/310-dt-bindings-PCI-qcom-ar7100-adds-binding-doc.patch b/target/linux/ath79/patches-6.1/310-dt-bindings-PCI-qcom-ar7100-adds-binding-doc.patch
index bf7eb691a5dba2fd57ad1687639a166d0e3a4801..cf0a75c791eecf17253d9b4fca59630d5f6e315f 100644 (file)
--- a/target/linux/ath79/patches-6.1/310-dt-bindings-PCI-qcom-ar7100-adds-binding-doc.patch
+++ b/target/linux/ath79/patches-6.1/310-dt-bindings-PCI-qcom-ar7100-adds-binding-doc.patch
@@ -37,7 +37,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
 +- interrupt-parent: phandle to the MIPS IRQ controller
 +
 +* Example for ar7100
-+      pcie-controller@180c0000 {
++      pcie@180c0000 {
 +              compatible = "qca,ar7100-pci";
 +              #address-cells = <3>;
 +              #size-cells = <2>;

diff --git a/target/linux/ath79/patches-6.1/312-dt-bindings-PCI-qcom-ar7240-adds-binding-doc.patch b/target/linux/ath79/patches-6.1/312-dt-bindings-PCI-qcom-ar7240-adds-binding-doc.patch
index a0af79cb4da92b035d93bfef19681290089468f8..a32c9bdcdef8703851c6142a4b5571d255854717 100644 (file)
--- a/target/linux/ath79/patches-6.1/312-dt-bindings-PCI-qcom-ar7240-adds-binding-doc.patch
+++ b/target/linux/ath79/patches-6.1/312-dt-bindings-PCI-qcom-ar7240-adds-binding-doc.patch
@@ -39,7 +39,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
 +- interrupt-controller: define to enable the builtin IRQ cascade.
 +
 +* Example for qca9557
-+      pcie-controller@180c0000 {
++      pcie@180c0000 {
 +              compatible = "qcom,ar7240-pci";
 +              #address-cells = <3>;
 +              #size-cells = <2>;