ARM: dts: ux500: Fix some compatible strings

The Golden and Skomer phones have BCM4334 WLAN+BT chips,
so make the compatible strings reflect the new available
bindings for these.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/arch/arm/boot/dts/ste-ux500-samsung-golden.dts b/arch/arm/boot/dts/ste-ux500-samsung-golden.dts
index 0d43ee6583cf8986aa3ea9364065bb382aaa0a66..40df7c61bf69e6baa15245fa3fced734a2a1eea0 100644 (file)
--- a/arch/arm/boot/dts/ste-ux500-samsung-golden.dts
+++ b/arch/arm/boot/dts/ste-ux500-samsung-golden.dts
@@ -121,7 +121,7 @@
                        #size-cells = <0>;
 
                        wifi@1 {
-                               compatible = "brcm,bcm4329-fmac";
+                               compatible = "brcm,bcm4334-fmac", "brcm,bcm4329-fmac";
                                reg = <1>;
 
                                /* GPIO216 (WLAN_HOST_WAKE) */
@@ -162,6 +162,7 @@
                        pinctrl-1 = <&u0_a_1_sleep>;
 
                        bluetooth {
+                               /* BCM4334B0 actually */
                                compatible = "brcm,bcm4330-bt";
                                /* GPIO222 (BT_VREG_ON) */
                                shutdown-gpios = <&gpio6 30 GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm/boot/dts/ste-ux500-samsung-janice.dts b/arch/arm/boot/dts/ste-ux500-samsung-janice.dts
index f24369873ce2cee0e3fb3cc110118f6674bfe0d5..eaf8039d10ad63442458c679f98fc87ac4988bea 100644 (file)
--- a/arch/arm/boot/dts/ste-ux500-samsung-janice.dts
+++ b/arch/arm/boot/dts/ste-ux500-samsung-janice.dts
@@ -401,8 +401,7 @@
                        status = "okay";
 
                        wifi@1 {
-                               /* Actually BRCM4330 */
-                               compatible = "brcm,bcm4329-fmac";
+                               compatible = "brcm,bcm4330-fmac", "brcm,bcm4329-fmac";
                                reg = <1>;
                                /* GPIO216 WL_HOST_WAKE */
                                interrupt-parent = <&gpio6>;
@@ -436,6 +435,7 @@
                        status = "okay";
 
                        bluetooth {
+                               /* BCM4330B1 actually */
                                compatible = "brcm,bcm4330-bt";
                                /* GPIO222 rail BT_VREG_EN to BT_REG_ON */
                                shutdown-gpios = <&gpio6 30 GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm/boot/dts/ste-ux500-samsung-skomer.dts b/arch/arm/boot/dts/ste-ux500-samsung-skomer.dts
index d28a00757d0b9e9eb6973e37bd1322bfc96a5e51..94afd7a0fe1f00bd2f288380b67364cc9d22f2e8 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>;