arm64: dts: meson: remove broadcom wifi compatible from GX reference boards

Amlogic GX reference boards shipped with Broadcom SDIO modules and
this is described in device-tree files. These boards are rare, but
their device-trees are commonly used to boot no-name Android STB's
that closely follow the vendor reference design. For cost reasons
these boxes often use non-Broadcom RTL8189ES/FS and QCA9377 SDIO
modules, and for availability reasons the chipset/module used can
change between batches of the same device.

Testing shows the only requirement for WiFi driver probe and load
is presence of the correct 'reg' value, and all Amlogic boards use
the same <1> value. Removing the 'brcm,bcm4329-fmac' compatible
allows a wider range of Android STB boards to boot from reference
design device-trees and have working WiFi. Also convert the 'brcmf'
node name to a more generic 'sdio' to reflect we are not always
using the Broadcom brcmfmac driver now.

Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
Link: https://lore.kernel.org/r/20241127043358.3799737-1-christianshewitt@gmail.com
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
index 52d57773a77fa8f54955f45d01355cd6feea6283..1736bd2e96e214c0535491c87dd28ce6f45f0db5 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
@@ -178,9 +178,8 @@
        vmmc-supply = <&vddao_3v3>;
        vqmmc-supply = <&vddio_boot>;
 
-       brcmf: wifi@1 {
+       sdio: wifi@1 {
                reg = <1>;
-               compatible = "brcm,bcm4329-fmac";
        };
 };
 

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts
index c1470416faade14c22b08f397d4d1dd99076d6b8..7dffeb5931c9bba8d77aca1909e09b237ff49e56 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts
@@ -102,8 +102,7 @@
 };
 
 &sd_emmc_a {
-       brcmf: wifi@1 {
+       sdio: wifi@1 {
                reg = <1>;
-               compatible = "brcm,bcm4329-fmac";
        };
 };

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p231.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p231.dts
index 92c425d0259cc66021ae480e84738ee778fe930f..ff9145d490902501784547c623615eb276dc20ac 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p231.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p231.dts
@@ -21,8 +21,7 @@
 };
 
 &sd_emmc_a {
-       brcmf: wifi@1 {
+       sdio: wifi@1 {
                reg = <1>;
-               compatible = "brcm,bcm4329-fmac";
        };
 };

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi
index 7e7dc87ede2d2686e3b0dd3ca24af420fb53317d..b52a830efcce61c4c29163dcc22b250a4b6b93a9 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi
@@ -134,9 +134,8 @@
        vmmc-supply = <&vddao_3v3>;
        vqmmc-supply = <&vddio_boot>;
 
-       brcmf: wifi@1 {
+       sdio: wifi@1 {
                reg = <1>;
-               compatible = "brcm,bcm4329-fmac";
        };
 };
 

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts
index d4858afa0e9cd0f8b90c3a8e38b74872a8125891..feb31207773ffe435129050c09b96d2f4289661b 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts
@@ -72,8 +72,7 @@
 };
 
 &sd_emmc_a {
-       brcmf: wifi@1 {
+       sdio: wifi@1 {
                reg = <1>;
-               compatible = "brcm,bcm4329-fmac";
        };
 };

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-q201.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-q201.dts
index d02b80d77378664309ce664e623e5256ba62aa89..6c8bec1853acfa197e569c3c02de68005c7f8e55 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-gxm-q201.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-q201.dts
@@ -21,8 +21,7 @@
 };
 
 &sd_emmc_a {
-       brcmf: wifi@1 {
+       sdio: wifi@1 {
                reg = <1>;
-               compatible = "brcm,bcm4329-fmac";
        };
 };