ipq40xx: dts: correct PCIe device node name

According to the dtc source code, the PCIe device node unitname
needs to follow the following naming rules:

```
reg = fdt32_to_cpu(cells[0]);
dev = (reg & 0xf800) >> 11;
func = (reg & 0x700) >> 8;
snprintf(unitname, sizeof(unitname), "%x,%x", dev, func);
```

These devices' reg cell[0] is equal to 0x10000, hence the correct
node unitname should be "0,0". This patch fixes the following dtc
warnings for 6.12 kernel:

qcom-ipq4019-map-ac2200.dts:211.11-216.4: Warning (pci_device_reg): /soc/pcie@40000000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq4019-rt-ac42u.dts:315.11-319.4: Warning (pci_device_reg): /soc/pcie@40000000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq4019-fritzbox-7530.dts:318.10-321.4: Warning (pci_device_reg): /soc/pcie@40000000/pcie@0/dsl@1,0: PCI unit address format error, expected "0,0"
qcom-ipq4019-fritzrepeater-3000.dts:239.11-245.4: Warning (pci_device_reg): /soc/pcie@40000000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq4019-gl-b2200.dts:340.11-348.4: Warning (pci_device_reg): /soc/pcie@40000000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq4019-ea8300.dts:97.11-102.4: Warning (pci_device_reg): /soc/pcie@40000000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq4019-mr8300.dts:83.11-88.4: Warning (pci_device_reg): /soc/pcie@40000000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq4019-whw03v2.dts:234.11-241.4: Warning (pci_device_reg): /soc/pcie@40000000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq4029-insect-common.dtsi:282.11-287.4: Warning (pci_device_reg): /soc/pcie@40000000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq4029-insect-common.dtsi:282.11-287.4: Warning (pci_device_reg): /soc/pcie@40000000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq4019-lbr20.dts:488.11-495.4: Warning (pci_device_reg): /soc/pcie@40000000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq4019-orbi.dtsi:317.11-322.4: Warning (pci_device_reg): /soc/pcie@40000000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq4019-orbi.dtsi:317.11-322.4: Warning (pci_device_reg): /soc/pcie@40000000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq4019-orbi.dtsi:317.11-322.4: Warning (pci_device_reg): /soc/pcie@40000000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq4019-orbi.dtsi:317.11-322.4: Warning (pci_device_reg): /soc/pcie@40000000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq4019-orbi.dtsi:317.11-322.4: Warning (pci_device_reg): /soc/pcie@40000000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq4019-orbi.dtsi:317.11-322.4: Warning (pci_device_reg): /soc/pcie@40000000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq4019-a62.dts:218.11-225.4: Warning (pci_device_reg): /soc/pcie@40000000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq4019-pa2200.dts:198.11-205.4: Warning (pci_device_reg): /soc/pcie@40000000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq4019-mf18a.dts:478.11-484.4: Warning (pci_device_reg): /soc/pcie@40000000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq4019-mf289f.dts:429.11-435.4: Warning (pci_device_reg): /soc/pcie@40000000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"

Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
Link: https://github.com/openwrt/openwrt/pull/18725
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-a62.dts b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-a62.dts
index 2a49dd40b508164aeef293c8a04a23a18ebea394..6a25476bfefa837f2730a94aa0449f62ea1fa4f1 100644 (file)
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-a62.dts
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-a62.dts
@@ -215,7 +215,7 @@
 };
 
 &pcie_bridge0 {
-       wifi@1,0 {
+       wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                ieee80211-freq-limit = <5170000 5350000>;

diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-ea8300.dts b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-ea8300.dts
index c5accbdc2d7e0efa41b13b623d9d37cd2b2677fb..e08dc49d6ae968828e0ea19cdd5f367ac6115e63 100644 (file)
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-ea8300.dts
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-ea8300.dts
@@ -94,7 +94,7 @@
 };
 
 &pcie_bridge0 {
-       wifi@1,0 {
+       wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                ieee80211-freq-limit = <5490000 5835000>;

diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-eap2200.dts b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-eap2200.dts
index a237915695063e50b4473aa3441e3e61f3ae3df2..6f17919038ff156dd0edb7321f0b4bc2348cbc96 100644 (file)
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-eap2200.dts
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-eap2200.dts
@@ -206,7 +206,7 @@
 };
 
 &pcie_bridge0 {
-       wifi@1,0 {
+       wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                nvmem-cell-names = "pre-calibration";

diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-fritzbox-7530.dts b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-fritzbox-7530.dts
index a7d89bd81f3545a334dca5432ffe631210caa3c8..f2dccab8b9ecaa7c0c36699d7ad2077e30f5fa2e 100644 (file)
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-fritzbox-7530.dts
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-fritzbox-7530.dts
@@ -315,7 +315,7 @@
 };
 
 &pcie_bridge0 {
-       dsl@1,0 {
+       dsl@0,0 {
                compatible = "intel,vrx518";
                reg = <0x00010000 0 0 0 0>;
        };

diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-fritzrepeater-3000.dts b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-fritzrepeater-3000.dts
index c0dbb8b41e835c3861ffa9b46d9c709f29b1ed08..457b17032d8575fbb1dbcb1205b02a1e308a934d 100644 (file)
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-fritzrepeater-3000.dts
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-fritzrepeater-3000.dts
@@ -236,7 +236,7 @@
 };
 
 &pcie_bridge0 {
-       wifi@1,0 {
+       wifi@0,0 {
                /* QCA9984 */
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;

diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-gl-b2200.dts b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-gl-b2200.dts
index d1fe0e0012447975cf718aa2a0a1ff7a6aec58a4..7c2a7b6aa24bd73523ee15dc9ba9465a55fe336b 100644 (file)
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-gl-b2200.dts
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-gl-b2200.dts
@@ -337,7 +337,7 @@
 };
 
 &pcie_bridge0 {
-       wifi@1,0 {
+       wifi@0,0 {
                /* Bootlog shows this is a 168c:0056 - QCA 9888v2 */
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;

diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-lbr20.dts b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-lbr20.dts
index c36fd81cdeb4328f341f533eac01b82d392cdfe7..2d63ff48db82dc4e0ff96f877fba6b210bba393e 100644 (file)
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-lbr20.dts
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-lbr20.dts
@@ -485,7 +485,7 @@
 };
 
 &pcie_bridge0 {
-       wifi@1,0 {
+       wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                ieee80211-freq-limit = <5170000 5350000>;

diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-lhgg-60ad.dts b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-lhgg-60ad.dts
index 1f777b4092b9b1e3d52787a87f33967b7f64706f..045a3a33ca2fec1016580fa40a62ae2c257967b1 100644 (file)
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-lhgg-60ad.dts
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-lhgg-60ad.dts
@@ -231,7 +231,7 @@
 
 &pcie_bridge0 {
        /* wil6210 802.11ad card */
-       wifi@1,0 {
+       wifi@0,0 {
                /* wil6210 driver has no compatible */
                reg = <0x00010000 0 0 0 0>;
        };

diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-map-ac2200.dts b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-map-ac2200.dts
index 329d85704b941184547b2e70a6e712fde59a923b..a10ae8e8dbbc843e9d5a3e8726821f185297c996 100644 (file)
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-map-ac2200.dts
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-map-ac2200.dts
@@ -208,7 +208,7 @@
 };
 
 &pcie_bridge0 {
-       wifi@1,0 {
+       wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                ieee80211-freq-limit = <5170000 5350000>;

diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-mf18a.dts b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-mf18a.dts
index 913d0c6b955c299cdb7b7700be6f4d2c6f5a7038..23577bde45f26a2b1f7fe9bab6e77cbe28c9877a 100644 (file)
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-mf18a.dts
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-mf18a.dts
@@ -475,7 +475,7 @@
 };
 
 &pcie_bridge0 {
-       wifi@1,0 {
+       wifi@0,0 {
                compatible = "pci168c,0040";
                reg = <0x00010000 0 0 0 0>;
                nvmem-cell-names = "pre-calibration", "mac-address";

diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-mf289f.dts b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-mf289f.dts
index c3fe58e0662cd1f581eee82ccd9214a41a93f7bb..50a5528abe70f1c0e8f3ae86cefa9921538977c3 100644 (file)
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-mf289f.dts
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-mf289f.dts
@@ -426,7 +426,7 @@
 };
 
 &pcie_bridge0 {
-       wifi@1,0 {
+       wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                nvmem-cell-names = "mac-address";

diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-mr8300.dts b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-mr8300.dts
index f93211a1fb723661c27d44696b839035418b2540..0d10a9c6d79adb2ce7fb4ea7b430de18024691a6 100644 (file)
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-mr8300.dts
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-mr8300.dts
@@ -80,7 +80,7 @@
 };
 
 &pcie_bridge0 {
-       wifi@1,0 {
+       wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                ieee80211-freq-limit = <5490000 5835000>;

diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-orbi.dtsi b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-orbi.dtsi
index 8348c1ee6351a96ed41cf727d42b1b018f68cacf..65c3b3361331cb89493aa3cc3067288407e5f4b5 100644 (file)
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-orbi.dtsi
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-orbi.dtsi
@@ -314,7 +314,7 @@
 };
 
 &pcie_bridge0 {
-       wifi@1,0 {
+       wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                ieee80211-freq-limit = <5470000 5875000>;

diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-pa2200.dts b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-pa2200.dts
index f907814d9e4ad36adcc29d5e53ac71f915099996..34a8db122161c9566e6908f283060c826d333620 100644 (file)
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-pa2200.dts
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-pa2200.dts
@@ -195,7 +195,7 @@
 };
 
 &pcie_bridge0 {
-       wifi@1,0 {
+       wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                ieee80211-freq-limit = <5170000 5350000>;

diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-rt-ac42u.dts b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-rt-ac42u.dts
index 30f3f05624648bd28a2587c51ffef7c9d53ace36..4406f56a5b69361e0e5e96cf331b546bdb9ffc86 100644 (file)
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-rt-ac42u.dts
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-rt-ac42u.dts
@@ -312,7 +312,7 @@
 };
 
 &pcie_bridge0 {
-       wifi@1,0 {
+       wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                qcom,ath10k-calibration-variant = "ASUS-RT-AC42U";

diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-whw03v2.dts b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-whw03v2.dts
index 5744693ddd7b2a3726b24102bb5a0f5c8842bfcc..7f5e6fd0b4379ff6fa356b8f2c0441fa3db7c564 100644 (file)
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-whw03v2.dts
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-whw03v2.dts
@@ -231,7 +231,7 @@
 };
 
 &pcie_bridge0 {
-       wifi@1,0 {
+       wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                ieee80211-freq-limit = <5490000 5835000>;

diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4029-insect-common.dtsi b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4029-insect-common.dtsi
index 8167dba0c5cc435d0c358007f139a43ef6172c07..853ce1172e02b2176a84472d6cd0a408829c531a 100644 (file)
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4029-insect-common.dtsi
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4029-insect-common.dtsi
@@ -279,7 +279,7 @@
 };
 
 &pcie_bridge0 {
-       wifi@1,0 {
+       wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                nvmem-cells = <&mac_address 1>;