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

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

diff --git a/src/adafruit_blinka/microcontroller/atheros/__init__.py b/src/adafruit_blinka/microcontroller/atheros/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/adafruit_blinka/microcontroller/atheros/ar9331/__init__.py b/src/adafruit_blinka/microcontroller/atheros/ar9331/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/adafruit_blinka/microcontroller/atheros/ar9331/pin.py b/src/adafruit_blinka/microcontroller/atheros/ar9331/pin.py
new file mode 100644
index 0000000..96a7aab
--- /dev/null
+++ b/src/adafruit_blinka/microcontroller/atheros/ar9331/pin.py
@@ -0,0 +1,55 @@
+from adafruit_blinka.microcontroller.generic_linux.libgpiod_pin import Pin
+
+GPIO_0 = Pin((0, 0))
+GPIO_1 = Pin((0, 1))
+GPIO_2 = Pin((0, 2))
+GPIO_3 = Pin((0, 3))
+SPI_CLK = GPIO_3
+GPIO_4 = Pin((0, 4))
+SPI_MOSI = GPIO_4
+GPIO_5 = Pin((0, 5))
+SPI_MISO = GPIO_5
+GPIO_6 = Pin((0, 6))
+GPIO_7 = Pin((0, 7))
+GPIO_8 = Pin((0, 8))
+GPIO_9 = Pin((0, 9))
+UART0_RX = GPIO_9
+GPIO_10 = Pin((0, 10))
+UART0_TX = GPIO_10
+GPIO_11 = Pin((0, 11))
+GPIO_12 = Pin((0, 12))
+GPIO_13 = Pin((0, 13))
+GPIO_14 = Pin((0, 14))
+GPIO_15 = Pin((0, 15))
+GPIO_16 = Pin((0, 16))
+GPIO_17 = Pin((0, 17))
+GPIO_18 = Pin((0, 18))
+GPIO_19 = Pin((0, 19))
+GPIO_20 = Pin((0, 20))
+TWI0_SCL = GPIO_20
+
+GPIO_21 = Pin((0, 21))
+TWI0_SDA = GPIO_21
+GPIO_22 = Pin((0, 22))
+GPIO_23 = Pin((0, 23))
+GPIO_24 = Pin((0, 24))
+GPIO_25 = Pin((0, 25))
+GPIO_26 = Pin((0, 26))
+GPIO_27 = Pin((0, 27))
+GPIO_28 = Pin((0, 28))
+
+# ordered as i2cId, sclId, sdaId
+i2cPorts = (
+    (0, TWI0_SCL, TWI0_SDA)
+)
+
+# ordered as spiId, sckId, mosiId, misoId
+spiPorts = (
+    (1, SPI_CLK, SPI_MISO, SPI_MISO),
+)
+
+# ordered as uartId, txId, rxId
+uartPorts = (
+    (0, UART0_TX, UART0_RX)
+)
+
diff --git a/src/busio.py b/src/busio.py
index d5ae7c9..5439745 100755
--- a/src/busio.py
+++ b/src/busio.py
@@ -162,6 +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
diff --git a/src/digitalio.py b/src/digitalio.py
index 5dc7daf..6795b56 100755
--- a/src/digitalio.py
+++ b/src/digitalio.py
@@ -41,6 +41,8 @@ elif detector.chip.STM32:
     from machine import Pin
 elif detector.board.microchip_mcp2221:
     from adafruit_blinka.microcontroller.mcp2221.pin import Pin
+elif detector.board.pine64 or detector.board.pinebook or detector.board.pinephone:
+    from adafruit_blinka.microcontroller.allwinner.a64.pin import Pin
 from adafruit_blinka import Enum, ContextManaged
 
 class DriveMode(Enum):
diff --git a/src/microcontroller/pin.py b/src/microcontroller/pin.py
index ebe9cba..3e4ca44 100755
--- a/src/microcontroller/pin.py
+++ b/src/microcontroller/pin.py
@@ -38,5 +38,7 @@ 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)