Add support for the RP2350 B-variant

arturo182 · tannewt · commit 8c0ca5936683 · 2024-08-08T09:55:12.000-07:00
diff --git a/ports/raspberrypi/Makefile b/ports/raspberrypi/Makefile
@@ -221,6 +221,9 @@ CFLAGS += \
 	-msoft-float \
 	-mfloat-abi=soft
 
+CFLAGS += \
+	-DPICO_RP2040
+
 SRC_SDK_CHIP_VARIANT := \
 	src/rp2_common/hardware_rtc/rtc.c \
 	src/rp2_common/pico_double/double_init_rom_rp2040.c \
diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2350/mpconfigboard.h b/ports/raspberrypi/boards/adafruit_feather_rp2350/mpconfigboard.h
@@ -1,5 +1,5 @@
 #define MICROPY_HW_BOARD_NAME "Adafruit Feather RP2350"
-#define MICROPY_HW_MCU_NAME "rp2350"
+#define MICROPY_HW_MCU_NAME "rp2350a"
 
 #define MICROPY_HW_NEOPIXEL (&pin_GPIO21)
 
diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2350/mpconfigboard.mk b/ports/raspberrypi/boards/adafruit_feather_rp2350/mpconfigboard.mk
@@ -4,6 +4,7 @@ USB_PRODUCT = "Feather RP2350"
 USB_MANUFACTURER = "Adafruit"
 
 CHIP_VARIANT = RP2350
+CHIP_PACKAGE = A
 CHIP_FAMILY = rp2
 
 EXTERNAL_FLASH_DEVICES = "GD25Q64C,W25Q64JVxQ"
diff --git a/ports/raspberrypi/boards/adafruit_metro_rp2350/mpconfigboard.h b/ports/raspberrypi/boards/adafruit_metro_rp2350/mpconfigboard.h
@@ -1,5 +1,5 @@
 #define MICROPY_HW_BOARD_NAME "Adafruit Metro RP2350"
-#define MICROPY_HW_MCU_NAME "rp2350"
+#define MICROPY_HW_MCU_NAME "rp2350a"
 
 #define MICROPY_HW_NEOPIXEL (&pin_GPIO14)
 
diff --git a/ports/raspberrypi/boards/adafruit_metro_rp2350/mpconfigboard.mk b/ports/raspberrypi/boards/adafruit_metro_rp2350/mpconfigboard.mk
@@ -4,6 +4,7 @@ USB_PRODUCT = "Metro RP2350"
 USB_MANUFACTURER = "Adafruit"
 
 CHIP_VARIANT = RP2350
+CHIP_PACKAGE = A
 CHIP_FAMILY = rp2
 
 EXTERNAL_FLASH_DEVICES = "W25Q128JVxQ"
diff --git a/ports/raspberrypi/boards/raspberry_pi_pico2/mpconfigboard.h b/ports/raspberrypi/boards/raspberry_pi_pico2/mpconfigboard.h
@@ -1,5 +1,5 @@
 #define MICROPY_HW_BOARD_NAME "Raspberry Pi Pico 2"
-#define MICROPY_HW_MCU_NAME "rp2350"
+#define MICROPY_HW_MCU_NAME "rp2350a"
 
 #define MICROPY_HW_LED_STATUS (&pin_GPIO25)
 
diff --git a/ports/raspberrypi/boards/raspberry_pi_pico2/mpconfigboard.mk b/ports/raspberrypi/boards/raspberry_pi_pico2/mpconfigboard.mk
@@ -4,6 +4,7 @@ USB_PRODUCT = "Pico 2"
 USB_MANUFACTURER = "Raspberry Pi"
 
 CHIP_VARIANT = RP2350
+CHIP_PACKAGE = A
 CHIP_FAMILY = rp2
 
 EXTERNAL_FLASH_DEVICES = "W25Q32JVxQ"
diff --git a/ports/raspberrypi/common-hal/analogio/AnalogIn.c b/ports/raspberrypi/common-hal/analogio/AnalogIn.c
@@ -12,8 +12,13 @@
 
 #include "src/rp2_common/hardware_adc/include/hardware/adc.h"
 
+#define ADC_PIN_COUNT (NUM_ADC_CHANNELS - 1)
+
+#if ADC_PIN_COUNT == 4
 #define ADC_FIRST_PIN_NUMBER 26
-#define ADC_PIN_COUNT 4
+#else
+#define ADC_FIRST_PIN_NUMBER 40
+#endif
 
 // Voltage monitor is special on Pico W, because this pin is shared between the
 // voltage monitor function and the wifi function. Special handling is required
diff --git a/ports/raspberrypi/common-hal/microcontroller/Pin.c b/ports/raspberrypi/common-hal/microcontroller/Pin.c
@@ -11,7 +11,7 @@
 
 #include "src/rp2_common/hardware_gpio/include/hardware/gpio.h"
 
-static uint32_t gpio_bank0_pin_claimed;
+static uint64_t gpio_bank0_pin_claimed;
 
 #if CIRCUITPY_CYW43
 #include "bindings/cyw43/__init__.h"
@@ -25,7 +25,7 @@ void reset_pin_number_cyw(uint8_t pin_no) {
 }
 #endif
 
-static uint32_t never_reset_pins;
+static uint64_t never_reset_pins;
 
 void reset_all_pins(void) {
     for (size_t i = 0; i < NUM_BANK0_GPIOS; i++) {
diff --git a/ports/raspberrypi/common-hal/microcontroller/__init__.c b/ports/raspberrypi/common-hal/microcontroller/__init__.c
@@ -165,6 +165,26 @@ const mp_rom_map_elem_t mcu_pin_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_GPIO27), MP_ROM_PTR(&pin_GPIO27) },
     { MP_ROM_QSTR(MP_QSTR_GPIO28), MP_ROM_PTR(&pin_GPIO28) },
     { MP_ROM_QSTR(MP_QSTR_GPIO29), MP_ROM_PTR(&pin_GPIO29) },
+    #if NUM_BANK0_GPIOS == 48
+    { MP_ROM_QSTR(MP_QSTR_GPIO30), MP_ROM_PTR(&pin_GPIO30) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO31), MP_ROM_PTR(&pin_GPIO31) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO32), MP_ROM_PTR(&pin_GPIO32) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO33), MP_ROM_PTR(&pin_GPIO33) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO34), MP_ROM_PTR(&pin_GPIO34) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO35), MP_ROM_PTR(&pin_GPIO35) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO36), MP_ROM_PTR(&pin_GPIO36) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO37), MP_ROM_PTR(&pin_GPIO37) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO38), MP_ROM_PTR(&pin_GPIO38) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO39), MP_ROM_PTR(&pin_GPIO39) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO40), MP_ROM_PTR(&pin_GPIO40) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO41), MP_ROM_PTR(&pin_GPIO41) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO42), MP_ROM_PTR(&pin_GPIO42) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO43), MP_ROM_PTR(&pin_GPIO43) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO44), MP_ROM_PTR(&pin_GPIO44) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO45), MP_ROM_PTR(&pin_GPIO45) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO46), MP_ROM_PTR(&pin_GPIO46) },
+    { MP_ROM_QSTR(MP_QSTR_GPIO47), MP_ROM_PTR(&pin_GPIO47) },
+    #endif
     #if CIRCUITPY_CYW43
     { MP_ROM_QSTR(MP_QSTR_CYW0), MP_ROM_PTR(&pin_CYW0) },
     { MP_ROM_QSTR(MP_QSTR_CYW1), MP_ROM_PTR(&pin_CYW1) },
diff --git a/ports/raspberrypi/peripherals/pins.c b/ports/raspberrypi/peripherals/pins.c
@@ -61,6 +61,27 @@ PIN(26);
 PIN(27);
 PIN(28);
 PIN(29);
+#if NUM_BANK0_GPIOS == 48
+PIN(30);
+PIN(31);
+PIN(32);
+PIN(33);
+PIN(34);
+PIN(35);
+PIN(36);
+PIN(37);
+PIN(38);
+PIN(39);
+PIN(40);
+PIN(41);
+PIN(42);
+PIN(43);
+PIN(44);
+PIN(45);
+PIN(46);
+PIN(47);
+#endif
+
 #if CIRCUITPY_CYW43
 CYW_PIN(0);
 CYW_PIN(1);
diff --git a/ports/raspberrypi/peripherals/pins.h b/ports/raspberrypi/peripherals/pins.h
@@ -48,6 +48,26 @@ extern const mcu_pin_obj_t pin_GPIO26;
 extern const mcu_pin_obj_t pin_GPIO27;
 extern const mcu_pin_obj_t pin_GPIO28;
 extern const mcu_pin_obj_t pin_GPIO29;
+#if NUM_BANK0_GPIOS == 48
+extern const mcu_pin_obj_t pin_GPIO30;
+extern const mcu_pin_obj_t pin_GPIO31;
+extern const mcu_pin_obj_t pin_GPIO32;
+extern const mcu_pin_obj_t pin_GPIO33;
+extern const mcu_pin_obj_t pin_GPIO34;
+extern const mcu_pin_obj_t pin_GPIO35;
+extern const mcu_pin_obj_t pin_GPIO36;
+extern const mcu_pin_obj_t pin_GPIO37;
+extern const mcu_pin_obj_t pin_GPIO38;
+extern const mcu_pin_obj_t pin_GPIO39;
+extern const mcu_pin_obj_t pin_GPIO40;
+extern const mcu_pin_obj_t pin_GPIO41;
+extern const mcu_pin_obj_t pin_GPIO42;
+extern const mcu_pin_obj_t pin_GPIO43;
+extern const mcu_pin_obj_t pin_GPIO44;
+extern const mcu_pin_obj_t pin_GPIO45;
+extern const mcu_pin_obj_t pin_GPIO46;
+extern const mcu_pin_obj_t pin_GPIO47;
+#endif
 
 #if CIRCUITPY_CYW43
 extern const mcu_pin_obj_t pin_CYW0;
