Skip to content

Commit 10795e0

Browse files
[nrf fromlist] drivers: wifi: nrfwifi: determine shared iovdd and bucken from dt
Currently a user, or a shield definition, must select a Kconfig to signal that the iovdd_ctrl and bucken GPIOs are connected to the same pin. We can instead check this in the driver by simply checking if the iovdd_ctrl_spec and bucken_spec are the same pin. Update the nrfwifi driver and remove the redundant NRF_WIFI_COMBINED_BUCKEN_IOVDD_GPIO config. Signed-off-by: Bjarki Arge Andreasen <[email protected]> Upstream PR: zephyrproject-rtos/zephyr#78485
1 parent 3ef18c0 commit 10795e0

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

drivers/wifi/nrfwifi/Kconfig.nrfwifi

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -664,13 +664,6 @@ config NET_MGMT_EVENT_QUEUE_SIZE
664664
default 16
665665
endif # NRF_WIFI_RPU_RECOVERY
666666

667-
config NRF_WIFI_COMBINED_BUCKEN_IOVDD_GPIO
668-
bool
669-
help
670-
Enable this option to use a single GPIO to control both buck enable and IOVDD enable,
671-
there will be a internal hardware switch to add delay between the two operations. This
672-
is typically 4ms delay for nRF70.
673-
674667
config NRF_WIFI_FEAT_WMM
675668
bool "WMM/QoS support"
676669
default y

drivers/wifi/nrfwifi/src/qspi/src/rpu_hw_if.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,8 @@ static int rpu_pwron(void)
242242
/* Settling time for iovdd nRF7002 DK/EK - switch (TCK106AG): ~600us */
243243
k_msleep(1);
244244

245-
if (IS_ENABLED(CONFIG_NRF_WIFI_COMBINED_BUCKEN_IOVDD_GPIO)) {
245+
if ((bucken_spec.port == iovdd_ctrl_spec.port) &&
246+
(bucken_spec.pin == iovdd_ctrl_spec.pin)) {
246247
/* When a single GPIO is used, we need a total wait time after bucken assertion
247248
* to be 6ms (1ms + 1ms + 4ms).
248249
*/

0 commit comments

Comments
 (0)