Merge remote-tracking branch 'adafruit/main'

diff --cc src/board.py
Simple merge

diff --cc src/digitalio.py
Simple merge

diff --cc src/microcontroller/__init__.py
index d04d2ee15c28d4de535b2da61acd7537cd6a1113,baf06cd7d5b0f2d7115478c41794cc48f45f67fb..2bc4736589b82025b93f558009b0c01aa66e9323
--- 1/src/microcontroller/__init__.py
--- 2/src/microcontroller/__init__.py
+++ b/src/microcontroller/__init__.py
@@@ -46,12 -46,8 +46,12 @@@ elif chip_id == ap_chip.AM33XX
      from adafruit_blinka.microcontroller.am335x import *
  elif chip_id == ap_chip.AM65XX:
      from adafruit_blinka.microcontroller.am65xx import *
- elif chip_id == ap_chip.JH71x0:
+ elif chip_id == ap_chip.JH71X0:
      from adafruit_blinka.microcontroller.starfive.JH71x0 import *
 +elif chip_id == ap_chip.SUN4I:
 +    from adafruit_blinka.microcontroller.allwinner.a20 import *
 +elif chip_id == ap_chip.SUN7I:
 +    from adafruit_blinka.microcontroller.allwinner.a20 import *
  elif chip_id == ap_chip.SUN8I:
      from adafruit_blinka.microcontroller.allwinner.h3 import *
  elif chip_id == ap_chip.H5:

diff --cc src/microcontroller/pin.py
index fdd77ddef20d159f3baa6862a2c00affbf6d0282,fdbced462ec7e40a551ee27189a709355392f4c1..362fe436a62cd100eb3977ce61d7a856b098f639
--- 1/src/microcontroller/pin.py
--- 2/src/microcontroller/pin.py
+++ b/src/microcontroller/pin.py
@@@ -31,12 -31,8 +31,12 @@@ elif chip_id == ap_chip.AM33XX
      from adafruit_blinka.microcontroller.am335x.pin import *
  elif chip_id == ap_chip.AM65XX:
      from adafruit_blinka.microcontroller.am65xx.pin import *
- elif chip_id == ap_chip.JH71x0:
+ elif chip_id == ap_chip.JH71X0:
      from adafruit_blinka.microcontroller.starfive.JH71x0.pin import *
 +elif chip_id == ap_chip.SUN4I:
 +    from adafruit_blinka.microcontroller.allwinner.a20.pin import *
 +elif chip_id == ap_chip.SUN7I:
 +    from adafruit_blinka.microcontroller.allwinner.a20.pin import *
  elif chip_id == ap_chip.SUN8I:
      from adafruit_blinka.microcontroller.allwinner.h3.pin import *
  elif chip_id == ap_chip.H3: