Commit 59ba546d authored Mar 18, 2021 by Linus Walleij

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>

parent 7153218a

arch/arm/boot/dts/ste-ux500-samsung-golden.dts

+2 −1

Original line number	Diff line number	Diff line
		@@ -121,7 +121,7 @@ mmc@80118000 {
		#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 @@ uart@80120000 {
		pinctrl-1 = <&u0_a_1_sleep>;

		bluetooth {
		/* BCM4334B0 actually */
		compatible = "brcm,bcm4330-bt";
		/* GPIO222 (BT_VREG_ON) */
		shutdown-gpios = <&gpio6 30 GPIO_ACTIVE_HIGH>;

arch/arm/boot/dts/ste-ux500-samsung-janice.dts

+2 −2

Original line number	Diff line number	Diff line
		@@ -401,8 +401,7 @@ mmc@80118000 {
		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 @@ uart@80120000 {
		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>;

arch/arm/boot/dts/ste-ux500-samsung-skomer.dts

+2 −1

Original line number	Diff line number	Diff line
		@@ -211,7 +211,7 @@ mmc@80118000 {
		#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 @@ uart@80120000 {

		/* 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>;