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>
This commit is contained in:
		 Shiji Yang
					Shiji Yang
				
			
				
					committed by
					
						 Hauke Mehrtens
						Hauke Mehrtens
					
				
			
			
				
	
			
			
			 Hauke Mehrtens
						Hauke Mehrtens
					
				
			
						parent
						
							08e2fdc17d
						
					
				
				
					commit
					cfb15d7f83
				
			| @@ -215,7 +215,7 @@ | |||||||
| }; | }; | ||||||
|  |  | ||||||
| &pcie_bridge0 { | &pcie_bridge0 { | ||||||
| 	wifi@1,0 { | 	wifi@0,0 { | ||||||
| 		compatible = "qcom,ath10k"; | 		compatible = "qcom,ath10k"; | ||||||
| 		reg = <0x00010000 0 0 0 0>; | 		reg = <0x00010000 0 0 0 0>; | ||||||
| 		ieee80211-freq-limit = <5170000 5350000>; | 		ieee80211-freq-limit = <5170000 5350000>; | ||||||
|   | |||||||
| @@ -94,7 +94,7 @@ | |||||||
| }; | }; | ||||||
|  |  | ||||||
| &pcie_bridge0 { | &pcie_bridge0 { | ||||||
| 	wifi@1,0 { | 	wifi@0,0 { | ||||||
| 		compatible = "qcom,ath10k"; | 		compatible = "qcom,ath10k"; | ||||||
| 		reg = <0x00010000 0 0 0 0>; | 		reg = <0x00010000 0 0 0 0>; | ||||||
| 		ieee80211-freq-limit = <5490000 5835000>; | 		ieee80211-freq-limit = <5490000 5835000>; | ||||||
|   | |||||||
| @@ -206,7 +206,7 @@ | |||||||
| }; | }; | ||||||
|  |  | ||||||
| &pcie_bridge0 { | &pcie_bridge0 { | ||||||
| 	wifi@1,0 { | 	wifi@0,0 { | ||||||
| 		compatible = "qcom,ath10k"; | 		compatible = "qcom,ath10k"; | ||||||
| 		reg = <0x00010000 0 0 0 0>; | 		reg = <0x00010000 0 0 0 0>; | ||||||
| 		nvmem-cell-names = "pre-calibration"; | 		nvmem-cell-names = "pre-calibration"; | ||||||
|   | |||||||
| @@ -315,7 +315,7 @@ | |||||||
| }; | }; | ||||||
|  |  | ||||||
| &pcie_bridge0 { | &pcie_bridge0 { | ||||||
| 	dsl@1,0 { | 	dsl@0,0 { | ||||||
| 		compatible = "intel,vrx518"; | 		compatible = "intel,vrx518"; | ||||||
| 		reg = <0x00010000 0 0 0 0>; | 		reg = <0x00010000 0 0 0 0>; | ||||||
| 	}; | 	}; | ||||||
|   | |||||||
| @@ -236,7 +236,7 @@ | |||||||
| }; | }; | ||||||
|  |  | ||||||
| &pcie_bridge0 { | &pcie_bridge0 { | ||||||
| 	wifi@1,0 { | 	wifi@0,0 { | ||||||
| 		/* QCA9984 */ | 		/* QCA9984 */ | ||||||
| 		compatible = "qcom,ath10k"; | 		compatible = "qcom,ath10k"; | ||||||
| 		reg = <0x00010000 0 0 0 0>; | 		reg = <0x00010000 0 0 0 0>; | ||||||
|   | |||||||
| @@ -337,7 +337,7 @@ | |||||||
| }; | }; | ||||||
|  |  | ||||||
| &pcie_bridge0 { | &pcie_bridge0 { | ||||||
| 	wifi@1,0 { | 	wifi@0,0 { | ||||||
| 		/* Bootlog shows this is a 168c:0056 - QCA 9888v2 */ | 		/* Bootlog shows this is a 168c:0056 - QCA 9888v2 */ | ||||||
| 		compatible = "qcom,ath10k"; | 		compatible = "qcom,ath10k"; | ||||||
| 		reg = <0x00010000 0 0 0 0>; | 		reg = <0x00010000 0 0 0 0>; | ||||||
|   | |||||||
| @@ -485,7 +485,7 @@ | |||||||
| }; | }; | ||||||
|  |  | ||||||
| &pcie_bridge0 { | &pcie_bridge0 { | ||||||
| 	wifi@1,0 { | 	wifi@0,0 { | ||||||
| 		compatible = "qcom,ath10k"; | 		compatible = "qcom,ath10k"; | ||||||
| 		reg = <0x00010000 0 0 0 0>; | 		reg = <0x00010000 0 0 0 0>; | ||||||
| 		ieee80211-freq-limit = <5170000 5350000>; | 		ieee80211-freq-limit = <5170000 5350000>; | ||||||
|   | |||||||
| @@ -231,7 +231,7 @@ | |||||||
|  |  | ||||||
| &pcie_bridge0 { | &pcie_bridge0 { | ||||||
| 	/* wil6210 802.11ad card */ | 	/* wil6210 802.11ad card */ | ||||||
| 	wifi@1,0 { | 	wifi@0,0 { | ||||||
| 		/* wil6210 driver has no compatible */ | 		/* wil6210 driver has no compatible */ | ||||||
| 		reg = <0x00010000 0 0 0 0>; | 		reg = <0x00010000 0 0 0 0>; | ||||||
| 	}; | 	}; | ||||||
|   | |||||||
| @@ -208,7 +208,7 @@ | |||||||
| }; | }; | ||||||
|  |  | ||||||
| &pcie_bridge0 { | &pcie_bridge0 { | ||||||
| 	wifi@1,0 { | 	wifi@0,0 { | ||||||
| 		compatible = "qcom,ath10k"; | 		compatible = "qcom,ath10k"; | ||||||
| 		reg = <0x00010000 0 0 0 0>; | 		reg = <0x00010000 0 0 0 0>; | ||||||
| 		ieee80211-freq-limit = <5170000 5350000>; | 		ieee80211-freq-limit = <5170000 5350000>; | ||||||
|   | |||||||
| @@ -475,7 +475,7 @@ | |||||||
| }; | }; | ||||||
|  |  | ||||||
| &pcie_bridge0 { | &pcie_bridge0 { | ||||||
| 	wifi@1,0 { | 	wifi@0,0 { | ||||||
| 		compatible = "pci168c,0040"; | 		compatible = "pci168c,0040"; | ||||||
| 		reg = <0x00010000 0 0 0 0>; | 		reg = <0x00010000 0 0 0 0>; | ||||||
| 		nvmem-cell-names = "pre-calibration", "mac-address"; | 		nvmem-cell-names = "pre-calibration", "mac-address"; | ||||||
|   | |||||||
| @@ -426,7 +426,7 @@ | |||||||
| }; | }; | ||||||
|  |  | ||||||
| &pcie_bridge0 { | &pcie_bridge0 { | ||||||
| 	wifi@1,0 { | 	wifi@0,0 { | ||||||
| 		compatible = "qcom,ath10k"; | 		compatible = "qcom,ath10k"; | ||||||
| 		reg = <0x00010000 0 0 0 0>; | 		reg = <0x00010000 0 0 0 0>; | ||||||
| 		nvmem-cell-names = "mac-address"; | 		nvmem-cell-names = "mac-address"; | ||||||
|   | |||||||
| @@ -80,7 +80,7 @@ | |||||||
| }; | }; | ||||||
|  |  | ||||||
| &pcie_bridge0 { | &pcie_bridge0 { | ||||||
| 	wifi@1,0 { | 	wifi@0,0 { | ||||||
| 		compatible = "qcom,ath10k"; | 		compatible = "qcom,ath10k"; | ||||||
| 		reg = <0x00010000 0 0 0 0>; | 		reg = <0x00010000 0 0 0 0>; | ||||||
| 		ieee80211-freq-limit = <5490000 5835000>; | 		ieee80211-freq-limit = <5490000 5835000>; | ||||||
|   | |||||||
| @@ -314,7 +314,7 @@ | |||||||
| }; | }; | ||||||
|  |  | ||||||
| &pcie_bridge0 { | &pcie_bridge0 { | ||||||
| 	wifi@1,0 { | 	wifi@0,0 { | ||||||
| 		compatible = "qcom,ath10k"; | 		compatible = "qcom,ath10k"; | ||||||
| 		reg = <0x00010000 0 0 0 0>; | 		reg = <0x00010000 0 0 0 0>; | ||||||
| 		ieee80211-freq-limit = <5470000 5875000>; | 		ieee80211-freq-limit = <5470000 5875000>; | ||||||
|   | |||||||
| @@ -195,7 +195,7 @@ | |||||||
| }; | }; | ||||||
|  |  | ||||||
| &pcie_bridge0 { | &pcie_bridge0 { | ||||||
| 	wifi@1,0 { | 	wifi@0,0 { | ||||||
| 		compatible = "qcom,ath10k"; | 		compatible = "qcom,ath10k"; | ||||||
| 		reg = <0x00010000 0 0 0 0>; | 		reg = <0x00010000 0 0 0 0>; | ||||||
| 		ieee80211-freq-limit = <5170000 5350000>; | 		ieee80211-freq-limit = <5170000 5350000>; | ||||||
|   | |||||||
| @@ -312,7 +312,7 @@ | |||||||
| }; | }; | ||||||
|  |  | ||||||
| &pcie_bridge0 { | &pcie_bridge0 { | ||||||
| 	wifi@1,0 { | 	wifi@0,0 { | ||||||
| 		compatible = "qcom,ath10k"; | 		compatible = "qcom,ath10k"; | ||||||
| 		reg = <0x00010000 0 0 0 0>; | 		reg = <0x00010000 0 0 0 0>; | ||||||
| 		qcom,ath10k-calibration-variant = "ASUS-RT-AC42U"; | 		qcom,ath10k-calibration-variant = "ASUS-RT-AC42U"; | ||||||
|   | |||||||
| @@ -231,7 +231,7 @@ | |||||||
| }; | }; | ||||||
|  |  | ||||||
| &pcie_bridge0 { | &pcie_bridge0 { | ||||||
| 	wifi@1,0 { | 	wifi@0,0 { | ||||||
| 		compatible = "qcom,ath10k"; | 		compatible = "qcom,ath10k"; | ||||||
| 		reg = <0x00010000 0 0 0 0>; | 		reg = <0x00010000 0 0 0 0>; | ||||||
| 		ieee80211-freq-limit = <5490000 5835000>; | 		ieee80211-freq-limit = <5490000 5835000>; | ||||||
|   | |||||||
| @@ -279,7 +279,7 @@ | |||||||
| }; | }; | ||||||
|  |  | ||||||
| &pcie_bridge0 { | &pcie_bridge0 { | ||||||
| 	wifi@1,0 { | 	wifi@0,0 { | ||||||
| 		compatible = "qcom,ath10k"; | 		compatible = "qcom,ath10k"; | ||||||
| 		reg = <0x00010000 0 0 0 0>; | 		reg = <0x00010000 0 0 0 0>; | ||||||
| 		nvmem-cells = <&mac_address 1>; | 		nvmem-cells = <&mac_address 1>; | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user