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?hp=a168b41a338d78869ddd29e63f638de96bcb647b

Merge branch 'master' into master
---

diff --git a/src/busio.py b/src/busio.py
index c9b845e..2bf81b7 100755
--- a/src/busio.py
+++ b/src/busio.py
@@ -276,6 +276,9 @@ class SPI(Lockable):
             ap_board.SOPINE,
         ):
             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.generic_linux.spi import SPI as _SPI
         elif board_id == ap_board.ONION_OMEGA2:
diff --git a/src/microcontroller/__init__.py b/src/microcontroller/__init__.py
index 2057a7f..1855a35 100755
--- a/src/microcontroller/__init__.py
+++ b/src/microcontroller/__init__.py
@@ -55,6 +55,8 @@ elif chip_id == ap_chip.SUN8I:
     from adafruit_blinka.microcontroller.allwinner.h3 import *
 elif chip_id == ap_chip.H5:
     from adafruit_blinka.microcontroller.allwinner.h5.pin import *
+elif chip_id == ap_chip.H6:
+    from adafruit_blinka.microcontroller.allwinner.h6.pin import *
 elif chip_id == ap_chip.H616:
     from adafruit_blinka.microcontroller.allwinner.h616.pin import *
 elif chip_id == ap_chip.SAMA5:
diff --git a/src/microcontroller/pin.py b/src/microcontroller/pin.py
index 4916c19..2966087 100755
--- a/src/microcontroller/pin.py
+++ b/src/microcontroller/pin.py
@@ -22,6 +22,8 @@ elif chip_id == ap_chip.SUN8I:
     from adafruit_blinka.microcontroller.allwinner.h3.pin import *
 elif chip_id == ap_chip.H5:
     from adafruit_blinka.microcontroller.allwinner.h5.pin import *
+elif chip_id == ap_chip.H6:
+    from adafruit_blinka.microcontroller.allwinner.h6.pin import *
 elif chip_id == ap_chip.H616:
     from adafruit_blinka.microcontroller.allwinner.h616.pin import *
 elif chip_id == ap_chip.SAMA5: