X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/blobdiff_plain/179719d1f0141ec8e033b52327070533e1224089..c2bc4a90827f28abb6b51eae659a1f80a65c0497:/src/adafruit_blinka/microcontroller/rockchip/rk3568b2/pin.py

diff --git a/src/adafruit_blinka/microcontroller/rockchip/rk3568b2/pin.py b/src/adafruit_blinka/microcontroller/rockchip/rk3568b2/pin.py
index d7abb83..45a0aa6 100644
--- a/src/adafruit_blinka/microcontroller/rockchip/rk3568b2/pin.py
+++ b/src/adafruit_blinka/microcontroller/rockchip/rk3568b2/pin.py
@@ -6,8 +6,7 @@
 """A Pin class for use with Rockchip RK3568B2."""
 
 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
 
 GPIO3C_6 = Pin((3, 22))
@@ -79,42 +78,41 @@ pwmOuts = []
 uartPorts = []
 
 # SysFS analog inputs, Ordered as analog analogInId, device, and channel
-analogIns = (
-    (ADC_AIN0, 0, 0),
-    (ADC_AIN1, 0, 0),
-)
+analogIns = []
 
 board = detector.board.id
 if board in ("ODROID_M1"):
+    analogIns.append((37, 0, 7))
+    analogIns.append((40, 0, 6))
     alias = get_dts_alias("fe5c0000.i2c")
     if alias is not None:
         globals()[alias + "_SCL"] = GPIO3B_5
         globals()[alias + "_SDA"] = GPIO3B_6
-        i2cPorts.append((int(alias[3]), GPIO3B_5, GPIO3B_6))
+        i2cPorts.append((int(alias[-1]), GPIO3B_5, GPIO3B_6))
     alias = get_pwm_chipid("fdd70010.pwm")
     if alias is not None:
-        globals()["PWM" + alias] = GPIO0C_0
-        pwmOuts.append(((int(alias[3]), 0), GPIO0C_0))
+        globals()["PWM" + alias] = GPIO0B_5
+        pwmOuts.append(((int(alias[-1]), 0), GPIO0B_5))
     alias = get_pwm_chipid("fdd70020.pwm")
     if alias is not None:
-        globals()["PWM" + alias] = GPIO0C_1
-        pwmOuts.append(((int(alias[3]), 0), GPIO0C_1))
+        globals()["PWM" + alias] = GPIO0B_6
+        pwmOuts.append(((int(alias[-1]), 0), GPIO0B_6))
     alias = get_pwm_chipid("fe6f0010.pwm")
     if alias is not None:
         globals()["PWM" + alias] = GPIO3B_2
-        pwmOuts.append(((int(alias[3]), 0), GPIO3B_2))
+        pwmOuts.append(((int(alias[-1]), 0), GPIO3B_2))
     alias = get_dts_alias("fdd50000.serial")
     if alias is not None:
         globals()[alias + "_TX"] = GPIO0C_1
         globals()[alias + "_RX"] = GPIO0C_0
-        uartPorts.append((int(alias[3]), GPIO0C_1, GPIO0C_0))
+        uartPorts.append((int(alias[-1]), GPIO0C_1, GPIO0C_0))
     alias = get_dts_alias("fe650000.serial")
     if alias is not None:
         globals()[alias + "_TX"] = GPIO3D_6
         globals()[alias + "_RX"] = GPIO3D_7
-        uartPorts.append((int(alias[3]), GPIO3D_6, GPIO3D_7))
-
+        uartPorts.append((int(alias[-1]), GPIO3D_6, GPIO3D_7))
 
+analogIns = tuple(analogIns)
 i2cPorts = tuple(i2cPorts)
 pwmOuts = tuple(pwmOuts)
 uartPorts = tuple(uartPorts)