Add radxa rock pi 3A compatibility

diff --git a/src/adafruit_blinka/board/radxa/radxa3a.py b/src/adafruit_blinka/board/radxa/radxa3a.py
new file mode 100644 (file)
index 0000000..f473dad
--- /dev/null
+++ b/src/adafruit_blinka/board/radxa/radxa3a.py
@@ -0,0 +1,54 @@
+# SPDX-FileCopyrightText: 2022 Kenneth Ryerson
+#
+# SPDX-License-Identifier: MIT
+"""Pin definitions for the Radxa CM3."""
+
+from adafruit_blinka.microcontroller.rockchip.rk3566 import pin
+
+# 3A IO pins
+
+D1_A0 = pin.GPIO1_A0  # /I2C3_SDA_M0/PIN 32
+D1_A1 = pin.GPIO1_A1  # /I2C3_SCL_M0/PIN 33
+D0_B5 = pin.GPIO0_B5  # /I2C2_SCL_M0/PIN 13
+D0_D1 = pin.GPIO0_D1  # /UART2_TX_M0/PIN 25
+D0_D0 = pin.GPIO0_D0  # /UART2_RX_M0/PIN 24
+D3_C4 = pin.GPIO3_C4  # /PWM14_M0/PIN 116
+D3_A3 = pin.GPIO3_A3  # /PIN 99
+D3_C5 = pin.GPIO3_C5  # /PWM14_M0/PIN 117
+D3_C0 = pin.GPIO3_C0  # /PWM14_M0/PIN 16
+D0_B2 = pin.GPIO0_B2  # /UART4_TX_M1/PIN 106
+D4_C3 = pin.GPIO4_C3  # /PWM15_IR_M1/PIN 147
+D4_C5 = pin.GPIO4_C5  # /PWM12_M1/PIN 149
+D0_C1 = pin.GPIO0_C1  # /PWM2_M0/ PIN 17
+D4_C2 = pin.GPIO4_C2  # /PWM14_M1/PIN 146
+D4_C6 = pin.GPIO4_C6  # /PWM13_M1/PIN 150
+D4_D1 = pin.GPIO4_D1  # /SPI3_CS1_M1/PIN 153
+D0_B6 = pin.GPIO0_B6  # /I2C2_SDA_M0/PIN 14
+D0_B5 = pin.GPIO0_B5  # /I2C2_SCL_M0/PIN 13
+D2_D7 = pin.GPIO2_D7  # /UART8_TX_M1/PIN 95
+D3_A0 = pin.GPIO3_A0  # /SPI2_CLK_M1/PIN 96
+D3_C2 = pin.GPIO3_C2  # /UART5_TX_M1/PIN 114
+D3_C3 = pin.GPIO3_C3  # /UART5_RX_M1/PIN 115
+D3_A4 = pin.GPIO3_A4  # /PIN 100
+D3_A2 = pin.GPIO3_A2  # /PIN 98
+D3_C0 = pin.GPIO3_C0  # /PWM13_M0/PIN 112
+D3_A6 = pin.GPIO3_A6  # /PIN 102
+D3_A5 = pin.GPIO3_A5  # /PIN 101
+
+# I2C
+SDA = D1_A0
+SCL = D1_A1
+
+# SPI
+CE0 = D4_C6
+SCLK = D4_C2
+MOSI = D4_C3
+MISO = D4_C5
+
+# UART aliases
+UART_TX = D0_D1
+UART_RX = D0_D0
+TXD = D0_D1
+RXD = D0_D0
+TX = D0_D1
+RX = D0_D0

diff --git a/src/adafruit_blinka/microcontroller/rockchip/rk3568/pin.py b/src/adafruit_blinka/microcontroller/rockchip/rk3568/pin.py
index e458b150c65c53c566b5f1afe47bb66e36cb6021..4b1f24f2d93503982e3789efc1fc8d9ae7e4c2e2 100644 (file)
--- a/src/adafruit_blinka/microcontroller/rockchip/rk3568/pin.py
+++ b/src/adafruit_blinka/microcontroller/rockchip/rk3568/pin.py
@@ -6,25 +6,122 @@
 
 from adafruit_blinka.microcontroller.generic_linux.libgpiod_pin import Pin
 
 
 from adafruit_blinka.microcontroller.generic_linux.libgpiod_pin import Pin
 

+
+# GPIOx_yz = x * 32 + y * 8 + z
+# y: A -> 0, B -> 1, C -> 2, D -> 3
+

 # GPIO0
 # GPIO0

+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_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_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
 GPIO1_A0 = Pin((1, 0))
 GPIO1_A1 = Pin((1, 1))
 
 # GPIO1
 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_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
 
 # GPIO2

+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
 GPIO3_A0 = Pin((3, 0))
 GPIO2_D7 = Pin((2, 31))
 
 # GPIO3
 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_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_B1 = Pin((3, 9))
 GPIO3_B2 = Pin((3, 10))
 GPIO3_B3 = Pin((3, 11))


@@ -33,43 +130,106 @@ GPIO3_B5 = Pin((3, 13))
 GPIO3_B6 = Pin((3, 14))
 GPIO3_B7 = Pin((3, 15))
 GPIO3_C0 = Pin((3, 16))
 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_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
 
 # GPIO4

+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_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_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))

 
 # I2C
 I2C3_SCL_M0 = GPIO1_A1
 I2C3_SDA_M0 = GPIO1_A0
 I2C5_SCL_M0 = GPIO3_B3
 I2C5_SDA_M0 = GPIO3_B4
 
 # I2C
 I2C3_SCL_M0 = GPIO1_A1
 I2C3_SDA_M0 = GPIO1_A0
 I2C5_SCL_M0 = GPIO3_B3
 I2C5_SDA_M0 = GPIO3_B4

+I2C2_SCL_M0 = GPIO0_B5
+I2C2_SDA_M0 = GPIO0_B6
+I2C1_SCL = GPIO0_B3
+I2C1_SDA = GPIO0_B4
+

 
 # SPI
 SPI3_CS0_M1 = GPIO4_C6
 
 # SPI
 SPI3_CS0_M1 = GPIO4_C6

+SPI3_CS1_M1 = GPIO4_D1

 SPI3_CLK_M1 = GPIO4_C2
 SPI3_MISO_M1 = GPIO4_C5
 SPI3_MOSI_M1 = GPIO4_C3
 
 # UART
 SPI3_CLK_M1 = GPIO4_C2
 SPI3_MISO_M1 = GPIO4_C5
 SPI3_MOSI_M1 = GPIO4_C3
 
 # UART

+UART0_RX = GPIO0_C0 
+UART0_TX = GPIO0_C1
+UART2_TX_M0 = GPIO0_D1
+UART2_RX_M0 = GPIO0_D0
+UART3_TX_M0 = GPIO1_A1
+UART3_RX_M0 = GPIO1_A0

 UART3_TX_M1 = GPIO3_B7
 UART3_RX_M1 = GPIO3_C0
 UART3_TX_M1 = GPIO3_B7
 UART3_RX_M1 = GPIO3_C0

+UART7_TX_M1 = GPIO3_C4
+UART7_RX_M1 = GPIO3_C5

 
 # PWM
 
 # PWM

+PWM1_M0 = GPIO0_C0
+PWM1_M1 = GPIO0_B5
+PWM2_M0 = GPIO0_C1
+PWM2_M1 = GPIO0_B6

 PWM8_M0 = GPIO3_B1
 PWM9_M0 = GPIO3_B2
 PWM8_M0 = GPIO3_B1
 PWM9_M0 = GPIO3_B2

+PWM12_M1 = GPIO4_C5
+PWM13_M1 = GPIO4_C6

 PWM10_M0 = GPIO3_B5
 PWM14_M0 = GPIO3_C4
 PWM10_M0 = GPIO3_B5
 PWM14_M0 = GPIO3_C4

+PWM14_M1 = GPIO4_C2
+PWM15_IR_M1 = GPIO3_C5

 
 # ordered as i2cId, SCL, SDA
 i2cPorts = (
     (3, I2C3_SCL_M0, I2C3_SDA_M0),
     (5, I2C5_SCL_M0, I2C5_SDA_M0),
 
 # ordered as i2cId, SCL, SDA
 i2cPorts = (
     (3, I2C3_SCL_M0, I2C3_SDA_M0),
     (5, I2C5_SCL_M0, I2C5_SDA_M0),

+    (2, I2C2_SCL_M0, I2C2_SDA_M0),
+    (1, I2C1_SCL, I2C1_SDA),

 )
 
 # ordered as spiId, sckId, mosiId, misoId
 )
 
 # ordered as spiId, sckId, mosiId, misoId


@@ -77,9 +237,13 @@ spiPorts = ((3, SPI3_CLK_M1, SPI3_MOSI_M1, SPI3_MISO_M1),)
 
 # SysFS pwm outputs, pwm channel and pin in first tuple
 pwmOuts = (
 
 # SysFS pwm outputs, pwm channel and pin in first tuple
 pwmOuts = (

+    ((1, 0), PWM1_M0),
+    ((1, 0), PWM2_M0),

     ((1, 0), PWM8_M0),
     ((1, 0), PWM9_M0),
     ((1, 0), PWM10_M0),
     ((1, 0), PWM8_M0),
     ((1, 0), PWM9_M0),
     ((1, 0), PWM10_M0),

+    ((1, 0), PWM12_M1),
+    ((1, 0), PWM13_M1),

     ((1, 0), PWM14_M0),
 )
 
     ((1, 0), PWM14_M0),
 )
 

diff --git a/src/board.py b/src/board.py
index aabef898af0e1d005bad7220ea1e8fcd0d8d1bce..2c09db797b0650b93e03f05b1316d4ad877bfa09 100644 (file)
--- a/src/board.py
+++ b/src/board.py
@@ -228,6 +228,9 @@ elif board_id == ap_board.ONION_OMEGA2:
 
 elif board_id == ap_board.RADXA_CM3:
     from adafruit_blinka.board.radxa.radxacm3 import *
 
 elif board_id == ap_board.RADXA_CM3:
     from adafruit_blinka.board.radxa.radxacm3 import *

+    
+elif board_id == ap_board.RADXA_3A:
+    from adafruit_blinka.board.radxa.radxa3a import *

 
 elif board_id == ap_board.RADXA_ZERO:
     from adafruit_blinka.board.radxa.radxazero import *
 
 elif board_id == ap_board.RADXA_ZERO:
     from adafruit_blinka.board.radxa.radxazero import *