Merge tag 'block-5.14-2021-08-07' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / arch / arm / boot / dts / ste-ux500-samsung-skomer.dts

diff --git a/arch/arm/boot/dts/ste-ux500-samsung-skomer.dts b/arch/arm/boot/dts/ste-ux500-samsung-skomer.dts
index d28a007..94afd7a 100644 (file)
--- a/arch/arm/boot/dts/ste-ux500-samsung-skomer.dts
+++ b/arch/arm/boot/dts/ste-ux500-samsung-skomer.dts
@@ -211,7 +211,7 @@
                        #size-cells = <0>;
 
                        wifi@1 {
-                               compatible = "brcm,bcm4329-fmac";
+                               compatible = "brcm,bcm4334-fmac", "brcm,bcm4329-fmac";
                                reg = <1>;
                                /* GPIO216 WL_HOST_WAKE */
                                interrupt-parent = <&gpio6>;
@@ -247,6 +247,7 @@
 
                        /* FIXME: not quite working yet, probably needs regulators */
                        bluetooth {
+                               /* BCM4334B0 actually */
                                compatible = "brcm,bcm4330-bt";
                                shutdown-gpios = <&gpio6 30 GPIO_ACTIVE_HIGH>;
                                device-wakeup-gpios = <&gpio6 7 GPIO_ACTIVE_HIGH>;