Merge pull request #723 from mmontol/main

[hackapet/Adafruit_Blinka.git] / src / adafruit_blinka / microcontroller / rockchip / rk3588 / pin.py

diff --git a/src/adafruit_blinka/microcontroller/rockchip/rk3588/pin.py b/src/adafruit_blinka/microcontroller/rockchip/rk3588/pin.py
index 18652bd086396b3a5f0fae03d1e66a8598e6513d..5a5a18993ecda6ba61a73074b8b4b5cf2cc944ca 100644 (file)
--- a/src/adafruit_blinka/microcontroller/rockchip/rk3588/pin.py
+++ b/src/adafruit_blinka/microcontroller/rockchip/rk3588/pin.py
@@ -175,6 +175,8 @@ GPIO4_D7 = Pin((4, 31))
 
 
 # UART
+UART0_TX_M2 = GPIO4_A3
+UART0_RX_M2 = GPIO4_A4
 UART2_TX_M0 = GPIO0_B5
 UART2_RX_M0 = GPIO0_B6
 UART2_TX_M2 = GPIO3_B1
@@ -190,6 +192,7 @@ UART7_RX_M2 = GPIO1_B4
 
 # ordered as uartId, txId, rxId
 uartPorts = (
+    (0, UART0_TX_M2, UART0_RX_M2),
     (2, UART2_TX_M0, UART2_RX_M0),
     (2, UART2_TX_M2, UART2_RX_M2),
     (3, UART3_TX_M1, UART3_RX_M1),
@@ -204,8 +207,12 @@ 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
+I2C6_SCL_M3 = GPIO4_B1
+I2C6_SDA_M3 = GPIO4_B0
 I2C7_SCL_M3 = GPIO4_B2
 I2C7_SDA_M3 = GPIO4_B3
 I2C8_SCL_M4 = GPIO3_C2
@@ -217,6 +224,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),
@@ -243,9 +251,9 @@ SPI3_MOSI_M0 = GPIO4_C5
 SPI3_SCK_M0 = GPIO4_C6
 SPI3_SCLK_M0 = SPI3_SCK_M0
 
-SPI4_MISO_M0 = GPIO1_C2
+SPI4_MISO_M0 = GPIO1_C0
 SPI4_MOSI_M0 = GPIO1_C1
-SPI4_SCK_M0 = GPIO1_C4
+SPI4_SCK_M0 = GPIO1_C2
 SPI4_SCLK_M0 = SPI4_SCK_M0
 
 # ordered as spiId, sckId, mosiId, misoId
@@ -263,11 +271,14 @@ PWM5_M2 = GPIO4_C4
 PWM6_M2 = GPIO4_C5
 PWM7_IR_M3 = GPIO4_C6
 PWM8_M0 = GPIO3_A7
+PWM10_M2 = GPIO3_D3
+PWM11_IR_M3 = GPIO3_D5
 PWM12_M0 = GPIO3_B5
 PWM13_M0 = GPIO3_B6
 PWM13_M2 = GPIO1_B7
 PWM14_M0 = GPIO3_C2
 PWM14_M1 = GPIO4_B2
+PWM14_M2 = GPIO1_D6
 PWM15_IR_M0 = GPIO3_C3
 PWM15_IR_M1 = GPIO4_B3
 PWM15_IR_M3 = GPIO1_D7
@@ -281,11 +292,14 @@ pwmOuts = (
     ((0, 6), PWM6_M2),
     ((0, 7), PWM7_IR_M3),
     ((0, 8), PWM8_M0),
+    ((0, 10), PWM10_M2),
+    ((0, 11), PWM11_IR_M3),
     ((0, 12), PWM12_M0),
     ((0, 13), PWM13_M0),
     ((0, 13), PWM13_M2),
     ((0, 14), PWM14_M0),
     ((0, 14), PWM14_M1),
+    ((0, 14), PWM14_M2),
     ((0, 15), PWM15_IR_M0),
     ((0, 15), PWM15_IR_M1),
     ((0, 15), PWM15_IR_M3),