Merge remote-tracking branch 'adafruit/main'

diff --combined src/board.py
index c389fded8d15ea25175542434523ca6028105e79,905be5e526240b40f91dec100882c7adc0dfa827..fc3b754df73420199df01e4da459e3c774fd86df
--- 1/src/board.py
--- 2/src/board.py
+++ b/src/board.py
@@@ -217,12 -217,6 +217,12 @@@ elif board_id == ap_board.PINE64
  elif board_id == ap_board.PINEH64:
      from adafruit_blinka.board.pineH64 import *
  
 +elif board_id == ap_board.PCDUINO2:
 +    from adafruit_blinka.board.linksprite.pcduino2 import *
 +
 +elif board_id == ap_board.PCDUINO3:
 +    from adafruit_blinka.board.linksprite.pcduino3 import *
 +
  elif board_id == ap_board.SOPINE:
      from adafruit_blinka.board.soPine import *
  
@@@ -248,7 -242,7 +248,7 @@@ elif board_id == ap_board.ROCK_PI_4
      from adafruit_blinka.board.radxa.rockpi4 import *
  
  elif board_id == ap_board.ROCK_PI_4_C_PLUS:
-     from adafruit_blinka.board.radxa.rockpi4cplus import *
+     from adafruit_blinka.board.radxa.rockpi4 import *
  
  elif board_id == ap_board.ROCK_PI_5:
      from adafruit_blinka.board.radxa.rock5 import *
@@@ -325,6 -319,9 +325,9 @@@ elif board_id == ap_board.SIEMENS_SIMAT
  elif board_id == ap_board.AML_S905X_CC:
      from adafruit_blinka.board.librecomputer.aml_s905x_cc_v1 import *
  
+ elif board_id == ap_board.ROC_RK3328_CC:
+     from adafruit_blinka.board.librecomputer.roc_rk3328_cc import *
+ 
  elif board_id == ap_board.GENERIC_LINUX_PC:
      from adafruit_blinka.board.generic_linux_pc import *
  

diff --combined src/digitalio.py
index 46af5eac3854c95f578ac8d15de224c71b9fb882,7ce324002821ca87bfb0dfce8eec6d2f82e3f311..3f3a36b76d64c5ba8e79d2428c13a319d66dd501
--- 1/src/digitalio.py
--- 2/src/digitalio.py
+++ b/src/digitalio.py
@@@ -25,10 -25,6 +25,10 @@@ elif detector.chip.JH71x0
      from adafruit_blinka.microcontroller.starfive.JH71x0.pin import Pin
  elif detector.chip.DRA74X:
      from adafruit_blinka.microcontroller.dra74x.pin import Pin
 +elif detector.chip.SUN4I:
 +    from adafruit_blinka.microcontroller.allwinner.a10.pin import Pin
 +elif detector.chip.SUN7I:
 +    from adafruit_blinka.microcontroller.allwinner.a10.pin import Pin
  elif detector.chip.SUN8I:
      from adafruit_blinka.microcontroller.allwinner.h3.pin import Pin
  elif detector.chip.SAMA5:
@@@ -63,10 -59,6 +63,10 @@@ elif detector.chip.IMX6ULL
      from adafruit_blinka.microcontroller.nxp_imx6ull.pin import Pin
  elif detector.chip.HFU540:
      from adafruit_blinka.microcontroller.hfu540.pin import Pin
 +elif detector.chip.A10:
 +    from adafruit_blinka.microcontroller.allwinner.a10.pin import Pin
 +elif detector.chip.A30:
 +    from adafruit_blinka.microcontroller.allwinner.a10.pin import Pin
  elif detector.chip.A64:
      from adafruit_blinka.microcontroller.allwinner.a64.pin import Pin
  elif detector.chip.A33:
@@@ -78,7 -70,7 +78,7 @@@ elif detector.chip.RK3308
  elif detector.chip.RK3399:
      from adafruit_blinka.microcontroller.rockchip.rk3399.pin import Pin
  elif detector.chip.RK3399_T:
-     from adafruit_blinka.microcontroller.rockchip.rk3399_t.pin import Pin
+     from adafruit_blinka.microcontroller.rockchip.rk3399.pin import Pin
  elif detector.chip.RK3588:
      from adafruit_blinka.microcontroller.rockchip.rk3588.pin import Pin
  elif detector.chip.RK3328:

diff --combined src/microcontroller/__init__.py
index a73c4dd6d6c02331143042710f7346973d3312b9,715c080a021369363775041f74288ae3d6634b94..ad8c90a8b915f881d5597858a82ac657ce9e114a
--- 1/src/microcontroller/__init__.py
--- 2/src/microcontroller/__init__.py
+++ b/src/microcontroller/__init__.py
@@@ -48,10 -48,6 +48,10 @@@ elif chip_id == ap_chip.AM65XX
      from adafruit_blinka.microcontroller.am65xx import *
  elif chip_id == ap_chip.JH71x0:
      from adafruit_blinka.microcontroller.starfive.JH71x0 import *
 +elif chip_id == ap_chip.SUN4I:
 +    from adafruit_blinka.microcontroller.allwinner.a10 import *
 +elif chip_id == ap_chip.SUN7I:
 +    from adafruit_blinka.microcontroller.allwinner.a10 import *
  elif chip_id == ap_chip.SUN8I:
      from adafruit_blinka.microcontroller.allwinner.h3 import *
  elif chip_id == ap_chip.H5:
@@@ -86,10 -82,6 +86,10 @@@ elif chip_id == ap_chip.EXYNOS5422
      from adafruit_blinka.microcontroller.samsung.exynos5422 import *
  elif chip_id == ap_chip.APQ8016:
      from adafruit_blinka.microcontroller.snapdragon.apq8016 import *
 +elif chip_id == ap_chip.A10:
 +    from adafruit_blinka.microcontroller.allwinner.a10 import *
 +elif chip_id == ap_chip.A20:
 +    from adafruit_blinka.microcontroller.allwinner.a10 import *
  elif chip_id == ap_chip.A64:
      from adafruit_blinka.microcontroller.allwinner.a64 import *
  elif chip_id == ap_chip.A33:
@@@ -99,7 -91,7 +99,7 @@@ elif chip_id == ap_chip.RK3308
  elif chip_id == ap_chip.RK3399:
      from adafruit_blinka.microcontroller.rockchip.rk3399 import *
  elif chip_id == ap_chip.RK3399_T:
-     from adafruit_blinka.microcontroller.rockchip.rk3399_t import *
+     from adafruit_blinka.microcontroller.rockchip.rk3399 import *
  elif chip_id == ap_chip.RK3588:
      from adafruit_blinka.microcontroller.rockchip.rk3588 import *
  elif chip_id == ap_chip.RK3328:

diff --combined src/microcontroller/pin.py
index bd6702bf18c90710ee7714078729b661d60b3892,ebdac6bbbb48317528a505e1a52b789c41ff8633..cdb613be40185a399239c6394a025da782b36512
--- 1/src/microcontroller/pin.py
--- 2/src/microcontroller/pin.py
+++ b/src/microcontroller/pin.py
@@@ -33,10 -33,6 +33,10 @@@ elif chip_id == ap_chip.AM65XX
      from adafruit_blinka.microcontroller.am65xx.pin import *
  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.a10.pin import *
 +elif chip_id == ap_chip.SUN7I:
 +    from adafruit_blinka.microcontroller.allwinner.a10.pin import *
  elif chip_id == ap_chip.SUN8I:
      from adafruit_blinka.microcontroller.allwinner.h3.pin import *
  elif chip_id == ap_chip.H3:
@@@ -89,10 -85,6 +89,10 @@@ elif chip_id == ap_chip.LPC4330
      from adafruit_blinka.microcontroller.nxp_lpc4330.pin import *
  elif chip_id == ap_chip.MCP2221:
      from adafruit_blinka.microcontroller.mcp2221.pin import *
 +elif chip_id == ap_chip.A10:
 +    from adafruit_blinka.microcontroller.allwinner.a10.pin import *
 +elif chip_id == ap_chip.A20:
 +    from adafruit_blinka.microcontroller.allwinner.a10.pin import *
  elif chip_id == ap_chip.A64:
      from adafruit_blinka.microcontroller.allwinner.a64.pin import *
  elif chip_id == ap_chip.A33:
@@@ -102,7 -94,7 +102,7 @@@ elif chip_id == ap_chip.RK3308
  elif chip_id == ap_chip.RK3399:
      from adafruit_blinka.microcontroller.rockchip.rk3399.pin import *
  elif chip_id == ap_chip.RK3399_T:
-     from adafruit_blinka.microcontroller.rockchip.rk3399_t.pin import *
+     from adafruit_blinka.microcontroller.rockchip.rk3399.pin import *
  elif chip_id == ap_chip.RK3588:
      from adafruit_blinka.microcontroller.rockchip.rk3588.pin import *
  elif chip_id == ap_chip.RK3328: