Merge branch 'adafruit:main' into raxda-zero3

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

diff --git a/src/adafruit_blinka/microcontroller/rockchip/rk3566/pin.py b/src/adafruit_blinka/microcontroller/rockchip/rk3566/pin.py
index c4a868c05fecdd274da1d92fa12e8b9d2d23f928..1a8952b8b2938da1d58a21a5785c6b1769e82a9d 100644 (file)
--- a/src/adafruit_blinka/microcontroller/rockchip/rk3566/pin.py
+++ b/src/adafruit_blinka/microcontroller/rockchip/rk3566/pin.py
@@ -6,10 +6,10 @@
 """A Pin class for use with Rockchip RK3566."""
 
 from adafruit_blinka.agnostic import detector
-from adafruit_blinka.microcontroller.alias import get_dts_alias
-from adafruit_blinka.microcontroller.alias import get_pwm_chipid
+from adafruit_blinka.microcontroller.alias import get_dts_alias, get_pwm_chipid
 from adafruit_blinka.microcontroller.generic_linux.libgpiod_pin import Pin
 
+GPIO0_A0 = Pin((0, 0))
 GPIO0_A2 = Pin((0, 2))
 GPIO0_A4 = Pin((0, 4))
 GPIO0_A5 = Pin((0, 5))
@@ -65,9 +65,13 @@ GPIO2_C4 = Pin((2, 20))
 GPIO2_C5 = Pin((2, 21))
 GPIO2_C6 = Pin((2, 22))
 GPIO3_A1 = Pin((3, 1))
+GPIO3_A2 = Pin((3, 2))
+GPIO3_A3 = Pin((3, 3))
+GPIO3_A4 = Pin((3, 4))
 GPIO3_A5 = Pin((3, 5))
 GPIO3_A6 = Pin((3, 6))
 GPIO3_A7 = Pin((3, 7))
+GPIO3_B0 = Pin((3, 8))
 GPIO3_B1 = Pin((3, 9))
 GPIO3_B2 = Pin((3, 10))
 GPIO3_B3 = Pin((3, 11))
@@ -111,6 +115,9 @@ GPIO4_C6 = Pin((4, 22))
 
 ADC_AIN3 = 37
 
+# labeled as such on Quartz64-A
+CPU_REFCLK_OUT = GPIO0_A0
+
 # I2C
 I2C0_SCL = GPIO0_B1
 I2C0_SDA = GPIO0_B2
@@ -132,6 +139,10 @@ SPI0_CS0_M0 = GPIO0_C6
 SPI0_CLK_M0 = GPIO0_B5
 SPI0_MISO_M0 = GPIO0_C5
 SPI0_MOSI_M0 = GPIO0_B6
+SPI1_CS0_M1 = GPIO0_C6
+SPI1_CLK_M1 = GPIO0_B5
+SPI1_MISO_M1 = GPIO3_C2
+SPI1_MOSI_M1 = GPIO3_C1
 SPI3_CS0_M0 = GPIO4_A6
 SPI3_CLK_M0 = GPIO4_B3
 SPI3_MISO_M0 = GPIO4_B0
@@ -142,6 +153,8 @@ SPI3_MISO_M1 = GPIO4_C5
 SPI3_MOSI_M1 = GPIO4_C3
 
 # UART
+UART0_TX = GPIO0_C1
+UART0_RX = GPIO0_C0
 UART2_TX = GPIO0_D1
 UART2_RX = GPIO0_D0
 UART3_TX_M1 = GPIO3_B7
@@ -158,11 +171,13 @@ i2cPorts = [
     (1, I2C1_SCL, I2C1_SDA),
     (2, I2C2_SCL_M0, I2C2_SDA_M0),
     (3, I2C3_SCL_M0, I2C3_SDA_M0),
+    (4, I2C4_SCL_M0, I2C4_SDA_M0),
     (5, I2C5_SCL_M0, I2C5_SDA_M0),
 ]
 
 # ordered as spiId, sckId, mosiId, misoId
 spiPorts = [
+    (1, SPI1_CLK_M1, SPI1_MOSI_M1, SPI1_MISO_M1),
     (3, SPI3_CLK_M0, SPI3_MOSI_M0, SPI3_MISO_M0),
     (3, SPI3_CLK_M1, SPI3_MOSI_M1, SPI3_MISO_M1),
 ]
@@ -176,10 +191,13 @@ pwmOuts = [
 uartPorts = []
 
 # SysFS analog inputs, Ordered as analog analogInId, device, and channel
-analogIns = ((ADC_AIN3, 0, 3),)
+analogIns = [
+    (ADC_AIN3, 0, 3),
+]
 
 board = detector.board.id
 if board in ("ODROID_M1S"):
+    analogIns.append((40, 0, 2))
     alias = get_dts_alias("fe5c0000.i2c")
     if alias is not None:
         globals()[alias + "_SCL"] = GPIO3_B5
@@ -187,12 +205,12 @@ if board in ("ODROID_M1S"):
         i2cPorts.append((int(alias[-1]), GPIO3_B5, GPIO3_B6))
     alias = get_pwm_chipid("fdd70010.pwm")
     if alias is not None:
-        globals()["PWM" + alias] = GPIO0_C0
-        pwmOuts.append(((int(alias[-1]), 0), GPIO0_C0))
+        globals()["PWM" + alias] = GPIO0_B5
+        pwmOuts.append(((int(alias[-1]), 0), GPIO0_B5))
     alias = get_pwm_chipid("fdd70020.pwm")
     if alias is not None:
-        globals()["PWM" + alias] = GPIO0_C1
-        pwmOuts.append(((int(alias[-1]), 0), GPIO0_C1))
+        globals()["PWM" + alias] = GPIO0_B6
+        pwmOuts.append(((int(alias[-1]), 0), GPIO0_B6))
     alias = get_pwm_chipid("fdd70030.pwm")
     if alias is not None:
         globals()["PWM" + alias] = GPIO0_C2
@@ -214,6 +232,7 @@ if board in ("ODROID_M1S"):
         globals()[alias + "_RX"] = GPIO2_A3
         uartPorts.append((int(alias[-1]), GPIO2_A4, GPIO2_A3))
 
+analogIns = tuple(analogIns)
 i2cPorts = tuple(i2cPorts)
 pwmOuts = tuple(pwmOuts)
 spiPorts = tuple(spiPorts)