Skip to content

Commit 1ba1964

Browse files
chewittsuperna9999
authored andcommitted
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>
1 parent 40384c8 commit 1ba1964

6 files changed

Lines changed: 6 additions & 12 deletions

File tree

arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,9 +178,8 @@
178178
vmmc-supply = <&vddao_3v3>;
179179
vqmmc-supply = <&vddio_boot>;
180180

181-
brcmf: wifi@1 {
181+
sdio: wifi@1 {
182182
reg = <1>;
183-
compatible = "brcm,bcm4329-fmac";
184183
};
185184
};
186185

arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,7 @@
102102
};
103103

104104
&sd_emmc_a {
105-
brcmf: wifi@1 {
105+
sdio: wifi@1 {
106106
reg = <1>;
107-
compatible = "brcm,bcm4329-fmac";
108107
};
109108
};

arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p231.dts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
};
2222

2323
&sd_emmc_a {
24-
brcmf: wifi@1 {
24+
sdio: wifi@1 {
2525
reg = <1>;
26-
compatible = "brcm,bcm4329-fmac";
2726
};
2827
};

arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,8 @@
134134
vmmc-supply = <&vddao_3v3>;
135135
vqmmc-supply = <&vddio_boot>;
136136

137-
brcmf: wifi@1 {
137+
sdio: wifi@1 {
138138
reg = <1>;
139-
compatible = "brcm,bcm4329-fmac";
140139
};
141140
};
142141

arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,7 @@
7272
};
7373

7474
&sd_emmc_a {
75-
brcmf: wifi@1 {
75+
sdio: wifi@1 {
7676
reg = <1>;
77-
compatible = "brcm,bcm4329-fmac";
7877
};
7978
};

arch/arm64/boot/dts/amlogic/meson-gxm-q201.dts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
};
2222

2323
&sd_emmc_a {
24-
brcmf: wifi@1 {
24+
sdio: wifi@1 {
2525
reg = <1>;
26-
compatible = "brcm,bcm4329-fmac";
2726
};
2827
};

0 commit comments

Comments
 (0)