Merge branch 'main' into rk3588-rock-5

diff --cc src/analogio.py
index 8e07c9c84ffbfcb394df97f6c60bb18c1bfd3964,8102f8496e5666c03303950a1003b6978d80c2ca..c55356468a2b873cd58f0b91949d7b531f046325
--- 1/src/analogio.py
--- 2/src/analogio.py
+++ b/src/analogio.py
@@@ -29,7 -29,7 +29,9 @@@ elif detector.chip.RK3308
      from adafruit_blinka.microcontroller.generic_linux.sysfs_analogin import AnalogIn
  elif detector.chip.RK3399:
      from adafruit_blinka.microcontroller.generic_linux.sysfs_analogin import AnalogIn
 +elif detector.chip.RK3588:
++    from adafruit_blinka.microcontroller.generic_linux.sysfs_analogin import AnalogIn
+ elif detector.chip.RK3566:
      from adafruit_blinka.microcontroller.generic_linux.sysfs_analogin import AnalogIn
  elif detector.chip.IMX6ULL:
      from adafruit_blinka.microcontroller.generic_linux.sysfs_analogin import AnalogIn

diff --cc src/board.py
Simple merge

diff --cc src/digitalio.py
index 9d1cad8da0795f83d1ba90a5daa4aa64bd1fb93c,c6a77462e0031aa76361d8cd750b31fb862b2c19..a5c7b4414487a67d985e852d95312c0fae3f17cc
--- 1/src/digitalio.py
--- 2/src/digitalio.py
+++ b/src/digitalio.py
@@@ -69,12 -69,14 +69,16 @@@ elif detector.chip.RK3308
      from adafruit_blinka.microcontroller.rockchip.rk3308.pin import Pin
  elif detector.chip.RK3399:
      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:
      from adafruit_blinka.microcontroller.rockchip.rk3328.pin import Pin
+ elif detector.chip.RK3566:
+     from adafruit_blinka.microcontroller.rockchip.rk3566.pin import Pin
  elif detector.chip.PENTIUM_N3710:
      from adafruit_blinka.microcontroller.pentium.n3710.pin import Pin
+ elif detector.chip.ATOM_J4105:
+     from adafruit_blinka.microcontroller.pentium.j4105.pin import Pin
  elif detector.chip.STM32MP157:
      from adafruit_blinka.microcontroller.stm32.stm32mp157.pin import Pin
  elif detector.chip.MT8167:

diff --cc src/microcontroller/__init__.py
index 50a5880735e5f0a5f4dd09b4290574816a183a25,3801451faa608f13332ccf35d671d8959cab97f2..e9c9d0296cab1b3d4e6bfac5e614b5ba424b4607
--- 1/src/microcontroller/__init__.py
--- 2/src/microcontroller/__init__.py
+++ b/src/microcontroller/__init__.py
@@@ -90,10 -90,10 +90,12 @@@ elif chip_id == ap_chip.RK3308
      from adafruit_blinka.microcontroller.rockchip.rk3308 import *
  elif chip_id == ap_chip.RK3399:
      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:
      from adafruit_blinka.microcontroller.rockchip.rk3328 import *
+ elif chip_id == ap_chip.RK3566:
+     from adafruit_blinka.microcontroller.rockchip.rk3566 import *
  elif chip_id == ap_chip.H3:
      from adafruit_blinka.microcontroller.allwinner.h3 import *
  elif chip_id == ap_chip.H5:

diff --cc src/microcontroller/pin.py
index f3928eaf449c9bec0f3d49c19f9b069d280485b0,4835ad2975868020e84822ed8fec3edcea05019d..9ab4acabb54e6fb02d477b940e16915a6ad01c4a
--- 1/src/microcontroller/pin.py
--- 2/src/microcontroller/pin.py
+++ b/src/microcontroller/pin.py
@@@ -93,10 -93,12 +93,14 @@@ elif chip_id == ap_chip.RK3308
      from adafruit_blinka.microcontroller.rockchip.rk3308.pin import *
  elif chip_id == ap_chip.RK3399:
      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:
      from adafruit_blinka.microcontroller.rockchip.rk3328.pin import *
+ elif chip_id == ap_chip.RK3566:
+     from adafruit_blinka.microcontroller.rockchip.rk3566.pin import *
+ elif chip_id == ap_chip.RK3568B2:
+     from adafruit_blinka.microcontroller.rockchip.rk3568b2.pin import *
  elif chip_id == ap_chip.MIPS24KC:
      from adafruit_blinka.microcontroller.atheros.ar9331.pin import *
  elif chip_id == ap_chip.MIPS24KEC: