From: Melissa LeBlanc-Williams <melissa@adafruit.com>
Date: Mon, 10 May 2021 02:04:08 +0000 (-0700)
Subject: Merge branch 'master' into master
X-Git-Tag: 6.8.2^2~1
X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/b59190f7874a0769a4d3d17303392843b52ea43c

Merge branch 'master' into master
---

b59190f7874a0769a4d3d17303392843b52ea43c
diff --cc src/busio.py
index e961236,c9b845e..2bf81b7
--- a/src/busio.py
+++ b/src/busio.py
@@@ -288,19 -275,12 +275,15 @@@ class SPI(Lockable)
              ap_board.PINEPHONE,
              ap_board.SOPINE,
          ):
-             from adafruit_blinka.microcontroller.allwinner.a64.pin import Pin
              from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
 +        elif board_id == ap_board.PINEH64:
 +            from adafruit_blinka.microcontroller.allwinner.h6.pin import Pin
 +            from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
          elif board_id == ap_board.CLOCKWORK_CPI3:
-             from adafruit_blinka.microcontroller.allwinner.a33.pin import Pin
              from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
          elif board_id == ap_board.ONION_OMEGA2:
-             from adafruit_blinka.microcontroller.mips24kec.pin import Pin
              from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
          elif detector.board.any_lubancat and detector.chip.id == ap_chip.IMX6ULL:
-             from adafruit_blinka.microcontroller.nxp_imx6ull.pin import Pin
              from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
          elif detector.board.pico_u2if:
              from adafruit_blinka.microcontroller.pico_u2if.spi import SPI as _SPI