Merge branch 'master' into master

diff --cc src/busio.py
index e961236a5dd3f4dc22766c36ec4d4113c649805d,c9b845e3dc84b2d14c2af6bbdafa35845fcbc142..2bf81b775fd6386a0b6212d74a26d0a27c57d9a2
--- 1/src/busio.py
--- 2/src/busio.py
+++ b/src/busio.py
@@@ -288,19 -275,12 +275,15 @@@ class SPI(Lockable)
              ap_board.PINEPHONE,
              ap_board.SOPINE,
          ):
-             from adafruit_blinka.microcontroller.allwinner.a64.pin import Pin
              from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
 +        elif board_id == ap_board.PINEH64:
 +            from adafruit_blinka.microcontroller.allwinner.h6.pin import Pin
 +            from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
          elif board_id == ap_board.CLOCKWORK_CPI3:
-             from adafruit_blinka.microcontroller.allwinner.a33.pin import Pin
              from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
          elif board_id == ap_board.ONION_OMEGA2:
-             from adafruit_blinka.microcontroller.mips24kec.pin import Pin
              from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
          elif detector.board.any_lubancat and detector.chip.id == ap_chip.IMX6ULL:
-             from adafruit_blinka.microcontroller.nxp_imx6ull.pin import Pin
              from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
          elif detector.board.pico_u2if:
              from adafruit_blinka.microcontroller.pico_u2if.spi import SPI as _SPI