diff --git a/ports/raspberrypi/common-hal/microcontroller/Pin.c b/ports/raspberrypi/common-hal/microcontroller/Pin.c index 257e1ee08ff..60245ff6b5f 100644 --- a/ports/raspberrypi/common-hal/microcontroller/Pin.c +++ b/ports/raspberrypi/common-hal/microcontroller/Pin.c @@ -17,7 +17,7 @@ static uint64_t gpio_bank0_pin_claimed; #include "bindings/cyw43/__init__.h" #include "pico/cyw43_arch.h" -bool cyw_ever_init; +bool cyw_driver_ready; static uint32_t cyw_pin_claimed; void reset_pin_number_cyw(uint8_t pin_no) { @@ -25,7 +25,7 @@ void reset_pin_number_cyw(uint8_t pin_no) { // Drive the LED (GPIO 0) and SMPS_MODE (GPIO 1) low. Don't touch // VBUS_SENSE (GPIO 2): writing it would switch it to an output for good. - if (cyw_ever_init && pin_no <= 1) { + if (cyw_driver_ready && pin_no <= 1) { cyw43_arch_gpio_put(pin_no, false); } } diff --git a/ports/raspberrypi/common-hal/microcontroller/Pin.h b/ports/raspberrypi/common-hal/microcontroller/Pin.h index fe2191e8f25..fd6f77c6ced 100644 --- a/ports/raspberrypi/common-hal/microcontroller/Pin.h +++ b/ports/raspberrypi/common-hal/microcontroller/Pin.h @@ -29,6 +29,8 @@ bool pin_number_is_free(uint8_t pin_number); uint8_t common_hal_mcu_pin_number(const mcu_pin_obj_t *pin); #if CIRCUITPY_CYW43 -extern bool cyw_ever_init; +// True once cyw43_arch_init() succeeded in port_init(). The driver is ready, +// but the chip may still be powered down until something accesses it. +extern bool cyw_driver_ready; void reset_pin_number_cyw(uint8_t pin_number); #endif diff --git a/ports/raspberrypi/supervisor/port.c b/ports/raspberrypi/supervisor/port.c index 5cceeafc736..7e6a58f9ac2 100644 --- a/ports/raspberrypi/supervisor/port.c +++ b/ports/raspberrypi/supervisor/port.c @@ -475,7 +475,7 @@ safe_mode_t port_init(void) { if (cyw43_arch_init_with_country(PICO_CYW43_ARCH_DEFAULT_COUNTRY_CODE)) { serial_write("WiFi init failed\n"); } else { - cyw_ever_init = true; + cyw_driver_ready = true; } #endif if (board_requests_safe_mode()) { @@ -698,6 +698,10 @@ void port_task_yield(void) { void port_boot_info(void) { #if CIRCUITPY_CYW43 + // Access CYW43 GPIO to power it up before reading the MAC + if (cyw_driver_ready) { + cyw43_arch_gpio_get(pin_CYW2.number); + } mp_printf(&mp_plat_print, "MAC"); for (int i = 0; i < 6; i++) { mp_printf(&mp_plat_print, ":%02X", cyw43_state.mac[i]);