From 5322eee8c4cd92d9b0f14c65082a7d18fd68ce88 Mon Sep 17 00:00:00 2001 From: Melissa LeBlanc-Williams Date: Tue, 12 Sep 2023 15:22:45 -0700 Subject: [PATCH] Fix issue where meson_g12_common pin failed on older libgpiod --- .../amlogic/meson_g12_common/pin.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) 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 -- 2.49.0