From 1a3f05eb2b8ea72d59e03a4cb053214d4e81e218 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 6 Oct 2025 17:39:54 -0700 Subject: [PATCH] ipq806x: fix wifi node In the conversion to nvmem of eax500 and unifi-ac-hd, the address was set to 0 as is the case with most platforms, but not this one. The wifi node also needs to be wrapped in a bridge node. Matches every other device in ipq806x. Fixes: 148f82ad4525 ("ipq806x: use nvmem for wifi mac") Signed-off-by: Rosen Penev Link: https://github.com/openwrt/openwrt/pull/20325 Signed-off-by: Robert Marko --- .../boot/dts/qcom/qcom-ipq8064-eax500.dtsi | 34 ++++++++++++------ .../dts/qcom/qcom-ipq8064-unifi-ac-hd.dts | 36 +++++++++++++------ 2 files changed, 50 insertions(+), 20 deletions(-) diff --git a/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8064-eax500.dtsi b/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8064-eax500.dtsi index 59f6dc8698..b4f14d8a0b 100644 --- a/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8064-eax500.dtsi +++ b/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8064-eax500.dtsi @@ -53,22 +53,36 @@ max-link-speed = <1>; - wifi@0,0 { - compatible = "qcom,ath10k"; - reg = <0x0000 0 0 0 0>; - nvmem-cells = <&precal_art_1000>; - nvmem-cell-names = "pre-calibration"; + bridge@0,0 { + reg = <0x00000000 0 0 0 0>; + #address-cells = <3>; + #size-cells = <2>; + ranges; + + wifi@1,0 { + compatible = "qcom,ath10k"; + reg = <0x00010000 0 0 0 0>; + nvmem-cells = <&precal_art_1000>; + nvmem-cell-names = "pre-calibration"; + }; }; }; &pcie1 { status = "okay"; - wifi@0,0 { - compatible = "qcom,ath10k"; - reg = <0x0000 0 0 0 0>; - nvmem-cells = <&precal_art_5000>; - nvmem-cell-names = "pre-calibration"; + bridge@0,0 { + reg = <0x00000000 0 0 0 0>; + #address-cells = <3>; + #size-cells = <2>; + ranges; + + wifi@1,0 { + compatible = "qcom,ath10k"; + reg = <0x00010000 0 0 0 0>; + nvmem-cells = <&precal_art_5000>; + nvmem-cell-names = "pre-calibration"; + }; }; }; diff --git a/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8064-unifi-ac-hd.dts b/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8064-unifi-ac-hd.dts index c415b5901a..3a1ad07ecd 100644 --- a/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8064-unifi-ac-hd.dts +++ b/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8064-unifi-ac-hd.dts @@ -283,22 +283,38 @@ &pcie0 { status = "okay"; - wifi@0,0 { - compatible = "qcom,ath10k"; - reg = <0x0000 0 0 0 0>; - nvmem-cells = <&macaddr_eeprom_6 1>; - nvmem-cell-names = "mac-address"; + bridge@0,0 { + reg = <0x00000000 0 0 0 0>; + #address-cells = <3>; + #size-cells = <2>; + ranges; + + wifi@1,0 { + compatible = "qcom,ath10k"; + reg = <0x00010000 0 0 0 0>; + + nvmem-cells = <&macaddr_eeprom_6 1>; + nvmem-cell-names = "mac-address"; + }; }; }; &pcie1 { status = "okay"; - wifi@0,0 { - compatible = "qcom,ath10k"; - reg = <0x0000 0 0 0 0>; - nvmem-cells = <&macaddr_eeprom_6 2>; - nvmem-cell-names = "mac-address"; + bridge@0,0 { + reg = <0x00000000 0 0 0 0>; + #address-cells = <3>; + #size-cells = <2>; + ranges; + + wifi@1,0 { + compatible = "qcom,ath10k"; + reg = <0x00010000 0 0 0 0>; + + nvmem-cells = <&macaddr_eeprom_6 2>; + nvmem-cell-names = "mac-address"; + }; }; }; -- 2.30.2