projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'block-5.14-2021-08-07' of git://git.kernel.dk/linux-block
[linux-2.6-microblaze.git]
/
arch
/
arm
/
boot
/
dts
/
exynos4210-universal_c210.dts
diff --git
a/arch/arm/boot/dts/exynos4210-universal_c210.dts
b/arch/arm/boot/dts/exynos4210-universal_c210.dts
index
dd44ad2
..
f052853
100644
(file)
--- a/
arch/arm/boot/dts/exynos4210-universal_c210.dts
+++ b/
arch/arm/boot/dts/exynos4210-universal_c210.dts
@@
-614,7
+614,7
@@
pinctrl-0 = <&sd3_clk>, <&sd3_cmd>, <&sd3_bus4>;
brcmf: wifi@1 {
- compatible = "brcm,bcm4330-fmac";
+ compatible = "brcm,bcm4330-fmac"
, "brcm,bcm4329-fmac"
;
reg = <1>;
interrupt-parent = <&gpx2>;
interrupts = <5 IRQ_TYPE_LEVEL_HIGH>;