Merge branch 'main' of https://github.com/adafruit/Adafruit_Blinka

diff --git a/src/adafruit_blinka/board/pine64/__init__.py b/src/adafruit_blinka/board/pine64/__init__.py
new file mode 100644 (file)
index 0000000..7b901ef
--- /dev/null
+++ b/src/adafruit_blinka/board/pine64/__init__.py
@@ -0,0 +1,4 @@
+# SPDX-FileCopyrightText: 2024 Chris Brown
+#
+# SPDX-License-Identifier: MIT
+"""Board definitions from Pine64"""

diff --git a/src/adafruit_blinka/board/pine64.py b/src/adafruit_blinka/board/pine64/pine64.py
similarity index 100%
rename from src/adafruit_blinka/board/pine64.py
rename to src/adafruit_blinka/board/pine64/pine64.py

diff --git a/src/adafruit_blinka/board/pine64/quartz64_a.py b/src/adafruit_blinka/board/pine64/quartz64_a.py
new file mode 100644 (file)
index 0000000..1eaa05c
--- /dev/null
+++ b/src/adafruit_blinka/board/pine64/quartz64_a.py
@@ -0,0 +1,32 @@
+# SPDX-FileCopyrightText: 2024 Chris Brown
+#
+# SPDX-License-Identifier: MIT
+"""Pin definitions for the Pine64 Quartz64 Model A."""
+
+from adafruit_blinka.microcontroller.rockchip.rk3566 import pin
+
+I2C3_SDA_M0 = pin.I2C3_SDA_M0
+I2C3_SCL_M0 = pin.I2C3_SCL_M0
+UART2_TX_M0_DEBUG = pin.UART2_TX
+UART2_RX_M0_DEBUG = pin.UART2_RX
+SPI1_MOSI_M1 = pin.SPI1_MOSI_M1
+SPI1_MISO_M1 = pin.SPI1_MISO_M1
+SPI1_CLK_M1 = pin.SPI1_CLK_M1
+SPI1_CS0_M1 = pin.SPI1_CS0_M1
+UART0_TX = pin.UART0_TX
+UART0_RX = pin.UART0_RX
+CPU_REFCLK_OUT = pin.CPU_REFCLK_OUT
+
+# Default UART
+TX = UART0_TX
+RX = UART0_RX
+
+# Default I2C
+SCL = I2C3_SCL_M0
+SDA = I2C3_SDA_M0
+
+# Default SPI
+SCLK = SPI1_CLK_M1
+MOSI = SPI1_MOSI_M1
+MISO = SPI1_MISO_M1
+CS = SPI1_CS0_M1

diff --git a/src/adafruit_blinka/microcontroller/rockchip/rk3308/pin.py b/src/adafruit_blinka/microcontroller/rockchip/rk3308/pin.py
index 24b0c40dd37ddf13f643ba7e125ed46d31701152..9c1c3332e463591cc3578246b757625ed5a9de3f 100644 (file)
--- a/src/adafruit_blinka/microcontroller/rockchip/rk3308/pin.py
+++ b/src/adafruit_blinka/microcontroller/rockchip/rk3308/pin.py
@@ -3,136 +3,169 @@
 # SPDX-License-Identifier: MIT
 """A Pin class for use with Rockchip RK3308."""
 
-from adafruit_blinka.microcontroller.generic_linux.sysfs_pin import Pin
+from adafruit_blinka.microcontroller.generic_linux.libgpiod_pin import Pin
+
+GPIO0_A0 = Pin((0, 0))
+GPIO0_A1 = Pin((0, 1))
+GPIO0_A2 = Pin((0, 2))
+GPIO0_A3 = Pin((0, 3))
+GPIO0_A4 = Pin((0, 4))
+GPIO0_A5 = Pin((0, 5))
+GPIO0_A6 = Pin((0, 6))
+GPIO0_A7 = Pin((0, 7))
+GPIO0_B0 = Pin((0, 8))
+GPIO0_B1 = Pin((0, 9))
+GPIO0_B2 = Pin((0, 10))
+GPIO0_B3 = Pin((0, 11))
+GPIO0_B4 = Pin((0, 12))
+GPIO0_B5 = Pin((0, 13))
+GPIO0_B6 = Pin((0, 14))
+GPIO0_B7 = Pin((0, 15))
+GPIO0_C0 = Pin((0, 16))
+GPIO0_C1 = Pin((0, 17))
+GPIO0_C2 = Pin((0, 18))
+GPIO0_C3 = Pin((0, 19))
+GPIO0_C4 = Pin((0, 20))
+GPIO0_C5 = Pin((0, 21))
+GPIO0_C6 = Pin((0, 22))
+GPIO0_C7 = Pin((0, 23))
+GPIO0_D0 = Pin((0, 24))
+GPIO0_D1 = Pin((0, 25))
+GPIO0_D2 = Pin((0, 26))
+GPIO0_D3 = Pin((0, 27))
+GPIO0_D4 = Pin((0, 28))
+GPIO0_D5 = Pin((0, 29))
+GPIO0_D6 = Pin((0, 30))
+GPIO0_D7 = Pin((0, 31))
+GPIO1_A0 = Pin((1, 0))
+GPIO1_A1 = Pin((1, 1))
+GPIO1_A2 = Pin((1, 2))
+GPIO1_A3 = Pin((1, 3))
+GPIO1_A4 = Pin((1, 4))
+GPIO1_A5 = Pin((1, 5))
+GPIO1_A6 = Pin((1, 6))
+GPIO1_A7 = Pin((1, 7))
+GPIO1_B0 = Pin((1, 8))
+GPIO1_B1 = Pin((1, 9))
+GPIO1_B2 = Pin((1, 10))
+GPIO1_B3 = Pin((1, 11))
+GPIO1_B4 = Pin((1, 12))
+GPIO1_B5 = Pin((1, 13))
+GPIO1_B6 = Pin((1, 14))
+GPIO1_B7 = Pin((1, 15))
+GPIO1_C0 = Pin((1, 16))
+GPIO1_C1 = Pin((1, 17))
+GPIO1_C2 = Pin((1, 18))
+GPIO1_C3 = Pin((1, 19))
+GPIO1_C4 = Pin((1, 20))
+GPIO1_C5 = Pin((1, 21))
+GPIO1_C6 = Pin((1, 22))
+GPIO1_C7 = Pin((1, 23))
+GPIO1_D0 = Pin((1, 24))
+GPIO1_D1 = Pin((1, 25))
+GPIO1_D2 = Pin((1, 26))
+GPIO1_D3 = Pin((1, 27))
+GPIO1_D4 = Pin((1, 28))
+GPIO1_D5 = Pin((1, 29))
+GPIO1_D6 = Pin((1, 30))
+GPIO1_D7 = Pin((1, 31))
+GPIO2_A0 = Pin((2, 0))
+GPIO2_A1 = Pin((2, 1))
+GPIO2_A2 = Pin((2, 2))
+GPIO2_A3 = Pin((2, 3))
+GPIO2_A4 = Pin((2, 4))
+GPIO2_A5 = Pin((2, 5))
+GPIO2_A6 = Pin((2, 6))
+GPIO2_A7 = Pin((2, 7))
+GPIO2_B0 = Pin((2, 8))
+GPIO2_B1 = Pin((2, 9))
+GPIO2_B2 = Pin((2, 10))
+GPIO2_B3 = Pin((2, 11))
+GPIO2_B4 = Pin((2, 12))
+GPIO2_B5 = Pin((2, 13))
+GPIO2_B6 = Pin((2, 14))
+GPIO2_B7 = Pin((2, 15))
+GPIO2_C0 = Pin((2, 16))
+GPIO2_C1 = Pin((2, 17))
+GPIO2_C2 = Pin((2, 18))
+GPIO2_C3 = Pin((2, 19))
+GPIO2_C4 = Pin((2, 20))
+GPIO2_C5 = Pin((2, 21))
+GPIO2_C6 = Pin((2, 22))
+GPIO2_C7 = Pin((2, 23))
+GPIO2_D0 = Pin((2, 24))
+GPIO2_D1 = Pin((2, 25))
+GPIO2_D2 = Pin((2, 26))
+GPIO2_D3 = Pin((2, 27))
+GPIO2_D4 = Pin((2, 28))
+GPIO2_D5 = Pin((2, 29))
+GPIO2_D6 = Pin((2, 30))
+GPIO2_D7 = Pin((2, 31))
+GPIO3_A0 = Pin((3, 0))
+GPIO3_A1 = Pin((3, 1))
+GPIO3_A2 = Pin((3, 2))
+GPIO3_A3 = Pin((3, 3))
+GPIO3_A4 = Pin((3, 4))
+GPIO3_A5 = Pin((3, 5))
+GPIO3_A6 = Pin((3, 6))
+GPIO3_A7 = Pin((3, 7))
+GPIO3_B0 = Pin((3, 8))
+GPIO3_B1 = Pin((3, 9))
+GPIO3_B2 = Pin((3, 10))
+GPIO3_B3 = Pin((3, 11))
+GPIO3_B4 = Pin((3, 12))
+GPIO3_B5 = Pin((3, 13))
+GPIO3_B6 = Pin((3, 14))
+GPIO3_B7 = Pin((3, 15))
+GPIO3_C0 = Pin((3, 16))
+GPIO3_C1 = Pin((3, 17))
+GPIO3_C2 = Pin((3, 18))
+GPIO3_C3 = Pin((3, 19))
+GPIO3_C4 = Pin((3, 20))
+GPIO3_C5 = Pin((3, 21))
+GPIO3_C6 = Pin((3, 22))
+GPIO3_C7 = Pin((3, 23))
+GPIO3_D0 = Pin((3, 24))
+GPIO3_D1 = Pin((3, 25))
+GPIO3_D2 = Pin((3, 26))
+GPIO3_D3 = Pin((3, 27))
+GPIO3_D4 = Pin((3, 28))
+GPIO3_D5 = Pin((3, 29))
+GPIO3_D6 = Pin((3, 30))
+GPIO3_D7 = Pin((3, 31))
+GPIO4_A0 = Pin((4, 0))
+GPIO4_A1 = Pin((4, 1))
+GPIO4_A2 = Pin((4, 2))
+GPIO4_A3 = Pin((4, 3))
+GPIO4_A4 = Pin((4, 4))
+GPIO4_A5 = Pin((4, 5))
+GPIO4_A6 = Pin((4, 6))
+GPIO4_A7 = Pin((4, 7))
+GPIO4_B0 = Pin((4, 8))
+GPIO4_B1 = Pin((4, 9))
+GPIO4_B2 = Pin((4, 10))
+GPIO4_B3 = Pin((4, 11))
+GPIO4_B4 = Pin((4, 12))
+GPIO4_B5 = Pin((4, 13))
+GPIO4_B6 = Pin((4, 14))
+GPIO4_B7 = Pin((4, 15))
+GPIO4_C0 = Pin((4, 16))
+GPIO4_C1 = Pin((4, 17))
+GPIO4_C2 = Pin((4, 18))
+GPIO4_C3 = Pin((4, 19))
+GPIO4_C4 = Pin((4, 20))
+GPIO4_C5 = Pin((4, 21))
+GPIO4_C6 = Pin((4, 22))
+GPIO4_C7 = Pin((4, 23))
+GPIO4_D0 = Pin((4, 24))
+GPIO4_D1 = Pin((4, 25))
+GPIO4_D2 = Pin((4, 26))
+GPIO4_D3 = Pin((4, 27))
+GPIO4_D4 = Pin((4, 28))
+GPIO4_D5 = Pin((4, 29))
+GPIO4_D6 = Pin((4, 30))
+GPIO4_D7 = Pin((4, 31))
 
-GPIO0_A0 = Pin(0)
-GPIO0_A1 = Pin(1)
-GPIO0_A2 = Pin(2)
-GPIO0_A3 = Pin(3)
-GPIO0_A4 = Pin(4)
-GPIO0_A5 = Pin(5)
-GPIO0_A6 = Pin(6)
-GPIO0_A7 = Pin(7)
-GPIO0_B0 = Pin(8)
-GPIO0_B1 = Pin(9)
-GPIO0_B2 = Pin(10)
-GPIO0_B3 = Pin(11)
-GPIO0_B4 = Pin(12)
-GPIO0_B5 = Pin(13)
-GPIO0_B6 = Pin(14)
-GPIO0_B7 = Pin(15)
-GPIO0_C0 = Pin(16)
-GPIO0_C1 = Pin(17)
-GPIO0_C2 = Pin(18)
-GPIO0_C3 = Pin(19)
-GPIO0_C4 = Pin(20)
-GPIO0_C5 = Pin(21)
-GPIO0_C6 = Pin(22)
-GPIO0_C7 = Pin(23)
-GPIO0_D0 = Pin(24)
-GPIO0_D1 = Pin(25)
-GPIO0_D2 = Pin(26)
-GPIO0_D3 = Pin(27)
-GPIO0_D4 = Pin(28)
-GPIO0_D5 = Pin(29)
-GPIO0_D6 = Pin(30)
-GPIO0_D7 = Pin(31)
-GPIO1_A0 = Pin(32)
-GPIO1_A1 = Pin(33)
-GPIO1_A2 = Pin(34)
-GPIO1_A3 = Pin(35)
-GPIO1_A4 = Pin(36)
-GPIO1_A5 = Pin(37)
-GPIO1_A6 = Pin(38)
-GPIO1_A7 = Pin(39)
-GPIO1_B0 = Pin(40)
-GPIO1_B1 = Pin(41)
-GPIO1_B2 = Pin(42)
-GPIO1_B3 = Pin(43)
-GPIO1_B4 = Pin(44)
-GPIO1_B5 = Pin(45)
-GPIO1_B6 = Pin(46)
-GPIO1_B7 = Pin(47)
-GPIO1_C0 = Pin(48)
-GPIO1_C1 = Pin(49)
-GPIO1_C2 = Pin(50)
-GPIO1_C3 = Pin(51)
-GPIO1_C4 = Pin(52)
-GPIO1_C5 = Pin(53)
-GPIO1_C6 = Pin(54)
-GPIO1_C7 = Pin(55)
-GPIO1_D0 = Pin(56)
-GPIO1_D1 = Pin(57)
-GPIO1_D2 = Pin(58)
-GPIO1_D3 = Pin(59)
-GPIO1_D4 = Pin(60)
-GPIO1_D5 = Pin(61)
-GPIO1_D6 = Pin(62)
-GPIO1_D7 = Pin(63)
-GPIO2_A0 = Pin(64)
-GPIO2_A1 = Pin(65)
-GPIO2_A2 = Pin(66)
-GPIO2_A3 = Pin(67)
-GPIO2_A4 = Pin(68)
-GPIO2_A5 = Pin(69)
-GPIO2_A6 = Pin(70)
-GPIO2_A7 = Pin(71)
-GPIO2_B0 = Pin(72)
-GPIO2_B1 = Pin(73)
-GPIO2_B2 = Pin(74)
-GPIO2_B3 = Pin(75)
-GPIO2_B4 = Pin(76)
-GPIO2_B5 = Pin(77)
-GPIO2_B6 = Pin(78)
-GPIO2_B7 = Pin(79)
-GPIO2_C0 = Pin(80)
-GPIO2_C1 = Pin(81)
-GPIO2_C2 = Pin(82)
-GPIO2_C3 = Pin(83)
-GPIO2_C4 = Pin(84)
-GPIO2_C5 = Pin(85)
-GPIO2_C6 = Pin(86)
-GPIO2_C7 = Pin(87)
-GPIO2_D0 = Pin(88)
-GPIO2_D1 = Pin(89)
-GPIO2_D2 = Pin(90)
-GPIO2_D3 = Pin(91)
-GPIO2_D4 = Pin(92)
-GPIO2_D5 = Pin(93)
-GPIO2_D6 = Pin(94)
-GPIO2_D7 = Pin(95)
-GPIO3_A0 = Pin(96)
-GPIO3_A1 = Pin(97)
-GPIO3_A2 = Pin(98)
-GPIO3_A3 = Pin(99)
-GPIO3_A4 = Pin(100)
-GPIO3_A5 = Pin(101)
-GPIO3_A6 = Pin(102)
-GPIO3_A7 = Pin(103)
-GPIO3_B0 = Pin(104)
-GPIO3_B1 = Pin(105)
-GPIO3_B2 = Pin(106)
-GPIO3_B3 = Pin(107)
-GPIO3_B4 = Pin(108)
-GPIO3_B5 = Pin(109)
-GPIO3_B6 = Pin(110)
-GPIO3_B7 = Pin(111)
-GPIO3_C0 = Pin(112)
-GPIO3_C1 = Pin(113)
-GPIO3_C2 = Pin(114)
-GPIO3_C3 = Pin(115)
-GPIO3_C4 = Pin(116)
-GPIO3_C5 = Pin(117)
-GPIO3_C6 = Pin(118)
-GPIO3_C7 = Pin(119)
-GPIO3_D0 = Pin(120)
-GPIO3_D1 = Pin(121)
-GPIO3_D2 = Pin(122)
-GPIO3_D3 = Pin(123)
-GPIO3_D4 = Pin(124)
-GPIO3_D5 = Pin(125)
-GPIO3_D6 = Pin(126)
-GPIO3_D7 = Pin(127)
 ADC_IN0 = 1
 
 

diff --git a/src/adafruit_blinka/microcontroller/rockchip/rk3566/pin.py b/src/adafruit_blinka/microcontroller/rockchip/rk3566/pin.py
index a32a077c5a79306a37f8fa4056461b208e6b600f..534443fb7bae9df3016cde68addae24da8482365 100644 (file)
--- a/src/adafruit_blinka/microcontroller/rockchip/rk3566/pin.py
+++ b/src/adafruit_blinka/microcontroller/rockchip/rk3566/pin.py
@@ -9,6 +9,7 @@ from adafruit_blinka.agnostic import detector
 from adafruit_blinka.microcontroller.alias import get_dts_alias, get_pwm_chipid
 from adafruit_blinka.microcontroller.generic_linux.libgpiod_pin import Pin
 
+GPIO0_A0 = Pin((0, 0))
 GPIO0_A2 = Pin((0, 2))
 GPIO0_A4 = Pin((0, 4))
 GPIO0_A5 = Pin((0, 5))
@@ -114,6 +115,9 @@ GPIO4_C6 = Pin((4, 22))
 
 ADC_AIN3 = 37
 
+# labeled as such on Quartz64-A
+CPU_REFCLK_OUT = GPIO0_A0
+
 # I2C
 I2C0_SCL = GPIO0_B1
 I2C0_SDA = GPIO0_B2
@@ -135,6 +139,10 @@ SPI0_CS0_M0 = GPIO0_C6
 SPI0_CLK_M0 = GPIO0_B5
 SPI0_MISO_M0 = GPIO0_C5
 SPI0_MOSI_M0 = GPIO0_B6
+SPI1_CS0_M1 = GPIO0_C6
+SPI1_CLK_M1 = GPIO0_B5
+SPI1_MISO_M1 = GPIO3_C2
+SPI1_MOSI_M1 = GPIO3_C1
 SPI3_CS0_M0 = GPIO4_A6
 SPI3_CLK_M0 = GPIO4_B3
 SPI3_MISO_M0 = GPIO4_B0
@@ -145,6 +153,8 @@ SPI3_MISO_M1 = GPIO4_C5
 SPI3_MOSI_M1 = GPIO4_C3
 
 # UART
+UART0_TX = GPIO0_C1
+UART0_RX = GPIO0_C0
 UART2_TX = GPIO0_D1
 UART2_RX = GPIO0_D0
 UART3_TX_M1 = GPIO3_B7
@@ -166,6 +176,7 @@ i2cPorts = [
 
 # ordered as spiId, sckId, mosiId, misoId
 spiPorts = [
+    (1, SPI1_CLK_M1, SPI1_MOSI_M1, SPI1_MISO_M1),
     (3, SPI3_CLK_M0, SPI3_MOSI_M0, SPI3_MISO_M0),
     (3, SPI3_CLK_M1, SPI3_MOSI_M1, SPI3_MISO_M1),
 ]

diff --git a/src/board.py b/src/board.py
index 2838934dd46185c414af8d45b54091a222657d51..216c4d561837139ed5b12c7d968cdc5a799c5887 100644 (file)
--- a/src/board.py
+++ b/src/board.py
@@ -233,11 +233,14 @@ elif board_id == ap_board.SIFIVE_UNLEASHED:
     from adafruit_blinka.board.hifive_unleashed import *
 
 elif board_id == ap_board.PINE64:
-    from adafruit_blinka.board.pine64 import *
+    from adafruit_blinka.board.pine64.pine64 import *
 
 elif board_id == ap_board.PINEH64:
     from adafruit_blinka.board.pineH64 import *
 
+elif board_id == ap_board.QUARTZ64_A:
+    from adafruit_blinka.board.pine64.quartz64_a import *
+
 elif board_id == ap_board.PCDUINO2:
     from adafruit_blinka.board.linksprite.pcduino2 import *