From 80dcbdfbfdfaf398c75faad746e36584d5879968 Mon Sep 17 00:00:00 2001
From: agstewart <avenstewart@gmail.com>
Date: Sun, 20 Jul 2025 03:22:39 -0500
Subject: [PATCH 1/1] added rk3588s microcontroller support and fixed i2c pin
 defs

---
 src/adafruit_blinka/microcontroller/rockchip/rk3588s/pin.py | 6 +++---
 src/analogio.py                                             | 2 ++
 src/digitalio.py                                            | 2 ++
 src/microcontroller/__init__.py                             | 2 ++
 src/microcontroller/pin.py                                  | 2 ++
 5 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/adafruit_blinka/microcontroller/rockchip/rk3588s/pin.py b/src/adafruit_blinka/microcontroller/rockchip/rk3588s/pin.py
index 91483d3..b2a690e 100644
--- 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 02a41b2..89c82be 100644
--- 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 31c650c..322b142 100644
--- 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 cedd126..30db3ac 100644
--- 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 4016f95..037eb2e 100644
--- 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:
-- 
2.49.0