ipq806x: dts: correct PCIe device node name
authorShiji Yang <[email protected]>
Sun, 1 Jun 2025 06:52:22 +0000 (14:52 +0800)
committerChristian Marangi <[email protected]>
Tue, 14 Oct 2025 08:27:28 +0000 (10:27 +0200)
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 on 6.12 kernel:

qcom-ipq8065-tr4400-v2.dts:482.11-487.4: Warning (pci_device_reg): /soc/pcie@1b500000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq8065-tr4400-v2.dts:499.11-504.4: Warning (pci_device_reg): /soc/pcie@1b700000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq8065-rt4230w-rev6.dts:584.11-589.4: Warning (pci_device_reg): /soc/pcie@1b500000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq8065-rt4230w-rev6.dts:601.11-606.4: Warning (pci_device_reg): /soc/pcie@1b700000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq8064-g10.dts:291.11-295.4: Warning (pci_device_reg): /soc/pcie@1b500000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq8064-g10.dts:303.11-307.4: Warning (pci_device_reg): /soc/pcie@1b700000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq8064-wxr-2533dhp.dts:525.11-530.4: Warning (pci_device_reg): /soc/pcie@1b500000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq8064-wxr-2533dhp.dts:539.11-544.4: Warning (pci_device_reg): /soc/pcie@1b700000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq8068-ecw5410.dts:235.11-239.4: Warning (pci_device_reg): /soc/pcie@1b500000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq8068-ecw5410.dts:251.11-255.4: Warning (pci_device_reg): /soc/pcie@1b700000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq8068-ap3935.dts:261.11-264.4: Warning (pci_device_reg): /soc/pcie@1b500000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq8068-ap3935.dts:275.11-278.4: Warning (pci_device_reg): /soc/pcie@1b700000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq8064-fap-421e.dts:347.11-352.4: Warning (pci_device_reg): /soc/pcie@1b500000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq8064-fap-421e.dts:362.11-367.4: Warning (pci_device_reg): /soc/pcie@1b700000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq8068-cryptid-common.dtsi:78.18-81.4: Warning (pci_device_reg): /soc/pcie@1b500000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq8068-cryptid-common.dtsi:89.18-92.4: Warning (pci_device_reg): /soc/pcie@1b700000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq8068-cryptid-common.dtsi:100.18-103.4: Warning (pci_device_reg): /soc/pcie@1b900000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq8064-wg2600hp.dts:464.11-469.4: Warning (pci_device_reg): /soc/pcie@1b500000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq8064-wg2600hp.dts:478.11-483.4: Warning (pci_device_reg): /soc/pcie@1b700000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq8062-wg2600hp3.dts:404.11-410.4: Warning (pci_device_reg): /soc/pcie@1b500000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq8062-wg2600hp3.dts:419.11-426.4: Warning (pci_device_reg): /soc/pcie@1b700000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq8064-d7800.dts:210.11-215.4: Warning (pci_device_reg): /soc/pcie@1b500000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq8064-d7800.dts:227.11-232.4: Warning (pci_device_reg): /soc/pcie@1b700000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq8064-r7500v2.dts:213.11-218.4: Warning (pci_device_reg): /soc/pcie@1b500000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq8064-r7500v2.dts:230.11-235.4: Warning (pci_device_reg): /soc/pcie@1b700000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq8065-nighthawk.dtsi:546.18-549.4: Warning (pci_device_reg): /soc/pcie@1b500000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq8065-nighthawk.dtsi:559.18-562.4: Warning (pci_device_reg): /soc/pcie@1b700000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq8065-ac400i.dts:202.11-206.4: Warning (pci_device_reg): /soc/pcie@1b500000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq8065-ac400i.dts:218.11-222.4: Warning (pci_device_reg): /soc/pcie@1b700000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq8064-ad7200-c2600.dtsi:319.11-324.4: Warning (pci_device_reg): /soc/pcie@1b500000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq8064-ad7200-c2600.dtsi:333.11-338.4: Warning (pci_device_reg): /soc/pcie@1b700000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq8064-vr2600v.dts:347.11-352.4: Warning (pci_device_reg): /soc/pcie@1b500000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"
qcom-ipq8064-vr2600v.dts:361.11-366.4: Warning (pci_device_reg): /soc/pcie@1b700000/pcie@0/wifi@1,0: PCI unit address format error, expected "0,0"

Signed-off-by: Shiji Yang <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/18989
Signed-off-by: Christian Marangi <[email protected]>
17 files changed:
target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8062-wg2600hp3.dts
target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-ad7200-c2600.dtsi
target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-d7800.dts
target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-fap-421e.dts
target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-g10.dts
target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-r7500v2.dts
target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-vr2600v.dts
target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-wg2600hp.dts
target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-wxr-2533dhp.dts
target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-ac400i.dts
target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-nighthawk.dtsi
target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-rt4230w-rev6.dts
target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-tr4400-v2.dts
target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-ap3935.dts
target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-cryptid-common.dtsi
target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-ecw5410.dts
target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-ss-w2-ac2600.dts

index b208c7ca53c3a9e809f845eeb3b866df9509d7b8..602c3b115ed032f1bff4488ee3f8cdb81d2f6f9b 100644 (file)
 };
 
 &pcie_bridge0 {
-       wifi@1,0 {
+       wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                nvmem-cells = <&macaddr_PRODUCTDATA_12>, <&precal_ART_1000>;
 };
 
 &pcie_bridge1 {
-       wifi@1,0 {
+       wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                ieee80211-freq-limit = <2400000 2483000>;
index d28a07f00315dbfebdfaccfcd426fe2425c804d6..c54ec40428661a017066fa10de6be1ac603b5334 100644 (file)
 };
 
 &pcie_bridge0 {
-       wifi@1,0 {
+       wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                nvmem-cells = <&macaddr_defaultmac_8 (-1)>, <&precal_radio_1000>;
 };
 
 &pcie_bridge1 {
-       wifi@1,0 {
+       wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                nvmem-cells = <&macaddr_defaultmac_8 0>, <&precal_radio_5000>;
index d4d78674a63cf266ada36a6a3176d7d2bff64c08..98cba965809e4c172a2c7af60b02c5a143b80ac0 100644 (file)
 };
 
 &pcie_bridge0 {
-       wifi@1,0 {
+       wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                nvmem-cells = <&macaddr_art_6 1>, <&precal_art_1000>;
 };
 
 &pcie_bridge1 {
-       wifi@1,0 {
+       wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                nvmem-cells = <&macaddr_art_6 2>, <&precal_art_5000>;
index 8e74567f54c706f94fe538af755b97a4edaedd28..371fdbacb2ae6dbd83f546459b318b8c5ff0e94f 100644 (file)
 };
 
 &pcie_bridge0 {
-       wifi@1,0 {
+       wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                nvmem-cells = <&macaddr_appsbl_7ff80 8>;
 };
 
 &pcie_bridge1 {
-       wifi@1,0 {
+       wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                nvmem-cells = <&macaddr_appsbl_7ff80 16>;
index 1cecb301b4793fe4fdc0547b1f3da05e7ce1c684..2e901d5a204c0d492729357933b448fd5d698c8f 100644 (file)
 };
 
 &pcie_bridge0 {
-       wifi@1,0 {
+       wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                qcom,ath10k-calibration-variant = "ASRock-G10";
 };
 
 &pcie_bridge1 {
-       wifi@1,0 {
+       wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                qcom,ath10k-calibration-variant = "ASRock-G10";
index 6b79488d7f637d6a2086d78d13678fa78f9b8d6d..dd8d0b3cf174f04dd2b7deb23e47101146846a36 100644 (file)
 };
 
 &pcie_bridge0 {
-       wifi@1,0 {
+       wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                nvmem-cells = <&macaddr_art_6 1>, <&precal_art_1000>;
 };
 
 &pcie_bridge1 {
-       wifi@1,0 {
+       wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                nvmem-cells = <&macaddr_art_6 2>, <&precal_art_5000>;
index 32c0ee0d7bd53e75659db69f36b7825d9959aa65..132ccbe1c2a947615c236edaa516114674f3853b 100644 (file)
 };
 
 &pcie_bridge0 {
-       wifi@1,0 {
+       wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                nvmem-cells = <&macaddr_defaultmac_0 (-1)>, <&precal_ART_1000>;
 };
 
 &pcie_bridge1 {
-       wifi@1,0 {
+       wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                nvmem-cells = <&macaddr_defaultmac_0 0>, <&precal_ART_5000>;
index 3230ddc9261e0093a6a25d90632dd56bea812732..9e1f1057761705b57243ddf8195176bf5d87c2bf 100644 (file)
@@ -461,7 +461,7 @@ switch@10 {
 };
 
 &pcie_bridge0 {
-       wifi@1,0 {
+       wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                nvmem-cells = <&macaddr_PRODUCTDATA_12>, <&precal_ART_1000>;
@@ -475,7 +475,7 @@ switch@10 {
 };
 
 &pcie_bridge1 {
-       wifi@1,0 {
+       wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                nvmem-cells = <&macaddr_PRODUCTDATA_c>, <&precal_ART_5000>;
index 84e7e55c26183880400ab5d1a83a917cf5a5b1c6..8c31dbcafa11613db95ba4345f48410cca1103c8 100644 (file)
 };
 
 &pcie_bridge0 {
-       wifi@1,0 {
+       wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                nvmem-cells = <&macaddr_ART_1e>, <&precal_ART_1000>;
 };
 
 &pcie_bridge1 {
-       wifi@1,0 {
+       wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                nvmem-cells = <&macaddr_ART_18>, <&precal_ART_5000>;
index bd4312cfa30ced70ecf92eaf8b608a3b2648c2f4..c6876480aab729968d5bf38ebfda3f0bf93fcd02 100644 (file)
 };
 
 &pcie_bridge0 {
-       wifi@1,0 {
+       wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                qcom,ath10k-calibration-variant = "Nokia-AC400i";
 };
 
 &pcie_bridge1 {
-       wifi@1,0 {
+       wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                qcom,ath10k-calibration-variant = "Nokia-AC400i";
index b4ffdcc79277e692e79d90b08e53841c3ce9f33e..4f1b49f63cc6befb68fbe8571c226ea84de6ea84 100644 (file)
 };
 
 &pcie_bridge0 {
-       wifi0: wifi@1,0 {
+       wifi0: wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
        };
 };
 
 &pcie_bridge1 {
-       wifi1: wifi@1,0 {
+       wifi1: wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
        };
index e4ee3d2f3bf2c31242af8893350db54382001614..500f2f15f8107087a6d4718accae74693e3b7113 100644 (file)
 };
 
 &pcie_bridge0 {
-       wifi@1,0 {
+       wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                nvmem-cells = <&precal_ART_1000>;
 };
 
 &pcie_bridge1 {
-       wifi@1,0 {
+       wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                nvmem-cells = <&precal_ART_5000>;
index 22b5381b482a4fe3c07e20baa35433c1196d0da6..37c8dc29dd55e7a11d0da057d7daa47403496ec5 100644 (file)
 };
 
 &pcie_bridge0 {
-       wifi@1,0 {
+       wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                nvmem-cells = <&precal_ART_1000>, <&macaddr_fw_env_12>;
 };
 
 &pcie_bridge1 {
-       wifi@1,0 {
+       wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                nvmem-cells = <&precal_ART_5000>, <&macaddr_fw_env_c>;
index 74054fedc87c7332596e8bbd831b2c3d69aab8b9..b1b3b661f15ec4d2d0f3c613970dd77b76372eab 100644 (file)
 };
 
 &pcie_bridge0 {
-       wifi@1,0 {
+       wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
        };
 };
 
 &pcie_bridge1 {
-       wifi@1,0 {
+       wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
        };
index 231d688c3599300c6027f7be83d34a1b0c00a7f9..c38ded86ee48a5e9400eb9c73d099ad7f246fc3e 100644 (file)
@@ -75,7 +75,7 @@
 };
 
 &pcie_bridge0 {
-       wifi0: wifi@1,0 {
+       wifi0: wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
        };
@@ -86,7 +86,7 @@
 };
 
 &pcie_bridge1 {
-       wifi1: wifi@1,0 {
+       wifi1: wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
        };
@@ -97,7 +97,7 @@
 };
 
 &pcie_bridge2 {
-       wifi2: wifi@1,0 {
+       wifi2: wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
        };
index eae96da7360f3403de4858a65d0e337bf4cd6965..2bf793c41cc7a64d21ccf3301ad8ae78c45c7721 100644 (file)
 };
 
 &pcie_bridge0 {
-       wifi@1,0 {
+       wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                qcom,ath10k-calibration-variant = "Edgecore-ECW5410-L";
 };
 
 &pcie_bridge1 {
-       wifi@1,0 {
+       wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                qcom,ath10k-calibration-variant = "Edgecore-ECW5410-L";
index 28f7c4540f80f5812f175def3539139b3df59ea0..6d43b80ad467c9ed40b50ceab6c51eeb30517cce 100644 (file)
 };
 
 &pcie_bridge1 {
-       wifi@1,0 {
+       wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                qcom,ath10k-calibration-variant = "IgniteNet-SS-W2-AC2600";
 };
 
 &pcie_bridge2 {
-       wifi@1,0 {
+       wifi@0,0 {
                compatible = "qcom,ath10k";
                reg = <0x00010000 0 0 0 0>;
                qcom,ath10k-calibration-variant = "IgniteNet-SS-W2-AC2600";