qualcommax: fix PCIe card wifi node address

Unlike other buses, for PCIe child nodes we should not use "wifi@1,0" as
the bus adress since for PCI devices the actual device adress on the bus is
actually set via the "reg" property and the node name is unused completely.

Though, it will cause DTC to throw warnings, so after investigation and
similar issue upstream[1] simply set the nodes to "wifi@0,0" instead.

[1] https://lists.infradead.org/pipermail/linux-arm-kernel/2021-August/680846.html

Link: https://github.com/openwrt/openwrt/pull/18789
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mr5500.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mr5500.dts
index a11d033a965857a1f320ae702be756b8c9306f12..8505178a8f6f539836b6b47e119c1749dd27bbfd 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mr5500.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mr5500.dts
@@ -308,7 +308,7 @@
        perst-gpios = <&tlmm 15 GPIO_ACTIVE_LOW>;
 
        pcie@0 {
-               wifi@1,0 {
+               wifi@0,0 {
                        status = "okay";
 
                        /* QCN9074: ath11k lacks DT compatible for PCI cards */

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx5500.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx5500.dts
index 04bb6fc79a609d97357a1a3437a790ad6767a064..036fc63a9ff43c76b9d644d2f236e66d837de126 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx5500.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx5500.dts
@@ -155,7 +155,7 @@
        perst-gpios = <&tlmm 15 GPIO_ACTIVE_LOW>;
 
        pcie@0 {
-               wifi@1,0 {
+               wifi@0,0 {
                        status = "okay";
 
                        /* QCN9074: ath11k lacks DT compatible for PCI cards */

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-spnmx56.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-spnmx56.dts
index a9c04176ec576d364295025bf8bad14a7f355efc..4993d9d1988a980e97f554539fe977f5ddcd13df 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-spnmx56.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-spnmx56.dts
@@ -166,7 +166,7 @@
        perst-gpios = <&tlmm 15 GPIO_ACTIVE_LOW>;
 
        pcie@0 {
-               wifi@1,0 {
+               wifi@0,0 {
                        status = "okay";
 
                        /* QCN9074: ath11k lacks DT compatible for PCI cards */

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-xe3-4.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-xe3-4.dts
index 5399ee387c89f46eae3406dc9f99ebf6ae26ee78..d88a1dc9e5e527bdfa08cdca51e1ab33d6748506 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-xe3-4.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6010-xe3-4.dts
@@ -156,7 +156,7 @@
        perst-gpio = <&tlmm 60 GPIO_ACTIVE_LOW>;
 
        pcie@0 {
-               wifi@1,0 {
+               wifi@0,0 {
                        status = "okay";
 
                        /* ath11k has no DT compatible for PCI cards */

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-mr7500.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-mr7500.dts
index 46382582e3e558f9efede4e45bae0ba3a4ae7f0f..1b401e326f623d3014c30d360ea7e79941c954c5 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-mr7500.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-mr7500.dts
@@ -523,7 +523,7 @@
        status = "okay";
 
        pcie@0 {
-               wifi@1,0 {
+               wifi@0,0 {
                        status = "okay";
                        /* ath11k has no DT compatible for PCI cards */
                        compatible = "pci17cb,1104";

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-ax3600.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-ax3600.dts
index 8236d98d3c1cbadb87484a61ac4a70a6d171fd19..a6e937e47994098e30b3d841562e25bedf487ad3 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-ax3600.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-ax3600.dts
@@ -51,7 +51,7 @@
        perst-gpio = <&tlmm 52 GPIO_ACTIVE_HIGH>;
 
        pcie@0 {
-               wifi0: wifi@1,0 {
+               wifi0: wifi@0,0 {
                        status = "okay";
 
                        compatible = "qcom,ath10k";

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax9000.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax9000.dts
index 00a96fbdbaf8e6de6a343dcb90c7cee9a6295b85..bbb0057a8f8a2b6c3874e8b01653fbba4ec14e82 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax9000.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax9000.dts
@@ -536,7 +536,7 @@
        perst-gpio = <&tlmm 58 GPIO_ACTIVE_LOW>;
 
        pcie@0 {
-               wifi@1,0 {
+               wifi@0,0 {
                        status = "okay";
 
                        /* ath11k has no DT compatible for PCI cards */
@@ -558,7 +558,7 @@
        perst-gpio = <&tlmm 62 GPIO_ACTIVE_HIGH>;
 
        pcie@0 {
-               wifi@1,0 {
+               wifi@0,0 {
                        status = "okay";
 
                        compatible = "qcom,ath10k";

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-haze.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-haze.dts
index 231a38f2c4a5913b94d42e85f19fbdc6ffe68f6d..e39c92421f30e493206bb68b91bfbb05d4b04a63 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-haze.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-haze.dts
@@ -293,7 +293,7 @@
        perst-gpio = <&tlmm 61 GPIO_ACTIVE_LOW>;
 
        pcie@0 {
-               wifi@1,0 {
+               wifi@0,0 {
                        status = "okay";
 
                        /* ath11k has no DT compatible for PCI cards */

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-mx5300.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-mx5300.dts
index 8aae54150759ee310d58523d45231cd0cdbd4aca..d80bbe7e1c4b7cc4b0f5c83002dd8a9e62c025bf 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-mx5300.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-mx5300.dts
@@ -523,7 +523,7 @@
        perst-gpio = <&tlmm 58 GPIO_ACTIVE_LOW>;
 
        pcie@0 {
-               wifi0: wifi@1,0 {
+               wifi0: wifi@0,0 {
                        status = "okay";
 
                        compatible = "qcom,ath10k";

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-mx8500.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-mx8500.dts
index 4d5471153e602dd6ba706bbbab70d40131c44801..c21f1707f19cbc29d1e86a5d0bdd25509a852b58 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-mx8500.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-mx8500.dts
@@ -499,7 +499,7 @@
        perst-gpio = <&tlmm 61 GPIO_ACTIVE_LOW>;
 
        pcie@0 {
-               wifi@1,0 {
+               wifi@0,0 {
                        status = "okay";
 
                        /* ath11k has no DT compatible for PCI cards */