From: Melissa LeBlanc-Williams <melissa@adafruit.com>
Date: Thu, 9 Jan 2020 23:29:36 +0000 (-0800)
Subject: Merge branch 'AllWinner_refactor' of https://github.com/yeyeto2788/Adafruit_Blinka... 
X-Git-Tag: 3.4.0^2^2~1
X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/104bf0c9e9985b7c12329d9fa74a90a8671290b1?ds=inline;hp=-c

Merge branch 'AllWinner_refactor' of https://github.com/yeyeto2788/Adafruit_Blinka into pine64
---

104bf0c9e9985b7c12329d9fa74a90a8671290b1
diff --combined src/busio.py
index d5ae7c9,e3dacad..5439745
--- a/src/busio.py
+++ b/src/busio.py
@@@ -25,8 -25,6 +25,8 @@@ class I2C(Lockable)
              return
          elif detector.board.binho_nova:
              from adafruit_blinka.microcontroller.nova.i2c import I2C
 +            self._i2c = I2C(frequency=frequency)
 +            return
          elif detector.board.microchip_mcp2221:
              from adafruit_blinka.microcontroller.mcp2221.i2c import I2C
              self._i2c = I2C(frequency=frequency)
@@@ -162,6 -160,9 +162,9 @@@ class SPI(Lockable)
          elif detector.board.binho_nova:
              from adafruit_blinka.microcontroller.nova.spi import SPI as _SPI
              from adafruit_blinka.microcontroller.nova.pin import Pin
+         elif board_id == ap_board.PINE64 or board_id == ap_board.PINEBOOK or board_id == ap_board.PINEPHONE:
+             from adafruit_blinka.microcontroller.allwinner.a64.pin import Pin
+             from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
          else:
              from machine import SPI as _SPI
              from machine import Pin