From: brentrubell <brentru@users.noreply.github.com>
Date: Mon, 3 Jun 2019 15:59:15 +0000 (-0400)
Subject: Merge pull request #117 from Groboards/master
X-Git-Tag: 1.3.4~1
X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/1835dbc43476bcda32b34418eae30f1f7c5705a3?hp=e9a63ce0eb0a76b938b23ebe068ac08fd7134d41

Merge pull request #117 from Groboards/master

Fix for sysfs PWM `Invalid argument` write error when trying to setup the device.
---

diff --git a/src/adafruit_blinka/board/orangepir1.py b/src/adafruit_blinka/board/orangepir1.py
new file mode 100644
index 0000000..9319450
--- /dev/null
+++ b/src/adafruit_blinka/board/orangepir1.py
@@ -0,0 +1,37 @@
+"""Pin definitions for the Orange Pi R1."""
+
+from adafruit_blinka.microcontroller.allwinner_h3 import pin
+
+PA12 = pin.PA12
+SDA = pin.PA12
+PA11 = pin.PA11
+SCL = pin.PA11
+PA6 = pin.PA6
+PWM1 = pin.PA6
+PA1 = pin.PA1
+UART2_RX = pin.PA1
+PA0 = pin.PA0
+UART2_TX = pin.PA0
+PA3 = pin.PA3
+UART2_CTS = pin.PA3
+PA19 = pin.PA19
+TWI1_SDA = pin.PA19
+PA7 = pin.PA7
+PA10 = pin.PA10
+
+PA13 = pin.PA13
+SPI1_CS = pin.PA13
+PA14 = pin.PA14
+SPI1_CLK = pin.PA14
+PA2 = pin.PA2
+UART2_RTS = pin.PA2
+PA18 = pin.PA18
+TWI1_SCK = pin.PA18
+PG6 = pin.PG6
+UART1_TX = pin.PG6
+PG7 = pin.PG7
+UART1_RX = pin.PG7
+
+SCLK = pin.PA14
+MOSI = pin.PA15
+MISO = pin.PA16
diff --git a/src/adafruit_blinka/microcontroller/allwinner_h3/pin.py b/src/adafruit_blinka/microcontroller/allwinner_h3/pin.py
index ba43379..f2ed8c0 100644
--- a/src/adafruit_blinka/microcontroller/allwinner_h3/pin.py
+++ b/src/adafruit_blinka/microcontroller/allwinner_h3/pin.py
@@ -19,8 +19,11 @@ PA13 = Pin(13)
 UART3_TX = PA13
 PA14 = Pin(14)
 UART3_RX = PA14
+SPI1_SCLK = PA14
 PA15 = Pin(15)
+SPI1_MOSI = PA15
 PA16 = Pin(16)
+SPI1_MISO = PA16
 PA17 = Pin(17)
 PA18 = Pin(18)
 PA19 = Pin(19)
@@ -54,6 +57,6 @@ PG13 = Pin(205)
 
 i2cPorts = ( (0, TWI0_SCL, TWI0_SDA), )
 # ordered as spiId, sckId, mosiId, misoId
-spiPorts = ( (0, SPI0_SCLK, SPI0_MOSI, SPI0_MISO), )
+spiPorts = ( (0, SPI0_SCLK, SPI0_MOSI, SPI0_MISO), (1, SPI1_SCLK, SPI1_MOSI, SPI1_MISO), )
 # ordered as uartId, txId, rxId
 uartPorts = ( (3, UART3_TX, UART3_RX), )
diff --git a/src/board.py b/src/board.py
index babc5e9..9732e4e 100755
--- a/src/board.py
+++ b/src/board.py
@@ -61,6 +61,9 @@ elif board_id == ap_board.BEAGLEBONE_POCKETBEAGLE:
 elif board_id == ap_board.ORANGE_PI_PC:
     from adafruit_blinka.board.orangepipc import *
 
+elif board_id == ap_board.ORANGE_PI_R1:
+    from adafruit_blinka.board.orangepir1 import *
+
 elif board_id == ap_board.GIANT_BOARD:
     from adafruit_blinka.board.giantboard import *