Skip to content

Commit 608e9fe

Browse files
committed
Merge tag 'amlogic-arm64-dt-for-v6.14' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into soc/dt
Amlogic ARM64 DT changes for v6.13: - remove broadcom wifi compatible from GX reference boards * tag 'amlogic-arm64-dt-for-v6.14' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux: arm64: dts: meson: remove broadcom wifi compatible from GX reference boards Link: https://lore.kernel.org/r/72d71d3f-99c3-4767-8c80-8fa7a865c846@linaro.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents fa716fe + 1ba1964 commit 608e9fe

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)