0065-RP2040-restore-GPIO15-functionality-after-USB_DEVICE.patch

From 8ce573af9f8ffe49b88b0e4fe8550a9cd9033b27 Mon Sep 17 00:00:00 2001
From: Martino Facchin <m.facchin@arduino.cc>
Date: Mon, 15 Mar 2021 14:53:54 +0100
Subject: [PATCH 65/87] RP2040: restore GPIO15 functionality after
 USB_DEVICE_ENUMERATION_FIX

---
 targets/TARGET_RASPBERRYPI/TARGET_RP2040/USBPhy_RP2040.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/targets/TARGET_RASPBERRYPI/TARGET_RP2040/USBPhy_RP2040.cpp b/targets/TARGET_RASPBERRYPI/TARGET_RP2040/USBPhy_RP2040.cpp
index ff24a6dcd6..fbece56a1d 100644
--- a/targets/TARGET_RASPBERRYPI/TARGET_RP2040/USBPhy_RP2040.cpp
+++ b/targets/TARGET_RASPBERRYPI/TARGET_RP2040/USBPhy_RP2040.cpp
@@ -32,6 +32,7 @@ extern "C" {
 
 #ifdef PICO_RP2040_USB_DEVICE_ENUMERATION_FIX
 #include "rp2040_usb_device_enumeration.h"
+#include "hardware/structs/iobank0.h"
 #endif
 
 #ifdef __cplusplus
@@ -396,7 +397,13 @@ void USBPhyHw::process()
 
         // This is required, but having trouble working out how to link in
 #ifdef PICO_RP2040_USB_DEVICE_ENUMERATION_FIX
+        const uint dp = 15;
+        auto function = gpio_get_function(dp);
+        auto override = iobank0_hw->io[dp].ctrl;
         rp2040_usb_device_enumeration_fix();
+        gpio_set_function(dp, function);
+        gpio_set_inover(dp, GPIO_OVERRIDE_HIGH);
+        hw_set_bits(&iobank0_hw->io[dp].ctrl, override);
 #endif
 
         // reset bus for USBDevice layer
-- 
2.30.2