Resolving merge conflict

diff --cc src/board.py
index 5669a5735edbd6e443f2debf80ddf686cdc9dd4a,efa89adef611316b6a047d9a88b7fca70c745ced..06f95efc1e2b10def07ebca222779a9a0a0a029c
--- 1/src/board.py
--- 2/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 --cc src/busio.py
index 4438d3ea7b7b7c11faea6f5b9384f096ac038c7d,3e85335917252d083d99fdb41e7338f0d2362209..10535043154397227b44d486e2df7a3e1df8b521
--- 1/src/busio.py
--- 2/src/busio.py
+++ b/src/busio.py
@@@ -156,9 -156,9 +156,12 @@@ 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/digitalio.py
index 763854a85fd57d2ecd801e1755ba0be3318ded48,51c729e17a5999dfc70b31d2063d93c426f46557..29b77a1a4a629a6251a982e6888c168b32e92582
--- 1/src/digitalio.py
--- 2/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 --cc src/microcontroller/__init__.py
index a3838eff055d180315116c852acfa44ee5db436f,4f5973fc8be913bcbf37fb70c4e29300fb98700c..f471f7f9c8785114cbc0f556aa854a9227a10bc1
--- 1/src/microcontroller/__init__.py
--- 2/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 --cc src/microcontroller/pin.py
Simple merge