From: Scott Shawcroft <scott@adafruit.com>
Date: Wed, 13 Sep 2023 16:44:28 +0000 (-0700)
Subject: Merge pull request #709 from makermelissa/libgpiod-fix
X-Git-Tag: 8.22.2~1
X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/7fdba4a9dd49125e50bcf76266eb337f6ef93c2e?hp=e8d8564d3b02d9654f35fb7236d8c3b284afe6e3

Merge pull request #709 from makermelissa/libgpiod-fix

Fix issue where meson_g12_common pin failed on older libgpiod
---

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 87f4571..1f9fa3c 100644
--- a/src/adafruit_blinka/microcontroller/amlogic/meson_g12_common/pin.py
+++ b/src/adafruit_blinka/microcontroller/amlogic/meson_g12_common/pin.py
@@ -30,15 +30,24 @@ 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
 
-if chip0.num_lines < 20:
+if chip0lines < 20:
     aobus = 0
     periphs = 1
-    periphs_offset = chip1.num_lines - 85
+    periphs_offset = chip1lines - 85
 else:
     aobus = 1
     periphs = 0
-    periphs_offset = chip0.num_lines - 85
+    periphs_offset = chip0lines - 85
 
 del chip0
 del chip1