added rk3588s microcontroller support and fixed i2c pin defs

diff --git a/src/adafruit_blinka/microcontroller/rockchip/rk3588s/pin.py b/src/adafruit_blinka/microcontroller/rockchip/rk3588s/pin.py
index 91483d3222b3227fe8f3702b8e2744316f84786c..b2a690e7a4684eb68c7dc5c04c4a0db1053c7812 100644 (file)
--- a/src/adafruit_blinka/microcontroller/rockchip/rk3588s/pin.py
+++ b/src/adafruit_blinka/microcontroller/rockchip/rk3588s/pin.py
@@ -209,8 +209,8 @@ uartPorts = (
 # I2C0_SDA_M1 = GPIO4_C6
 I2C1_SCL_M0 = GPIO0_B5
 I2C1_SDA_M0 = GPIO0_B6
-# I2C1_SCL_M4 = GPIO1_B1
-# I2C1_SDA_M4 = GPIO1_B2
+I2C1_SCL_M4 = GPIO1_D2
+I2C1_SDA_M4 = GPIO1_D3
 I2C2_SCL_M4 = GPIO1_A1
 I2C2_SDA_M4 = GPIO1_A0
 # I2C3_SCL_M1 = GPIO3_B7
@@ -228,7 +228,7 @@ I2C8_SDA_M2 = GPIO1_D7
 
 # ordered as i2cId, sclId, sdaId
 i2cPorts = (
-    (1, I2C1_SCL_M0, I2C1_SDA_M0),
+    (1, I2C1_SCL_M4, I2C1_SDA_M4),
     (2, I2C2_SCL_M4, I2C2_SDA_M4),
     (4, I2C4_SCL_M3, I2C4_SDA_M3),
     (6, I2C6_SCL_M3, I2C6_SDA_M3),

diff --git a/src/analogio.py b/src/analogio.py
index 02a41b283e59e96dcc8f96498c4c613530466f10..89c82be6f159433c9d6cf9c2c41d2f1c7bfaac6b 100644 (file)
--- a/src/analogio.py
+++ b/src/analogio.py
@@ -32,6 +32,8 @@ 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.RK3588S:
+    from adafruit_blinka.microcontroller.generic_linux.sysfs_analogin import AnalogIn
 elif detector.chip.RK3568:
     from adafruit_blinka.microcontroller.generic_linux.sysfs_analogin import AnalogIn
 elif detector.chip.RK3566:

diff --git a/src/digitalio.py b/src/digitalio.py
index 31c650c7e2e4e77b4da00328c7fc433f3f27cf43..322b142a5aba228d6b4f310045302c33e271fd08 100644 (file)
--- a/src/digitalio.py
+++ b/src/digitalio.py
@@ -87,6 +87,8 @@ elif detector.chip.RK3399_T:
     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.RK3588S:
+    from adafruit_blinka.microcontroller.rockchip.rk3588s.pin import Pin
 elif detector.chip.RK3328:
     from adafruit_blinka.microcontroller.rockchip.rk3328.pin import Pin
 elif detector.chip.RK3566:

diff --git a/src/microcontroller/__init__.py b/src/microcontroller/__init__.py
index cedd1264168ca91524b8c26dd2642c46f23f9330..30db3acf4318c34b65fb3f4df0d99f4006b760b4 100644 (file)
--- a/src/microcontroller/__init__.py
+++ b/src/microcontroller/__init__.py
@@ -109,6 +109,8 @@ elif chip_id == ap_chip.RK3399_T:
     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.RK3588S:
+    from adafruit_blinka.microcontroller.rockchip.rk3588s import *
 elif chip_id == ap_chip.RK3328:
     from adafruit_blinka.microcontroller.rockchip.rk3328 import *
 elif chip_id == ap_chip.RK3566:

diff --git a/src/microcontroller/pin.py b/src/microcontroller/pin.py
index 4016f95848909d037ad53cb93e3c4f6d564171ec..037eb2e5cb5662de61f9093fe2ece5380c2f3c69 100644 (file)
--- a/src/microcontroller/pin.py
+++ b/src/microcontroller/pin.py
@@ -118,6 +118,8 @@ elif chip_id == ap_chip.RK3399_T:
     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.RK3588S:
+    from adafruit_blinka.microcontroller.rockchip.rk3588s.pin import *
 elif chip_id == ap_chip.RK3328:
     from adafruit_blinka.microcontroller.rockchip.rk3328.pin import *
 elif chip_id == ap_chip.RK3566: