Merge pull request #835 from hajimef/develop

Added support for Radxa Rock 5C

diff --git a/src/adafruit_blinka/board/radxa/rock5c.py b/src/adafruit_blinka/board/radxa/rock5c.py
new file mode 100644 (file)
index 0000000..f6b1ce1
--- /dev/null
+++ b/src/adafruit_blinka/board/radxa/rock5c.py
@@ -0,0 +1,167 @@
+# SPDX-FileCopyrightText: 2024 Hajime Fujimoto
+#
+# SPDX-License-Identifier: MIT
+
+"""Pin definitions for the Rock 5C"""
+
+from adafruit_blinka.microcontroller.rockchip.rk3588s import pin
+
+# D pin number is ordered by physical pin sequence
+
+# D1 = +3.3V
+# D2 = +5V
+D3 = pin.GPIO1_D7
+# D4 = +5V
+D5 = pin.GPIO1_D6
+# D6 = GND
+D7 = pin.GPIO1_B3
+D8 = pin.GPIO0_B5
+# D9 = GND
+D10 = pin.GPIO0_B6
+D11 = pin.GPIO4_B3
+D12 = pin.GPIO4_A1
+D13 = pin.GPIO4_B2
+# D14 = GND
+D15 = pin.GPIO4_B4
+D16 = pin.GPIO1_A5
+# D17 = +3.3V
+D18 = pin.GPIO1_B0
+D19 = pin.GPIO1_A1
+# D20 = GND
+D21 = pin.GPIO1_A0
+D22 = pin.GPIO1_B5
+D23 = pin.GPIO1_A2
+D24 = pin.GPIO1_A3
+# D25 = GND
+D26 = pin.GPIO1_A4
+D27 = pin.GPIO0_C7
+D28 = pin.GPIO0_D0
+D29 = pin.GPIO1_B2
+# D30 = GND
+D31 = pin.GPIO1_B1
+D32 = pin.GPIO4_B0
+D33 = pin.GPIO1_B4
+# D34 = GND
+D35 = pin.GPIO4_A0
+D36 = pin.GPIO4_A2
+# D37 = NC
+D38 = pin.GPIO4_A5
+# D39 = GND
+D40 = pin.GPIO4_B1
+
+
+# UART
+# UART2_M0
+UART2_TX = pin.GPIO0_B5
+UART2_RX = pin.GPIO0_B6
+# UART3_M1
+# UART3_TX = pin.GPIO3_B5
+# UART3_RX = pin.GPIO3_B6
+# UART4_M2
+UART4_TX = pin.GPIO1_B3
+UART4_RX = pin.GPIO1_B2
+# UART7_M2
+UART7_TX = pin.GPIO1_B5
+UART7_RX = pin.GPIO1_B4
+
+# Default UART -> UART2_M0
+
+TX = UART2_TX
+RX = UART2_RX
+TXD = UART2_TX
+RXD = UART2_RX
+
+# I2C
+# I2C0_M1
+# I2C0_SCL = pin.GPIO4_C5
+# I2C0_SDA = pin.GPIO4_C6
+# I2C1_M0
+I2C1_SCL = pin.GPIO0_B5
+I2C1_SDA = pin.GPIO0_B6
+# I2C3_M1
+# I2C3_SCL = pin.GPIO3_B7
+# I2C3_SDA = pin.GPIO3_C0
+# I2C7_M3
+I2C7_SCL = pin.GPIO4_B2
+I2C7_SDA = pin.GPIO4_B3
+# I2C8_M2
+I2C8_SCL = pin.GPIO1_D6
+I2C8_SDA = pin.GPIO1_D7
+
+# Default I2C -> I2C8_M2
+SCL = I2C8_SCL
+SDA = I2C8_SDA
+
+# SPI
+# SPI0_M1
+SPI0_MOSI = pin.GPIO4_A1
+SPI0_MISO = pin.GPIO4_A0
+SPI0_CLK = pin.GPIO4_A2
+SPI0_SCLK = SPI0_CLK
+SPI0_CS0 = pin.GPIO4_B2
+SPI0_CS1 = pin.GPIO4_B1
+
+# SPI0_M2
+# SPI0_MOSI = pin.GPIO1_B2
+# SPI0_MISO = pin.GPIO1_B1
+# SPI0_CLK = pin.GPIO1_B3
+# SPI0_SCLK = SPI0_CLK
+# SPI0_CS0 = pin.GPIO1_B4
+# SPI0_CS1 = pin.GPIO1_B5
+# SPI1_M1
+# SPI1_MOSI = pin.GPIO3_B7
+# SPI1_MISO = pin.GPIO3_C0
+# SPI1_CLK = pin.GPIO3_C1
+# SPI1_SCLK = SPI1_CLK
+# SPI1_CS0 = pin.GPIO3_C2
+# SPI1_CS1 = pin.GPIO3_C3
+# SPI3_M0
+# SPI3_MISO = pin.GPIO4_C4
+# SPI3_MOSI = pin.GPIO4_C5
+# SPI3_SCK = pin.GPIO4_C6
+# SPI3_SCLK = SPI3_SCK
+# SPI4 M2
+SPI4_MOSI = pin.GPIO1_A1
+SPI4_MISO = pin.GPIO1_A0
+SPI4_CLK = pin.GPIO1_A2
+SPI4_SCLK = SPI4_CLK
+SPI4_CS0 = pin.GPIO3_A3
+# SPI4_CS1 = pin.GPIO3_B5
+
+# Default SPI -> SPI4_M2
+MOSI = SPI4_MOSI
+MISO = SPI4_MISO
+SCLK = SPI4_SCLK
+CS = SPI4_CS0
+# CS1 = SPI4_CS1
+
+# PWM
+# PWM0_M2
+PWM0 = pin.GPIO1_A2
+# PWM1_M2
+PWM1 = pin.GPIO1_A3
+# PWM2_M1
+# PWM2 = pin.GPIO3_B1
+# PWM3_IR_M1
+# PWM3 = pin.GPIO3_B2
+# PWM5_M2
+# PWM5 = pin.GPIO4_C4
+# PWM6_M0
+PWM6 = pin.GPIO0_C7
+# PWM7_IR_M0
+PWM7 = pin.GPIO0_D0
+# PWM8_M0
+# PWM8 = pin.GPIO3_A7
+# PWM11_IR_M1
+PWM11 = pin.GPIO4_D4
+# PWM12_M0
+# PWM12 = pin.GPIO3_B5
+# PWM13_M0
+# PWM13 = pin.GPIO3_B6
+# PWM14_M1
+PWM14 = pin.GPIO4_B2
+# PWM15_IR_M1
+PWM15 = pin.GPIO4_B3
+
+# ADC
+ADC_IN0 = pin.ADC_IN0

diff --git a/src/adafruit_blinka/microcontroller/rockchip/PWMOut.py b/src/adafruit_blinka/microcontroller/rockchip/PWMOut.py
index 56dd2809e1bcb3ea11e9071439de830305287ffb..1e5d6e479c28ff21bc42f8d02cc4945a048e3685 100644 (file)
--- a/src/adafruit_blinka/microcontroller/rockchip/PWMOut.py
+++ b/src/adafruit_blinka/microcontroller/rockchip/PWMOut.py
@@ -142,6 +142,8 @@ class PWMOut:
 
             self.frequency = frequency
             self.duty_cycle = duty_cycle
+            self.polarity = "normal"
+            self.enable()
 
             # Cache the period for fast duty cycle updates
             self._period_ns = self._get_period_ns()

diff --git a/src/adafruit_blinka/microcontroller/rockchip/rk3588s/__init__.py b/src/adafruit_blinka/microcontroller/rockchip/rk3588s/__init__.py
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/adafruit_blinka/microcontroller/rockchip/rk3588s/pin.py b/src/adafruit_blinka/microcontroller/rockchip/rk3588s/pin.py
new file mode 100644 (file)
index 0000000..91483d3
--- /dev/null
+++ b/src/adafruit_blinka/microcontroller/rockchip/rk3588s/pin.py
@@ -0,0 +1,307 @@
+# SPDX-FileCopyrightText: 2024 Hajime Fujimoto
+#
+# SPDX-License-Identifier: MIT
+"""A Pin class for use with Rockchip RK3588S."""
+
+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_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))
+
+
+# UART
+# UART0_TX_M2 = GPIO4_A3
+# UART0_RX_M2 = GPIO4_A4
+UART2_TX_M0 = GPIO0_B5
+UART2_RX_M0 = GPIO0_B6
+# UART2_TX_M2 = GPIO3_B1
+# UART2_RX_M2 = GPIO3_B2
+UART4_TX_M2 = GPIO1_B3
+UART4_RX_M2 = GPIO1_B2
+UART6_TX_M1 = GPIO1_A1
+UART6_RX_M1 = GPIO1_A0
+UART7_TX_M2 = GPIO1_B5
+UART7_RX_M2 = GPIO1_B4
+UART8_TX_M0 = GPIO4_B0
+UART8_RX_M0 = GPIO4_B1
+TX = UART2_TX_M0
+RX = UART2_RX_M0
+
+# ordered as uartId, txId, rxId
+uartPorts = (
+    #    (0, UART0_TX_M2, UART0_RX_M2),
+    (2, UART2_TX_M0, UART2_RX_M0),
+    #    (2, UART2_TX_M2, UART2_RX_M2),
+    (4, UART4_TX_M2, UART4_RX_M2),
+    (6, UART6_TX_M1, UART6_RX_M1),
+    (7, UART7_TX_M2, UART7_RX_M2),
+    (8, UART8_TX_M0, UART8_RX_M0),
+)
+
+
+# I2C
+# I2C0_SCL_M1 = GPIO4_C5
+# I2C0_SDA_M1 = GPIO4_C6
+I2C1_SCL_M0 = GPIO0_B5
+I2C1_SDA_M0 = GPIO0_B6
+# I2C1_SCL_M4 = GPIO1_B1
+# I2C1_SDA_M4 = GPIO1_B2
+I2C2_SCL_M4 = GPIO1_A1
+I2C2_SDA_M4 = GPIO1_A0
+# I2C3_SCL_M1 = GPIO3_B7
+# I2C3_SDA_M1 = GPIO3_C0
+I2C4_SCL_M3 = GPIO1_A3
+I2C4_SDA_M3 = GPIO1_A2
+I2C6_SCL_M3 = GPIO4_B1
+I2C6_SDA_M3 = GPIO4_B0
+I2C7_SCL_M3 = GPIO4_B2
+I2C7_SDA_M3 = GPIO4_B3
+I2C8_SCL_M2 = GPIO1_D6
+I2C8_SDA_M2 = GPIO1_D7
+# I2C5_SDA_M3 = GPIO1_B7
+# I2C5_SCL_M3 = GPIO1_B6
+
+# ordered as i2cId, sclId, sdaId
+i2cPorts = (
+    (1, I2C1_SCL_M0, I2C1_SDA_M0),
+    (2, I2C2_SCL_M4, I2C2_SDA_M4),
+    (4, I2C4_SCL_M3, I2C4_SDA_M3),
+    (6, I2C6_SCL_M3, I2C6_SDA_M3),
+    (7, I2C7_SCL_M3, I2C7_SDA_M3),
+    (8, I2C8_SCL_M2, I2C8_SDA_M2),
+)
+
+# SPI
+SPI0_MOSI_M2 = GPIO1_B2
+SPI0_MISO_M2 = GPIO1_B1
+SPI0_CLK_M2 = GPIO1_B3
+SPI0_SCLK_M2 = SPI0_CLK_M2
+SPI0_CS0_M2 = GPIO1_B4
+SPI0_CS1_M2 = GPIO1_B5
+
+# SPI1_MOSI_M1 = GPIO3_B7
+# SPI1_MISO_M1 = GPIO3_C0
+# SPI1_CLK_M1 = GPIO3_C1
+# SPI1_SCLK_M1 = SPI1_CLK_M1
+# SPI1_CS0_M1 = GPIO3_C2
+# SPI1_CS1_M1 = GPIO3_C3
+
+# SPI3_MISO_M0 = GPIO4_C4
+# SPI3_MOSI_M0 = GPIO4_C5
+# SPI3_SCK_M0 = GPIO4_C6
+# SPI3_SCLK_M0 = SPI3_SCK_M0
+
+SPI4_MISO_M2 = GPIO1_A0
+SPI4_MOSI_M2 = GPIO1_A1
+SPI4_SCK_M2 = GPIO1_A2
+SPI4_SCLK_M2 = SPI4_SCK_M2
+SPI4_CS0_M2 = GPIO1_A3
+
+# ordered as spiId, sckId, mosiId, misoId
+spiPorts = (
+    (0, SPI0_SCLK_M2, SPI0_MOSI_M2, SPI0_MISO_M2),
+    (4, SPI4_SCLK_M2, SPI4_MOSI_M2, SPI4_MISO_M2),
+)
+
+# PWM
+PWM0_M2 = GPIO1_A2
+PWM1_M2 = GPIO1_A3
+# PWM2_M1 = GPIO3_B1
+# PWM3_IR_M1 = GPIO3_B2
+# PWM5_M2 = GPIO4_C4
+# PWM6_M2 = GPIO4_C5
+PWM6_M0 = GPIO0_C7
+# PWM7_IR_M3 = GPIO4_C6
+PWM7_IR_M0 = GPIO0_D0
+# PWM8_M0 = GPIO3_A7
+# PWM10_M2 = GPIO3_D3
+# PWM11_IR_M3 = GPIO3_D5
+PWM11_IR_M1 = GPIO4_B4
+# PWM12_M0 = GPIO3_B5
+# PWM13_M0 = GPIO3_B6
+# PWM13_M2 = GPIO1_B7
+# PWM14_M0 = GPIO3_C2
+PWM14_M1 = GPIO4_B2
+PWM14_M2 = GPIO1_D6
+# PWM15_IR_M0 = GPIO3_C3
+PWM15_IR_M1 = GPIO4_B3
+PWM15_IR_M3 = GPIO1_D7
+
+
+# SysFS pwm outputs, pwm channel and pin in first tuple
+pwmOuts = (
+    ((1, 0), PWM6_M0),
+    ((2, 0), PWM7_IR_M0),
+    ((3, 0), PWM11_IR_M1),
+    ((4, 0), PWM14_M1),
+    ((5, 0), PWM15_IR_M1),
+)
+
+# SysFS analog inputs, Ordered as analog analogInId, device, and channel
+ADC_IN0 = 0
+analogIns = ((ADC_IN0, 0, 2),)

diff --git a/src/board.py b/src/board.py
index 3e54417bbd12f189c79601178885110a5f2bf674..d66b00047f28b472d4eac3c208c7a6a0549b359d 100644 (file)
--- a/src/board.py
+++ b/src/board.py
@@ -285,6 +285,9 @@ elif board_id == ap_board.ROCK_PI_4_SE:
 elif board_id == ap_board.ROCK_PI_5:
     from adafruit_blinka.board.radxa.rock5 import *
 
+elif board_id == ap_board.ROCK_PI_5C:
+    from adafruit_blinka.board.radxa.rock5c import *
+
 elif board_id == ap_board.ROCK_PI_E:
     from adafruit_blinka.board.radxa.rockpie import *