Merge pull request #1005 from makermelissa/libgpiod-fix

[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 f0c378a7bd2e8f67de8e464e9b4a4994be29e244..ea01a8eb7c88e7990fc2518b10cad63fb16107d6 100644 (file)
--- a/src/adafruit_blinka/microcontroller/amlogic/meson_g12_common/pin.py
+++ b/src/adafruit_blinka/microcontroller/amlogic/meson_g12_common/pin.py
@@ -15,30 +15,13 @@ Linux kernel 5.4.y (mainline)
 from adafruit_blinka.agnostic import detector
 from adafruit_blinka.microcontroller.alias import get_dts_alias, get_pwm_chipid
 from adafruit_blinka.microcontroller.generic_linux.libgpiod_pin import Pin
+from adafruit_blinka.microcontroller.generic_linux.libgpiod_chip import Chip
 
-try:
-    import gpiod
-except ImportError:
-    raise ImportError(
-        "libgpiod Python bindings not found, please install and try again!"
-    ) from ImportError
+chip0 = Chip("0")
+chip1 = Chip("1")
 
-if hasattr(gpiod, "Chip"):
-    chip0 = gpiod.Chip("0")
-    chip1 = gpiod.Chip("1")
-else:
-    chip0 = gpiod.chip("0")
-    chip1 = gpiod.chip("1")
-
-if callable(chip0.num_lines):
-    chip0lines = chip0.num_lines()
-else:
-    chip0lines = chip0.num_lines
-
-if callable(chip1.num_lines):
-    chip1lines = chip1.num_lines()
-else:
-    chip1lines = chip1.num_lines
+chip0lines = chip0.num_lines
+chip1lines = chip1.num_lines
 
 if chip0lines < 20:
     aobus = 0
@@ -154,12 +137,12 @@ if board in ("ODROID_C4", "ODROID_N2"):
         globals()[alias + "_SCL"] = GPIOA_15
         globals()[alias + "_SDA"] = GPIOA_14
         i2cPorts.append((int(alias[-1]), GPIOA_15, GPIOA_14))
-    alias = get_dts_alias("fdd24000.serial")
+    alias = get_dts_alias("ffd24000.serial")
     if alias is not None:
         globals()[alias + "_TX"] = GPIOX_12
         globals()[alias + "_RX"] = GPIOX_13
         uartPorts.append((int(alias[-1]), GPIOX_12, GPIOX_13))
-    alias = get_dts_alias("fdd23000.serial")
+    alias = get_dts_alias("ffd23000.serial")
     if alias is not None:
         globals()[alias + "_TX"] = GPIOX_6
         globals()[alias + "_RX"] = GPIOX_7
@@ -181,9 +164,9 @@ if board in ("ODROID_C4"):
     alias = get_pwm_chipid("ffd19000.pwm")
     if alias is not None:
         globals()["PWME"] = GPIOX_16
-        globals()["PWMF"] = GPIOH_5
+        globals()["PWMF"] = GPIOX_7
         pwmOuts.append(((int(alias[-1]), 0), GPIOX_16))
-        pwmOuts.append(((int(alias[-1]), 1), GPIOH_5))
+        pwmOuts.append(((int(alias[-1]), 1), GPIOX_7))
     analogIns.append((37, 0, 2))
     analogIns.append((40, 0, 0))
 if board in ("ODROID_N2"):