* [PATCH] ARM: dts: ux500: Fix BT+WLAN on Samsung phones
@ 2021-03-14 1:53 Linus Walleij
0 siblings, 0 replies; only message in thread
From: Linus Walleij @ 2021-03-14 1:53 UTC (permalink / raw)
To: linux-arm-kernel; +Cc: Linus Walleij, Stephan Gerhold
Some of the Samsung phones had set GPIO 215 as voltage
regulator GPIO, while in fact this is always on GPIO 222.
Using GPIO 215 meant that the Bluetooth would not come
on properly since both WLAN and Bluetooth use GPIO 222
to power up. The Bluetooth part refers to this GPIO
line as "shutdown-gpios" which is kind of true, but
fails to mention that it will also shut down the WLAN
when it is disabled, which was causing bugs.
So we change the regulator for WLAN and Bluetooth to
GPIO 222 and edit some names and comments to make it
clear that this is the common regulator for both
functions. Both WLAN and Bluetooth now use this
regulator for powering up, and the regulator
framework will reference count it and make sure
that one part does not power down the other.
However GPIO 215 still needs to be driven high
(active low) since otherwise the WLAN part of the
chip is being held in RESET, and that will make the
SDIO WLAN not enumerate.
To solve this, make the pin config entry for the power
regulator also drive GPIO 215 high, but leave it to
the driver to later on acquire and control this GPIO
line. This is a bit of a hack and marked as such, but
it works just fine: both SDIO WLAN and Bluetooth come
up just fine on all the phones, with the right firmware
provided.
Cc: Stephan Gerhold <stephan@gerhold.net>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
.../arm/boot/dts/ste-ux500-samsung-golden.dts | 99 ++++++++++++-------
.../arm/boot/dts/ste-ux500-samsung-janice.dts | 33 ++++---
.../arm/boot/dts/ste-ux500-samsung-skomer.dts | 73 +++++++++++---
3 files changed, 141 insertions(+), 64 deletions(-)
diff --git a/arch/arm/boot/dts/ste-ux500-samsung-golden.dts b/arch/arm/boot/dts/ste-ux500-samsung-golden.dts
index 0d43ee6583cf..c4c14aedf068 100644
--- a/arch/arm/boot/dts/ste-ux500-samsung-golden.dts
+++ b/arch/arm/boot/dts/ste-ux500-samsung-golden.dts
@@ -71,6 +71,28 @@ magnetometer@c {
};
};
+ /*
+ * This regulator is a GPIO line that drives the Broadcom WLAN
+ * and Bluetooth line BT_VREG_EN high and enables the internal
+ * regulators inside the chip.
+ *
+ * The voltage specified here is only used to determine the OCR mask,
+ * the for the SDIO connector, the chip is actually connected
+ * directly to VBAT.
+ */
+ wl_bt_reg: regulator-gpio-wlan-bt {
+ compatible = "regulator-fixed";
+ regulator-name = "BT_VREG_EN";
+ regulator-min-microvolt = <3000000>;
+ regulator-max-microvolt = <3000000>;
+ startup-delay-us = <100000>;
+ /* GPIO222 (BT_VREG_EN) */
+ gpio = <&gpio6 30 GPIO_ACTIVE_HIGH>;
+ enable-active-high;
+ pinctrl-names = "default";
+ pinctrl-0 = <&wlan_bt_ldo_en_default>;
+ };
+
soc {
/* External Micro SD card slot */
mmc@80126000 {
@@ -111,8 +133,6 @@ mmc@80118000 {
non-removable;
cap-sd-highspeed;
- vmmc-supply = <&wl_reg_on>;
-
pinctrl-names = "default", "sleep";
pinctrl-0 = <&mc1_a_2_default>;
pinctrl-1 = <&mc1_a_2_sleep>;
@@ -120,10 +140,22 @@ mmc@80118000 {
#address-cells = <1>;
#size-cells = <0>;
+ /*
+ * GPIO-controlled voltage enablement: this drives
+ * the BT_VREG_EN line high when we use this device.
+ * Represented as regulator to fill OCR mask and to
+ * be usable in parallel with the Bluetooth chip.
+ */
+ vmmc-supply = <&wl_bt_reg>;
+
wifi@1 {
+ /* BRCM4334 actually */
compatible = "brcm,bcm4329-fmac";
reg = <1>;
+ /* GPIO215 WLAN_RST_N */
+ reset-gpios = <&gpio6 23 GPIO_ACTIVE_LOW>;
+
/* GPIO216 (WLAN_HOST_WAKE) */
interrupt-parent = <&gpio6>;
interrupts = <24 IRQ_TYPE_EDGE_FALLING>;
@@ -162,9 +194,17 @@ uart@80120000 {
pinctrl-1 = <&u0_a_1_sleep>;
bluetooth {
+ /* BRCM4334B0 actually */
compatible = "brcm,bcm4330-bt";
- /* GPIO222 (BT_VREG_ON) */
- shutdown-gpios = <&gpio6 30 GPIO_ACTIVE_HIGH>;
+ /*
+ * We actually have shutdown-gpios, BT_VREG_ON on GPIO222,
+ * but since this GPIO is shared with the WLAN chip, we need
+ * to reference the regulator instead. The regulator
+ * framework will reference count the GPIO usage and
+ * make sure we can use the same GPIO for several supplies.
+ */
+ // shutdown-gpios = <&gpio6 30 GPIO_ACTIVE_HIGH>;
+ vbat-supply = <&wl_bt_reg>;
/* GPIO199 (BT_WAKE) */
device-wakeup-gpios = <&gpio6 7 GPIO_ACTIVE_HIGH>;
/* GPIO97 (BT_HOST_WAKE) */
@@ -447,28 +487,6 @@ sd_level_translator: regulator-sd-level-translator {
pinctrl-0 = <&sd_level_translator_default>;
};
- /*
- * WL_REG_ON takes WLAN out of reset and enables the internal regulators.
- * The voltage specified here is only used to determine the OCR mask,
- * the BCM chip is actually connected directly to VBAT.
- */
- wl_reg_on: regulator-wl-reg-on {
- compatible = "regulator-fixed";
-
- regulator-name = "wl-reg-on";
- regulator-min-microvolt = <3000000>;
- regulator-max-microvolt = <3000000>;
-
- startup-delay-us = <100000>;
-
- /* GPIO215 (WLAN_EN) */
- gpio = <&gpio6 23 GPIO_ACTIVE_HIGH>;
- enable-active-high;
-
- pinctrl-names = "default";
- pinctrl-0 = <&wlan_en_default>;
- };
-
/* MIC5366 GPIO-controlled regulator */
panel_reg_1v8: regulator-panel-1v8 {
compatible = "regulator-fixed";
@@ -641,25 +659,38 @@ golden_cfg1 {
ste,config = <&gpio_in_pd>;
};
};
+ };
- wlan_en_default: wlan_en_default {
+ bluetooth {
+ bluetooth_default: bluetooth_default {
golden_cfg1 {
- pins = "GPIO215_AH13"; /* WLAN_EN */
+ pins = "GPIO199_AH23"; /* BT_WAKE */
ste,config = <&gpio_out_lo>;
};
+ golden_cfg2 {
+ pins = "GPIO97_D9"; /* BT_HOST_WAKE */
+ ste,config = <&gpio_in_nopull>;
+ };
};
};
- bluetooth {
- bluetooth_default: bluetooth_default {
+ /* GPIO that enables the WLAN and Bluetooth internal LDO regulators */
+ wlan-bt-ldo {
+ wlan_bt_ldo_en_default: wlan_bt_ldo_default {
+ /* GPIO222 BT_VREG_ON */
golden_cfg1 {
- pins = "GPIO199_AH23", /* BT_WAKE */
- "GPIO222_AJ9"; /* BT_VREG_ON */
+ pins = "GPIO222_AJ9";
ste,config = <&gpio_out_lo>;
};
+ /*
+ * HACK: this is the WL_RESET line that technically has nothing
+ * to do with the regulator, but in order for the SDIO card
+ * to enumerate, this must be driven high, so we need to do
+ * that here.
+ */
golden_cfg2 {
- pins = "GPIO97_D9"; /* BT_HOST_WAKE */
- ste,config = <&gpio_in_nopull>;
+ pins = "GPIO215_AH13"; /* WLAN_EN */
+ ste,config = <&gpio_out_hi>;
};
};
};
diff --git a/arch/arm/boot/dts/ste-ux500-samsung-janice.dts b/arch/arm/boot/dts/ste-ux500-samsung-janice.dts
index 7411bfeda285..ac1176788e8d 100644
--- a/arch/arm/boot/dts/ste-ux500-samsung-janice.dts
+++ b/arch/arm/boot/dts/ste-ux500-samsung-janice.dts
@@ -135,14 +135,14 @@ lcd_1v8_reg: regulator-gpio-lcd-1v8 {
/*
* This regulator is a GPIO line that drives the Broadcom WLAN
- * line BT_VREG_EN high and enables the internal regulators
- * inside the chip.
+ * and Bluetooth line BT_VREG_EN high and enables the internal
+ * regulators inside the chip.
*
* The voltage specified here is only used to determine the OCR mask,
* the for the SDIO connector, the chip is actually connected
* directly to VBAT.
*/
- wl_bt_reg: regulator-gpio-wlan {
+ wl_bt_reg: regulator-gpio-wlan-bt {
compatible = "regulator-fixed";
regulator-name = "BT_VREG_EN";
regulator-min-microvolt = <3000000>;
@@ -152,7 +152,7 @@ wl_bt_reg: regulator-gpio-wlan {
gpio = <&gpio6 30 GPIO_ACTIVE_HIGH>;
enable-active-high;
pinctrl-names = "default";
- pinctrl-0 = <&wlan_ldo_en_default>;
+ pinctrl-0 = <&wlan_bt_ldo_en_default>;
};
@@ -401,7 +401,7 @@ mmc@80118000 {
status = "okay";
wifi@1 {
- /* Actually BRCM4330 */
+ /* BRCM4330 actually */
compatible = "brcm,bcm4329-fmac";
reg = <1>;
/* GPIO216 WL_HOST_WAKE */
@@ -409,7 +409,6 @@ wifi@1 {
interrupts = <24 IRQ_TYPE_EDGE_FALLING>;
interrupt-names = "host-wake";
/* GPIO215 WLAN_RST_N */
- /* FIXME: kernel does not use this assert/deassert */
reset-gpios = <&gpio6 23 GPIO_ACTIVE_LOW>;
pinctrl-names = "default";
pinctrl-0 = <&wlan_default_mode>;
@@ -439,6 +438,7 @@ uart@80120000 {
status = "okay";
bluetooth {
+ /* BRCM4330B1 actually */
compatible = "brcm,bcm4330-bt";
/*
* We actually have shutdown-gpios, BT_VREG_EN on GPIO222,
@@ -756,14 +756,24 @@ janice_cfg1 {
};
};
};
- /* GPIO that enables the WLAN internal LDO regulators */
- wlan-ldo {
- wlan_ldo_en_default: wlan_ldo_default {
+ /* GPIO that enables the WLAN and Bluetooth internal LDO regulators */
+ wlan-bt-ldo {
+ wlan_bt_ldo_en_default: wlan_bt_ldo_default {
/* GPIO222 BT_VREG_ON */
janice_cfg1 {
pins = "GPIO222_AJ9";
ste,config = <&gpio_out_lo>;
};
+ /*
+ * HACK: this is the WL_RESET line that technically has nothing
+ * to do with the regulator, but in order for the SDIO card
+ * to enumerate, this must be driven high, so we need to do
+ * that here.
+ */
+ janice_cfg2 {
+ pins = "GPIO215_AH13"; /* RESET_N */
+ ste,config = <&gpio_out_hi>;
+ };
};
};
/* Flash and torch */
@@ -875,11 +885,6 @@ janice_cfg2 {
};
wlan {
wlan_default_mode: wlan_default {
- /* GPIO215 used for RESET_N */
- janice_cfg1 {
- pins = "GPIO215_AH13";
- ste,config = <&gpio_out_lo>;
- };
/* GPIO216 for WL_HOST_WAKE */
janice_cfg2 {
pins = "GPIO216_AG12";
diff --git a/arch/arm/boot/dts/ste-ux500-samsung-skomer.dts b/arch/arm/boot/dts/ste-ux500-samsung-skomer.dts
index d28a00757d0b..319b1947573c 100644
--- a/arch/arm/boot/dts/ste-ux500-samsung-skomer.dts
+++ b/arch/arm/boot/dts/ste-ux500-samsung-skomer.dts
@@ -52,17 +52,26 @@ ldo_3v3_reg: regulator-gpio-ldo-3v3 {
pinctrl-0 = <&emmc_ldo_en_default_mode>;
};
- wlan_en: regulator-gpio-wlan-en {
+ /*
+ * This regulator is a GPIO line that drives the Broadcom WLAN
+ * and Bluetooth line BT_VREG_EN high and enables the internal
+ * regulators inside the chip.
+ *
+ * The voltage specified here is only used to determine the OCR mask,
+ * the for the SDIO connector, the chip is actually connected
+ * directly to VBAT.
+ */
+ wl_bt_reg: regulator-gpio-wlan-bt {
compatible = "regulator-fixed";
- regulator-name = "wl-reg-on";
+ regulator-name = "BT_VREG_EN";
regulator-min-microvolt = <3000000>;
regulator-max-microvolt = <3000000>;
- startup-delay-us = <200000>;
- /* GPIO215 WLAN_EN */
- gpio = <&gpio6 23 GPIO_ACTIVE_HIGH>;
+ startup-delay-us = <100000>;
+ /* GPIO222 (BT_VREG_EN) */
+ gpio = <&gpio6 30 GPIO_ACTIVE_HIGH>;
enable-active-high;
pinctrl-names = "default";
- pinctrl-0 = <&wlan_en_default_mode>;
+ pinctrl-0 = <&wlan_bt_ldo_en_default>;
};
vibrator {
@@ -202,7 +211,6 @@ mmc@80118000 {
bus-width = <4>;
non-removable;
cap-sd-highspeed;
- vmmc-supply = <&wlan_en>;
pinctrl-names = "default", "sleep";
pinctrl-0 = <&mc1_a_2_default>;
pinctrl-1 = <&mc1_a_2_sleep>;
@@ -210,9 +218,20 @@ mmc@80118000 {
#address-cells = <1>;
#size-cells = <0>;
+ /*
+ * GPIO-controlled voltage enablement: this drives
+ * the BT_VREG_EN line high when we use this device.
+ * Represented as regulator to fill OCR mask and to
+ * be usable in parallel with the Bluetooth chip.
+ */
+ vmmc-supply = <&wl_bt_reg>;
+
wifi@1 {
+ /* BRCM4334 actually */
compatible = "brcm,bcm4329-fmac";
reg = <1>;
+ /* GPIO215 WLAN_RST_N */
+ reset-gpios = <&gpio6 23 GPIO_ACTIVE_LOW>;
/* GPIO216 WL_HOST_WAKE */
interrupt-parent = <&gpio6>;
interrupts = <24 IRQ_TYPE_EDGE_FALLING>;
@@ -245,10 +264,18 @@ uart@80120000 {
pinctrl-1 = <&u0_a_1_sleep>;
status = "okay";
- /* FIXME: not quite working yet, probably needs regulators */
bluetooth {
+ /* BRCM4334B0 actually */
compatible = "brcm,bcm4330-bt";
- shutdown-gpios = <&gpio6 30 GPIO_ACTIVE_HIGH>;
+ /*
+ * We actually have shutdown-gpios, BT_VREG_ON on GPIO222,
+ * but since this GPIO is shared with the WLAN chip, we need
+ * to reference the regulator instead. The regulator
+ * framework will reference count the GPIO usage and
+ * make sure we can use the same GPIO for several supplies.
+ */
+ // shutdown-gpios = <&gpio6 30 GPIO_ACTIVE_HIGH>;
+ vbat-supply = <&wl_bt_reg>;
device-wakeup-gpios = <&gpio6 7 GPIO_ACTIVE_HIGH>;
host-wakeup-gpios = <&gpio3 1 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
@@ -598,17 +625,11 @@ skomer_cfg1 {
ste,config = <&gpio_in_pd>;
};
};
- wlan_en_default_mode: wlan_en_default {
- skomer_cfg2 {
- pins = "GPIO215_AH13";
- ste,config = <&gpio_out_lo>;
- };
- };
};
bluetooth {
bluetooth_default_mode: bluetooth_default {
skomer_cfg1 {
- pins = "GPIO199_AH23", "GPIO222_AJ9";
+ pins = "GPIO199_AH23";
ste,config = <&gpio_out_lo>;
};
skomer_cfg2 {
@@ -617,6 +638,26 @@ skomer_cfg2 {
};
};
};
+ /* GPIO that enables the WLAN and Bluetooth internal LDO regulators */
+ wlan-bt-ldo {
+ wlan_bt_ldo_en_default: wlan_bt_ldo_default {
+ /* GPIO222 BT_VREG_ON */
+ skomer_cfg1 {
+ pins = "GPIO222_AJ9";
+ ste,config = <&gpio_out_lo>;
+ };
+ /*
+ * HACK: this is the WL_RESET line that technically has nothing
+ * to do with the regulator, but in order for the SDIO card
+ * to enumerate, this must be driven high, so we need to do
+ * that here.
+ */
+ skomer_cfg2 {
+ pins = "GPIO215_AH13"; /* RESET_N */
+ ste,config = <&gpio_out_hi>;
+ };
+ };
+ };
vibrator {
vibrator_default: vibrator_default {
skomer_cfg1 {
--
2.29.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2021-03-14 1:55 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-14 1:53 [PATCH] ARM: dts: ux500: Fix BT+WLAN on Samsung phones Linus Walleij
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).