From: Melissa LeBlanc-Williams <melissa@adafruit.com>
Date: Wed, 22 Jan 2020 18:13:33 +0000 (-0800)
Subject: Merged master
X-Git-Tag: 3.7.0^2
X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/a2a3e0abcbd42560b7ea167735d833dc3a4f4168

Merged master
---

a2a3e0abcbd42560b7ea167735d833dc3a4f4168
diff --cc src/busio.py
index 1053504,4708e78..79e9882
--- a/src/busio.py
+++ b/src/busio.py
@@@ -156,12 -156,6 +156,9 @@@ class SPI(Lockable)
          elif board_id == ap_board.JETSON_XAVIER:
              from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
              from adafruit_blinka.microcontroller.tegra.t194.pin import Pin
 +        elif detector.board.SIFIVE_UNLEASHED:
 +            from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
 +            from adafruit_blinka.microcontroller.hfu540.pin import Pin
-         elif board_id == ap_board.PINE64:
-             from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
-             from adafruit_blinka.microcontroller.allwinner.a64.pin import Pin
          elif detector.board.ftdi_ft232h:
              from adafruit_blinka.microcontroller.ft232h.spi import SPI as _SPI
              from adafruit_blinka.microcontroller.ft232h.pin import Pin
diff --cc src/microcontroller/__init__.py
index f471f7f,538f66c..108d527
--- a/src/microcontroller/__init__.py
+++ b/src/microcontroller/__init__.py
@@@ -52,9 -52,9 +52,11 @@@ elif chip_id == ap_chip.A64
      from adafruit_blinka.microcontroller.allwinner.a64.pin import *
  elif chip_id == ap_chip.IMX8MX:
      from adafruit_blinka.microcontroller.nxp_imx8m import *
 +elif chip_id == ap_chip.HFU540:
 +    from adafruit_blinka.microcontroller.hfu540.pin import *
  elif chip_id == ap_chip.BINHO:
      from adafruit_blinka.microcontroller.nova import *
+ elif chip_id == ap_chip.MIPS24KC:
+     from adafruit_blinka.microcontroller.atheros.ar9331.pin import *
  else:
      raise NotImplementedError("Microcontroller not supported:", chip_id)