]> Repositories - Adafruit_Blinka-hackapet.git/commitdiff
Fix issue where meson_g12_common pin failed on older libgpiod
authorMelissa LeBlanc-Williams <melissa@adafruit.com>
Tue, 12 Sep 2023 22:22:45 +0000 (15:22 -0700)
committerMelissa LeBlanc-Williams <melissa@adafruit.com>
Tue, 12 Sep 2023 22:22:45 +0000 (15:22 -0700)
src/adafruit_blinka/microcontroller/amlogic/meson_g12_common/pin.py

index 87f45719ac1918e5e98c40bc23cff1b71e97c931..1f9fa3c941d76b3041cdca35260eff73e2f52ee4 100644 (file)
@@ -30,15 +30,24 @@ else:
     chip0 = gpiod.chip("0")
     chip1 = gpiod.chip("1")
 
     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
     aobus = 0
     periphs = 1
-    periphs_offset = chip1.num_lines - 85
+    periphs_offset = chip1lines - 85
 else:
     aobus = 1
     periphs = 0
 else:
     aobus = 1
     periphs = 0
-    periphs_offset = chip0.num_lines - 85
+    periphs_offset = chip0lines - 85
 
 del chip0
 del chip1
 
 del chip0
 del chip1