Merge pull request #790 from how2flow/odroid

[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 cda852db706bacf6f308a4f665bc6bc684cff736..a32a077c5a79306a37f8fa4056461b208e6b600f 100644 (file)
--- a/src/adafruit_blinka/microcontroller/rockchip/rk3566/pin.py
+++ b/src/adafruit_blinka/microcontroller/rockchip/rk3566/pin.py
@@ -6,8 +6,7 @@
 """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_A2 = Pin((0, 2))
@@ -65,9 +64,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))
@@ -176,44 +179,48 @@ 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
         globals()[alias + "_SDA"] = GPIO3_B6
-        i2cPorts.append((int(alias[3]), GPIO3_B5, GPIO3_B6))
+        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[3]), 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[3]), 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
-        pwmOuts.append(((int(alias[3]), 0), GPIO0_C2))
+        pwmOuts.append(((int(alias[-1]), 0), GPIO0_C2))
     alias = get_dts_alias("fe620000.spi")
     if alias is not None:
         globals()[alias + "_CLK"] = GPIO3_C3
         globals()[alias + "_MOSI"] = GPIO3_C1
         globals()[alias + "_MISO"] = GPIO3_C2
-        spiPorts.append((int(alias[3]), GPIO3_C3, GPIO3_C1, GPIO3_C2))
+        spiPorts.append((int(alias[-1]), GPIO3_C3, GPIO3_C1, GPIO3_C2))
     alias = get_dts_alias("fdd50000.serial")
     if alias is not None:
         globals()[alias + "_TX"] = GPIO0_C1
         globals()[alias + "_RX"] = GPIO0_C0
-        uartPorts.append((int(alias[3]), GPIO0_C1, GPIO0_C0))
+        uartPorts.append((int(alias[-1]), GPIO0_C1, GPIO0_C0))
     alias = get_dts_alias("fe6a0000.serial")
     if alias is not None:
         globals()[alias + "_TX"] = GPIO2_A4
         globals()[alias + "_RX"] = GPIO2_A3
-        uartPorts.append((int(alias[3]), GPIO2_A4, GPIO2_A3))
+        uartPorts.append((int(alias[-1]), GPIO2_A4, GPIO2_A3))
 
+analogIns = tuple(analogIns)
 i2cPorts = tuple(i2cPorts)
 pwmOuts = tuple(pwmOuts)
 spiPorts = tuple(spiPorts)