From: Robert Marko Date: Mon, 12 May 2025 18:14:52 +0000 (+0200) Subject: qualcommax: fix PCIe card wifi node address X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e20f7b6c61ded7a77ebee76b59612c76d76b9f2;p=thirdparty%2Fopenwrt.git 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 --- 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 a11d033a965..8505178a8f6 100644 --- 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 04bb6fc79a6..036fc63a9ff 100644 --- 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 a9c04176ec5..4993d9d1988 100644 --- 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 5399ee387c8..d88a1dc9e5e 100644 --- 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 46382582e3e..1b401e326f6 100644 --- 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 8236d98d3c1..a6e937e4799 100644 --- 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 00a96fbdbaf..bbb0057a8f8 100644 --- 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 231a38f2c4a..e39c92421f3 100644 --- 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 8aae5415075..d80bbe7e1c4 100644 --- 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 4d5471153e6..c21f1707f19 100644 --- 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 */