Merge branch 'adafruit:main' into bananapro

diff --git a/src/adafruit_blinka/board/orangepi/orangepi5.py b/src/adafruit_blinka/board/orangepi/orangepi5.py
index 18893939caf4a082371dc5f77a5b3fa042d3e2f1..e86f2ea83a43a206bb5ca59e333567e667ab0493 100644 (file)
--- a/src/adafruit_blinka/board/orangepi/orangepi5.py
+++ b/src/adafruit_blinka/board/orangepi/orangepi5.py
@@ -51,16 +51,16 @@ TXD = UART1_TX
 RXD = UART1_RX
 
 # I2C
-I2C1_SCL = pin.GPIO1_D2
-I2C1_SDA = pin.GPIO1_D3
+I2C1_SCL = pin.GPIO1_B1
+I2C1_SDA = pin.GPIO1_B2
 I2C3_SCL = pin.GPIO1_C1
 I2C3_SDA = pin.GPIO1_C0
 I2C5_SCL = pin.GPIO1_B6
 I2C5_SDA = pin.GPIO1_B7
 
 # Default I2C
-SCL = I2C5_SCL
-SDA = I2C5_SDA
+SCL = I2C1_SCL
+SDA = I2C1_SDA
 
 # SPI
 SPI4_MISO = pin.GPIO1_C0

diff --git a/src/adafruit_blinka/microcontroller/rockchip/rk3588/pin.py b/src/adafruit_blinka/microcontroller/rockchip/rk3588/pin.py
index 8879cd12e4de610e5887172321796e5d93af2e91..cca9184fb7871b9a670ae98757ee03170cab7ae0 100644 (file)
--- a/src/adafruit_blinka/microcontroller/rockchip/rk3588/pin.py
+++ b/src/adafruit_blinka/microcontroller/rockchip/rk3588/pin.py
@@ -204,6 +204,8 @@ I2C0_SCL_M1 = GPIO4_C5
 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
 I2C3_SCL_M1 = GPIO3_B7
 I2C3_SDA_M1 = GPIO3_C0
 I2C7_SCL_M3 = GPIO4_B2
@@ -217,6 +219,7 @@ I2C5_SCL_M3 = GPIO1_B6
 i2cPorts = (
     (0, I2C0_SCL_M1, I2C0_SDA_M1),
     (1, I2C1_SCL_M0, I2C1_SDA_M0),
+    (1, I2C1_SCL_M4, I2C1_SDA_M4),
     (3, I2C3_SCL_M1, I2C3_SDA_M1),
     (5, I2C5_SCL_M3, I2C5_SDA_M3),
     (7, I2C7_SCL_M3, I2C7_SDA_M3),