From: BytEvil <itemcode@mail.ru>
Date: Fri, 18 Mar 2022 09:54:39 +0000 (+0400)
Subject: fixed some errors gpiod dependencies
X-Git-Tag: 7.2.0^2~7
X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/976917690f9220b5e9e151f9c09594ac6e366563

fixed some errors gpiod dependencies
---

diff --git a/src/adafruit_blinka/board/khadas/khadasvim3.py b/src/adafruit_blinka/board/khadas/khadasvim3.py
index 1811759..c3c79f2 100644
--- a/src/adafruit_blinka/board/khadas/khadasvim3.py
+++ b/src/adafruit_blinka/board/khadas/khadasvim3.py
@@ -54,13 +54,8 @@ GPIOE_0 = pin.GPIO508
 GPIOE_1 = pin.GPIO509
 GPIOE_2 = pin.GPIO510
 
-for it in pin.i2cPorts:
-    globals()["SCL" + str(it[0])] = it[1]
-    globals()["SDA" + str(it[0])] = it[2]
-
-# Set second i2c bus as default for backward compatibility.
-SCL = pin.i2cPorts[1][1]
-SDA = pin.i2cPorts[1][2]
+SCL = pin.GPIOX_18
+SDA = pin.GPIOX_17
 
 SCLK = pin.SPI0_SCLK
 MCLK0 = pin.SPI0_MCLK0
diff --git a/src/adafruit_blinka/microcontroller/amlogic/a311d/pin.py b/src/adafruit_blinka/microcontroller/amlogic/a311d/pin.py
index cdb8afd..5d5ed23 100644
--- a/src/adafruit_blinka/microcontroller/amlogic/a311d/pin.py
+++ b/src/adafruit_blinka/microcontroller/amlogic/a311d/pin.py
@@ -18,17 +18,14 @@ from adafruit_blinka.microcontroller.generic_linux.libgpiod_pin import Pin
 chip0 = gpiod.chip("0")
 chip1 = gpiod.chip("1")
 
-if chip0.num_lines() < 20:
+if chip0.num_lines < 20:
     aobus = 0
     periphs = 1
-    periphs_offset = chip1.num_lines() - 85
+    periphs_offset = chip1.num_lines - 85
 else:
     aobus = 1
     periphs = 0
-    periphs_offset = chip0.num_lines() - 85
-
-chip0.close()
-chip1.close()
+    periphs_offset = chip0.num_lines - 85
 
 GPIOAO_0 = GPIO496 = Pin((aobus, 0))
 GPIOAO_1 = GPIO497 = Pin((aobus, 1))
@@ -170,16 +167,10 @@ def get_dts_alias(device: str) -> str:
 # 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))
 
-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)
diff --git a/src/adafruit_blinka/microcontroller/generic_linux/libgpiod_pin.py b/src/adafruit_blinka/microcontroller/generic_linux/libgpiod_pin.py
index 4ed6135..e412926 100644
--- a/src/adafruit_blinka/microcontroller/generic_linux/libgpiod_pin.py
+++ b/src/adafruit_blinka/microcontroller/generic_linux/libgpiod_pin.py
@@ -31,10 +31,10 @@ class Pin:
         self.id = pin_id
         if isinstance(pin_id, tuple):
             self._num = int(pin_id[1])
-            self._chip = gpiod.Chip(str(pin_id[0]), gpiod.Chip.OPEN_BY_NUMBER)
+            self._chip = gpiod.chip(str(pin_id[0]), gpiod.chip.OPEN_BY_NUMBER)
         else:
             self._num = int(pin_id)
-            self._chip = gpiod.Chip("gpiochip0", gpiod.Chip.OPEN_BY_NAME)
+            self._chip = gpiod.chip("gpiochip0", gpiod.chip.OPEN_BY_NAME)
         self._line = None
 
     def __repr__(self):