From: Melissa LeBlanc-Williams <melissa@adafruit.com>
Date: Thu, 1 Dec 2022 16:25:05 +0000 (-0800)
Subject: Merge branch 'main' into rk3588-rock-5
X-Git-Tag: 8.10.0^2~2
X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/0c82d721e8e88a529bbf95a0e2e9233a8adc3074

Merge branch 'main' into rk3588-rock-5
---

0c82d721e8e88a529bbf95a0e2e9233a8adc3074
diff --cc src/analogio.py
index 8e07c9c,8102f84..c553564
--- a/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/digitalio.py
index 9d1cad8,c6a7746..a5c7b44
--- a/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 50a5880,3801451..e9c9d02
--- a/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 f3928ea,4835ad2..9ab4aca
--- a/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: