Merge pull request #655 from Iainrach/LePotatoPatch

Le potato patch

diff --git a/src/adafruit_blinka/board/librecomputer/aml_s905x_cc_v1.py b/src/adafruit_blinka/board/librecomputer/aml_s905x_cc_v1.py
index e84812cc7a7282a1e75d4e90c93af5c959bf884b..0ce256371e419bba40753eb97dba90350aa6a405 100644 (file)
--- a/src/adafruit_blinka/board/librecomputer/aml_s905x_cc_v1.py
+++ b/src/adafruit_blinka/board/librecomputer/aml_s905x_cc_v1.py
@@ -12,10 +12,10 @@ for it in pin.i2cPorts:
 SCL = pin.i2cPorts[0][1]
 SDA = pin.i2cPorts[0][2]
 
-SCLK = pin.SPI1_SCLK
-MOSI = pin.SPI1_MOSI
-MISO = pin.SPI1_MISO
-SPI_CS = pin.SPI1_CS
+SCLK = pin.SPI0_SCLK
+MOSI = pin.SPI0_MOSI
+MISO = pin.SPI0_MISO
+SPI_CS = pin.SPI0_CS
 
 # Pinout reference:
 # https://github.com/libre-computer-project/libretech-wiring-tool/blob/master/libre-computer/aml-s905x-cc/gpio.map

diff --git a/src/adafruit_blinka/microcontroller/amlogic/s905x/pin.py b/src/adafruit_blinka/microcontroller/amlogic/s905x/pin.py
index a2ff1947281797486bf1027204afe3a22c38d02e..ea6b51e57b8c4eb325590cd1132af22b726c0b0b 100644 (file)
--- a/src/adafruit_blinka/microcontroller/amlogic/s905x/pin.py
+++ b/src/adafruit_blinka/microcontroller/amlogic/s905x/pin.py
@@ -53,6 +53,10 @@ UART1_TX = GPIO287
 UART2_RX = GPIO292
 UART2_TX = GPIO291
 
+SPI0_SCLK = GPIO290
+SPI0_MISO = GPIO288
+SPI0_MOSI = GPIO287
+SPI0_CS = GPIO289
 SPI1_SCLK = GPIO223
 SPI1_MISO = GPIO288
 SPI1_MOSI = GPIO287
@@ -63,7 +67,7 @@ i2cPorts = (
     (1, I2C1_SCK, I2C1_SDA),
 )
 
-spiPorts = (0, SPI1_SCLK, SPI1_MOSI, SPI1_MISO)
+spiPorts = ((0, SPI0_SCLK, SPI0_MOSI, SPI0_MISO), (1, SPI1_SCLK, SPI1_MOSI, SPI1_MISO))
 
 uartPorts = (
     (1, UART1_TX, UART1_RX),