Skip to content

Commit

Permalink
[nrf fromlist] drivers: wifi: nrfwifi: determine shared iovdd and buc…
Browse files Browse the repository at this point in the history
…ken 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
  • Loading branch information
bjarki-andreasen committed Sep 16, 2024
1 parent 35b7b41 commit c82e871
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 8 deletions.
7 changes: 0 additions & 7 deletions drivers/wifi/nrfwifi/Kconfig.nrfwifi
Original file line number Diff line number Diff line change
Expand Up @@ -664,13 +664,6 @@ config NET_MGMT_EVENT_QUEUE_SIZE
default 16
endif # NRF_WIFI_RPU_RECOVERY

config NRF_WIFI_COMBINED_BUCKEN_IOVDD_GPIO
bool
help
Enable this option to use a single GPIO to control both buck enable and IOVDD enable,
there will be a internal hardware switch to add delay between the two operations. This
is typically 4ms delay for nRF70.

config NRF_WIFI_FEAT_WMM
bool "WMM/QoS support"
default y
Expand Down
3 changes: 2 additions & 1 deletion drivers/wifi/nrfwifi/src/qspi/src/rpu_hw_if.c
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,8 @@ static int rpu_pwron(void)
/* Settling time for iovdd nRF7002 DK/EK - switch (TCK106AG): ~600us */
k_msleep(1);

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

0 comments on commit c82e871

Please sign in to comment.