Merge pull request #456 from twa127/master

Fix for Allwinner H6 PL8 and PL9 pin definitions, see #453 + Fix for Allwinner H616 SPI CLK naming

diff --git a/src/adafruit_blinka/microcontroller/allwinner/h6/pin.py b/src/adafruit_blinka/microcontroller/allwinner/h6/pin.py
index af944e3f16f4116cdcb37f4df504cf216ee8249b..7b0a72336df60fe27d5c0da0939dbb88f9d928dc 100644 (file)
--- a/src/adafruit_blinka/microcontroller/allwinner/h6/pin.py
+++ b/src/adafruit_blinka/microcontroller/allwinner/h6/pin.py
@@ -39,8 +39,8 @@ SPI1_MISO = PH6
 PH8 = Pin((1, 230))
 PH9 = Pin((1, 231))
 
-PL8 = Pin((1, 360))
-PL9 = Pin((1, 361))
+PL8 = Pin((0, 8))
+PL9 = Pin((0, 9))
 
 i2cPorts = ((0, TWI0_SCL, TWI0_SDA),)
 spiPorts = ((0, SPI1_SCLK, SPI1_MOSI, SPI1_MISO),)

diff --git a/src/adafruit_blinka/microcontroller/allwinner/h616/pin.py b/src/adafruit_blinka/microcontroller/allwinner/h616/pin.py
index 160aee203540dde644eeec93545a3a01822d16cf..5c046d1a0184485283032f1cf8e80462feb80e64 100644 (file)
--- a/src/adafruit_blinka/microcontroller/allwinner/h616/pin.py
+++ b/src/adafruit_blinka/microcontroller/allwinner/h616/pin.py
@@ -2,7 +2,7 @@
 from adafruit_blinka.microcontroller.generic_linux.libgpiod_pin import Pin
 
 PC0 = Pin((1, 64))
-SPI0_CLK = PC0
+SPI0_SCLK = PC0
 PC1 = Pin((1, 65))
 PC2 = Pin((1, 66))
 SPI0_MOSI = PC2
@@ -65,7 +65,7 @@ TWI3_SDA = PH5
 SPI1_CS0 = PH5
 PH6 = Pin((1, 230))
 UART2_RX = PH6
-SPI1_CLK = PH6
+SPI1_SCLK = PH6
 PH7 = Pin((1, 231))
 SPI1_MOSI = PH7
 PH8 = Pin((1, 232))
@@ -95,8 +95,8 @@ PI16 = Pin((1, 272))
 i2cPorts = ((3, TWI3_SCL, TWI3_SDA),)
 # ordered as spiId, sckId, mosiId, misoId
 spiPorts = (
-    (0, SPI0_CLK, SPI0_MOSI, SPI0_MISO),
-    (1, SPI1_CLK, SPI1_MOSI, SPI1_MISO),
+    (0, SPI0_SCLK, SPI0_MOSI, SPI0_MISO),
+    (1, SPI1_SCLK, SPI1_MOSI, SPI1_MISO),
 )
 # ordered as uartId, txId, rxId
 uartPorts = (