From: Melissa LeBlanc-Williams 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?hp=-c Merge branch 'main' into rk3588-rock-5 --- 0c82d721e8e88a529bbf95a0e2e9233a8adc3074 diff --combined 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 --combined src/board.py index c9197fd,19bfe95..480983c --- a/src/board.py +++ b/src/board.py @@@ -178,6 -178,9 +178,9 @@@ elif board_id == ap_board.ODROID_C4 elif board_id == ap_board.ODROID_N2: from adafruit_blinka.board.hardkernel.odroidn2 import * + elif board_id == ap_board.ODROID_M1: + from adafruit_blinka.board.hardkernel.odroidm1 import * + elif board_id == ap_board.KHADAS_VIM3: from adafruit_blinka.board.khadas.khadasvim3 import * @@@ -220,6 -223,9 +223,9 @@@ elif board_id == ap_board.CLOCKWORK_CPI elif board_id == ap_board.ONION_OMEGA2: from adafruit_blinka.board.onion.omega2 import * + elif board_id == ap_board.RADXA_CM3: + from adafruit_blinka.board.radxa.radxacm3 import * + elif board_id == ap_board.RADXA_ZERO: from adafruit_blinka.board.radxa.radxazero import * @@@ -229,15 -235,15 +235,18 @@@ elif board_id == ap_board.ROCK_PI_S elif board_id == ap_board.ROCK_PI_4: from adafruit_blinka.board.radxa.rockpi4 import * +elif board_id == ap_board.ROCK_PI_5: + from adafruit_blinka.board.radxa.rock5 import * + elif board_id == ap_board.ROCK_PI_E: from adafruit_blinka.board.radxa.rockpie import * elif board_id == ap_board.UDOO_X86: from adafruit_blinka.board.udoo_x86ultra import * + elif board_id == ap_board.ODYSSEY_X86J4105: + from adafruit_blinka.board.x86j4105 import * + elif board_id == ap_board.STM32MP157C_DK2: from adafruit_blinka.board.stm32.stm32mp157c_dk2 import * diff --combined 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 --combined 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: @@@ -120,6 -120,8 +122,8 @@@ elif chip_id == ap_chip.FT2232H from adafruit_blinka.microcontroller.ftdi_mpsse.ft2232h import * elif chip_id == ap_chip.PENTIUM_N3710: from adafruit_blinka.microcontroller.pentium.n3710 import * + elif chip_id == ap_chip.ATOM_J4105: + from adafruit_blinka.microcontroller.pentium.j4105 import * elif chip_id == ap_chip.STM32MP157: from adafruit_blinka.microcontroller.stm32.stm32mp157 import * elif chip_id == ap_chip.MT8167: diff --combined src/microcontroller/pin.py index f3928ea,4835ad2..9ab4aca --- a/src/microcontroller/pin.py +++ b/src/microcontroller/pin.py @@@ -93,16 -93,20 +93,22 @@@ 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: from adafruit_blinka.microcontroller.mips24kec.pin import * elif chip_id == ap_chip.PENTIUM_N3710: from adafruit_blinka.microcontroller.pentium.n3710.pin import * + elif chip_id == ap_chip.ATOM_J4105: + from adafruit_blinka.microcontroller.pentium.j4105.pin import * elif chip_id == ap_chip.STM32MP157: from adafruit_blinka.microcontroller.stm32.stm32mp157.pin import * elif chip_id == ap_chip.MT8167: