Merge pull request #764 from makermelissa/main

[Adafruit_Blinka-hackapet.git] / src / adafruit_blinka / microcontroller / amlogic / meson_g12_common / pin.py

diff --git a/src/adafruit_blinka/microcontroller/amlogic/meson_g12_common/pin.py b/src/adafruit_blinka/microcontroller/amlogic/meson_g12_common/pin.py
index 50548acf1ddfae7592ac83a7a7885ab58b7324f4..f44f92a04a408f5084cf890f7befd86f229f5f39 100644 (file)
--- a/src/adafruit_blinka/microcontroller/amlogic/meson_g12_common/pin.py
+++ b/src/adafruit_blinka/microcontroller/amlogic/meson_g12_common/pin.py
@@ -136,28 +136,39 @@ uartPorts = [
     (1, UART1_TX, UART1_RX),
 ]
 
+# SysFS analog inputs, Ordered as analog analogInId, device, and channel
+analogIns = []
+
 board = detector.board.id
 if board in ("ODROID_C4", "ODROID_N2"):
     alias = get_dts_alias("ffd1d000.i2c")
     if alias is not None:
         globals()[alias + "_SCL"] = GPIOX_18
         globals()[alias + "_SDA"] = GPIOX_17
-        i2cPorts.append((int(alias[3]), GPIOX_18, GPIOX_17))
+        i2cPorts.append((int(alias[-1]), GPIOX_18, GPIOX_17))
     alias = get_dts_alias("ffd1c000.i2c")
     if alias is not None:
         globals()[alias + "_SCL"] = GPIOA_15
         globals()[alias + "_SDA"] = GPIOA_14
-        i2cPorts.append((int(alias[3]), GPIOA_15, GPIOA_14))
+        i2cPorts.append((int(alias[-1]), GPIOA_15, GPIOA_14))
     alias = get_dts_alias("fdd24000.serial")
     if alias is not None:
         globals()[alias + "_TX"] = GPIOX_12
         globals()[alias + "_RX"] = GPIOX_13
-        uartPorts.append((int(alias[3]), GPIOX_12, GPIOX_13))
+        uartPorts.append((int(alias[-1]), GPIOX_12, GPIOX_13))
     alias = get_dts_alias("fdd23000.serial")
     if alias is not None:
         globals()[alias + "_TX"] = GPIOX_6
         globals()[alias + "_RX"] = GPIOX_7
-        uartPorts.append((int(alias[3]), GPIOX_6, GPIOX_7))
+        uartPorts.append((int(alias[-1]), GPIOX_6, GPIOX_7))
+
+if board in ("ODROID_C4"):
+    analogIns.append((37, 0, 2))
+    analogIns.append((40, 0, 0))
+if board in ("ODROID_N2"):
+    analogIns.append((37, 0, 3))
+    analogIns.append((40, 0, 2))
 
+analogIns = tuple(analogIns)
 i2cPorts = tuple(i2cPorts)
 uartPorts = tuple(uartPorts)