amlogic/a311d: Import get_dts_alias and eliminate duplicate function

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

diff --git a/src/adafruit_blinka/microcontroller/amlogic/a311d/pin.py b/src/adafruit_blinka/microcontroller/amlogic/a311d/pin.py
index cdb8afd8bb5e233d2010fcaec1e7c08b324c61ee..3213e38e38170e34061a8b06eada8a99e7af70bf 100644 (file)
--- a/src/adafruit_blinka/microcontroller/amlogic/a311d/pin.py
+++ b/src/adafruit_blinka/microcontroller/amlogic/a311d/pin.py
@@ -11,12 +11,12 @@ Linux kernel 5.4.y (mainline)
     linux/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
 """
 
     linux/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
 """
 

-import re

 import gpiod
 import gpiod

+from adafruit_blinka.microcontroller.alias import get_dts_alias

 from adafruit_blinka.microcontroller.generic_linux.libgpiod_pin import Pin
 
 from adafruit_blinka.microcontroller.generic_linux.libgpiod_pin import Pin
 

-chip0 = gpiod.chip("0")
-chip1 = gpiod.chip("1")
+chip0 = gpiod.Chip("0")
+chip1 = gpiod.Chip("1")

 
 if chip0.num_lines() < 20:
     aobus = 0
 
 if chip0.num_lines() < 20:
     aobus = 0


@@ -152,34 +152,13 @@ UART1_RX = GPIOH_6
 # ordered as uartId, txId, rxId
 uartPorts = ((1, UART1_TX, UART1_RX),)
 
 # ordered as uartId, txId, rxId
 uartPorts = ((1, UART1_TX, UART1_RX),)
 

-
-def get_dts_alias(device: str) -> str:
-    """Get the Device Tree Alias"""
-    uevent_path = "/sys/bus/platform/devices/" + device + "/uevent"
-    with open(uevent_path, "r", encoding="utf-8") as fd:
-        pattern = r"^OF_ALIAS_0=(.*)$"
-        uevent = fd.read().split("\n")
-        for line in uevent:
-            match = re.search(pattern, line)
-            if match:
-                return match.group(1).upper()
-
-        return None
-
-

 # ordered as i2cId, sclId, sdaId
 i2cPorts = []
 
 # ordered as i2cId, sclId, sdaId
 i2cPorts = []
 

-alias = get_dts_alias("ffd1d000.i2c")
+alias = get_dts_alias("ff805000.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))
 
 if alias is not None:
     globals()[alias + "_SCL"] = GPIOX_18
     globals()[alias + "_SDA"] = GPIOX_17
     i2cPorts.append((int(alias[3]), GPIOX_18, GPIOX_17))
 

-alias = get_dts_alias("ffd1c000.i2c")
-if alias is not None:
-    globals()[alias + "_SCL"] = GPIOAO_2
-    globals()[alias + "_SDA"] = GPIOAO_3
-    i2cPorts.append((int(alias[3]), GPIOAO_2, GPIOAO_3))
-

 i2cPorts = tuple(i2cPorts)
 i2cPorts = tuple(i2cPorts)