From b07b8aade7174f915932dc16120bfe0c02de7133 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 1 Dec 2023 12:42:00 -0800 Subject: [PATCH] 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 --- target/linux/ath79/dts/ar7100.dtsi | 2 +- target/linux/ath79/dts/ar724x.dtsi | 2 +- target/linux/ath79/dts/ar9344.dtsi | 2 +- target/linux/ath79/dts/qca953x.dtsi | 2 +- target/linux/ath79/dts/qca955x.dtsi | 4 ++-- target/linux/ath79/dts/qca956x.dtsi | 2 +- .../310-dt-bindings-PCI-qcom-ar7100-adds-binding-doc.patch | 2 +- .../312-dt-bindings-PCI-qcom-ar7240-adds-binding-doc.patch | 2 +- .../310-dt-bindings-PCI-qcom-ar7100-adds-binding-doc.patch | 2 +- .../312-dt-bindings-PCI-qcom-ar7240-adds-binding-doc.patch | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/target/linux/ath79/dts/ar7100.dtsi b/target/linux/ath79/dts/ar7100.dtsi index a03f282a0f10..66483116199d 100644 --- 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 c090eb5e0fc3..c758fc244e72 100644 --- 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 fb23c53d41eb..dff912f8cabd 100644 --- 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 4300c741adbf..cc26db5ba295 100644 --- 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 e7daa9d827b5..13b051de20d2 100644 --- 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 e46f0676e282..8b261568f0b5 100644 --- 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 bf7eb691a5db..cf0a75c791ee 100644 --- 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 +- 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 a0af79cb4da9..a32c9bdcdef8 100644 --- 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 +- 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 bf7eb691a5db..cf0a75c791ee 100644 --- 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 +- 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 a0af79cb4da9..a32c9bdcdef8 100644 --- 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 +- 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>; -- 2.30.2