Merge branch 'adafruit:main' into main

[Adafruit_Blinka-hackapet.git] / src / microcontroller / pin.py

diff --git a/src/microcontroller/pin.py b/src/microcontroller/pin.py
index 3ae84c5d05ac0c4d59d8ea9a07bf9fbd6c5b2cb9..115d71a2cd446127623aa910075dc9a4d8e05d2d 100644 (file)
--- a/src/microcontroller/pin.py
+++ b/src/microcontroller/pin.py
@@ -21,10 +21,9 @@ elif chip_id == ap_chip.BCM2XXX:
         "RASPBERRY_PI_400",
         "RASPBERRY_PI_CM4",
         "RASPBERRY_PI_CM4S",
         "RASPBERRY_PI_400",
         "RASPBERRY_PI_CM4",
         "RASPBERRY_PI_CM4S",

+        "RASPBERRY_PI_5",

     ):
         from adafruit_blinka.microcontroller.bcm2711.pin import *
     ):
         from adafruit_blinka.microcontroller.bcm2711.pin import *

-    elif board_id in ("RASPBERRY_PI_5",):
-        from adafruit_blinka.microcontroller.bcm2712.pin import *

     else:
         from adafruit_blinka.microcontroller.bcm283x.pin import *
 elif chip_id == ap_chip.DRA74X:
     else:
         from adafruit_blinka.microcontroller.bcm283x.pin import *
 elif chip_id == ap_chip.DRA74X:


@@ -35,6 +34,8 @@ elif chip_id == ap_chip.AM65XX:
     from adafruit_blinka.microcontroller.am65xx.pin import *
 elif chip_id == ap_chip.JH71X0:
     from adafruit_blinka.microcontroller.starfive.JH71x0.pin import *
     from adafruit_blinka.microcontroller.am65xx.pin import *
 elif chip_id == ap_chip.JH71X0:
     from adafruit_blinka.microcontroller.starfive.JH71x0.pin import *

+elif chip_id == ap_chip.JH7110:
+       from adafruit_blinka.microcontroller.starfive.JH7110.pin import *

 elif chip_id == ap_chip.SUN4I:
     from adafruit_blinka.microcontroller.allwinner.a20.pin import *
 elif chip_id == ap_chip.SUN7I:
 elif chip_id == ap_chip.SUN4I:
     from adafruit_blinka.microcontroller.allwinner.a20.pin import *
 elif chip_id == ap_chip.SUN7I: