From: Melissa LeBlanc-Williams <melissa@adafruit.com>
Date: Fri, 10 Jan 2020 22:04:35 +0000 (-0800)
Subject: Resolving merge conflict
X-Git-Tag: 3.7.0^2~2
X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/ff954c5a6e7d600ade50f235a50dab31dacaa250?hp=-c

Resolving merge conflict
---

ff954c5a6e7d600ade50f235a50dab31dacaa250
diff --combined src/board.py
index 5669a57,efa89ad..06f95ef
--- a/src/board.py
+++ b/src/board.py
@@@ -112,9 -112,9 +112,12 @@@ elif board_id == ap_board.BINHO_NOVA
  elif board_id == ap_board.MICROCHIP_MCP2221:
      from adafruit_blinka.board.microchip_mcp2221 import *
  
 +elif board_id == ap_board.SIFIVE_UNLEASHED:
 +    from adafruit_blinka.board.hifive_unleashed import *
 +
+ elif board_id == ap_board.PINE64:
+     from adafruit_blinka.board.pine64 import *
+ 
  elif "sphinx" in sys.modules:
      pass
  
diff --combined src/busio.py
index 4438d3e,3e85335..1053504
--- a/src/busio.py
+++ b/src/busio.py
@@@ -156,15 -156,18 +156,21 @@@ 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
          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
diff --combined src/digitalio.py
index 763854a,51c729e..29b77a1
--- a/src/digitalio.py
+++ b/src/digitalio.py
@@@ -33,8 -33,8 +33,10 @@@ elif detector.chip.APQ8016
      from adafruit_blinka.microcontroller.snapdragon.apq8016.pin import Pin
  elif detector.chip.IMX8MX:
      from adafruit_blinka.microcontroller.nxp_imx8m.pin import Pin
 +elif detector.chip.HFU540:
 +    from adafruit_blinka.microcontroller.hfu540.pin import Pin
+ elif detector.chip.A64:
+     from adafruit_blinka.microcontroller.allwinner.a64.pin import Pin
  elif detector.board.ftdi_ft232h:
      from adafruit_blinka.microcontroller.ft232h.pin import Pin
  elif detector.board.binho_nova:
diff --combined src/microcontroller/__init__.py
index a3838ef,4f5973f..f471f7f
--- a/src/microcontroller/__init__.py
+++ b/src/microcontroller/__init__.py
@@@ -48,10 -48,10 +48,12 @@@ elif chip_id == ap_chip.S922X
      from adafruit_blinka.microcontroller.amlogic.s922x.pin import *
  elif chip_id == ap_chip.APQ8016:
      from adafruit_blinka.microcontroller.snapdragon.apq8016.pin import *
+ 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 *
  else:
diff --combined src/microcontroller/pin.py
index 9f0a48a,3e4ca44..7e05247
--- a/src/microcontroller/pin.py
+++ b/src/microcontroller/pin.py
@@@ -32,13 -32,13 +32,15 @@@ elif chip_id == ap_chip.APQ8016
      from adafruit_blinka.microcontroller.snapdragon.apq8016.pin import *
  elif chip_id == ap_chip.IMX8MX:
      from adafruit_blinka.microcontroller.nxp_imx8m.pin import *
 +elif chip_id == ap_chip.HFU540:
 +    from adafruit_blinka.microcontroller.hfu540.pin import *
  elif chip_id == ap_chip.FT232H:
      from adafruit_blinka.microcontroller.ft232h.pin import *
  elif chip_id == ap_chip.BINHO:
      from adafruit_blinka.microcontroller.nova.pin import *
  elif chip_id == ap_chip.MCP2221:
      from adafruit_blinka.microcontroller.mcp2221.pin import *
+ elif chip_id == ap_chip.A64:
+     from adafruit_blinka.microcontroller.allwinner.a64.pin import *
  else:
      raise NotImplementedError("Microcontroller not supported: ", chip_id)