Merge pull request #790 from how2flow/odroid

ODROID-M1/S: Fix that pwm1, pwm2 pins do not match with kernel dtbos

diff --git a/src/adafruit_blinka/board/radxa/rockpi3c.py b/src/adafruit_blinka/board/radxa/rockpi3c.py
new file mode 100644 (file)
index 0000000..dcfc633
--- /dev/null
+++ b/src/adafruit_blinka/board/radxa/rockpi3c.py
@@ -0,0 +1,65 @@
+# SPDX-FileCopyrightText: 2024 Shawnchainw
+#
+# SPDX-License-Identifier: MIT
+"""Pin definitions for the Radxa Rock Pi 3C."""
+
+from adafruit_blinka.microcontroller.rockchip.rk3566 import pin
+
+# 3C IO pins
+
+D1_A0 = pin.GPIO1_A0
+D1_A1 = pin.GPIO1_A1
+D3_C4 = pin.GPIO3_C4
+D3_A1 = pin.GPIO3_A1
+D3_A2 = pin.GPIO3_A2
+D3_B0 = pin.GPIO3_B0
+D4_C3 = pin.GPIO4_C3
+D4_C5 = pin.GPIO4_C5
+D4_C2 = pin.GPIO4_C2
+D4_B2 = pin.GPIO4_B2
+D3_B3 = pin.GPIO3_B3
+D3_B4 = pin.GPIO3_B4
+D3_C3 = pin.GPIO3_C3
+D3_A4 = pin.GPIO3_A4
+D1_A4 = pin.GPIO1_A4
+D0_D1 = pin.GPIO0_D1
+D0_D0 = pin.GPIO0_D0
+D3_A3 = pin.GPIO3_A3
+D3_B1 = pin.GPIO3_B1
+D3_B2 = pin.GPIO3_B2
+D3_C1 = pin.GPIO3_C1
+D4_C6 = pin.GPIO4_C6
+D4_B3 = pin.GPIO4_B3
+D3_C2 = pin.GPIO3_C2
+D3_A7 = pin.GPIO3_A7
+D3_A6 = pin.GPIO3_A6
+D3_A5 = pin.GPIO3_A5
+
+
+# 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
+UART2_TX = UART_TX
+UART2_RX = UART_RX
+UART3_TX = D1_A1
+UART3_RX = D1_A0
+UART4_TX = D3_B2
+UART4_RX = D3_B1
+UART5_TX = D3_C2
+UART5_RX = D3_C3
+UART9_TX = D4_C5
+UART9_RX = D4_C6
+TXD = D0_D1
+RXD = D0_D0
+TX = D0_D1
+RX = D0_D0

diff --git a/src/adafruit_blinka/microcontroller/rockchip/rk3566/pin.py b/src/adafruit_blinka/microcontroller/rockchip/rk3566/pin.py
index ef283b9b7155241add44739bb27bad2592202409..a32a077c5a79306a37f8fa4056461b208e6b600f 100644 (file)
--- a/src/adafruit_blinka/microcontroller/rockchip/rk3566/pin.py
+++ b/src/adafruit_blinka/microcontroller/rockchip/rk3566/pin.py
@@ -64,9 +64,13 @@ GPIO2_C4 = Pin((2, 20))
 GPIO2_C5 = Pin((2, 21))
 GPIO2_C6 = Pin((2, 22))
 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))

diff --git a/src/board.py b/src/board.py
index ca7c683fa35254b0e3db10d1efa6bfe933e26bc2..2838934dd46185c414af8d45b54091a222657d51 100644 (file)
--- a/src/board.py
+++ b/src/board.py
@@ -259,6 +259,9 @@ elif board_id == ap_board.RADXA_CM3:
 elif board_id == ap_board.ROCK_PI_3A:
     from adafruit_blinka.board.radxa.rockpi3a import *
 
+elif board_id == ap_board.ROCK_PI_3C:
+    from adafruit_blinka.board.radxa.rockpi3c import *
+
 elif board_id == ap_board.RADXA_ZERO:
     from adafruit_blinka.board.radxa.radxazero import *
 
@@ -271,6 +274,9 @@ elif board_id == ap_board.ROCK_PI_4:
 elif board_id == ap_board.ROCK_PI_4_C_PLUS:
     from adafruit_blinka.board.radxa.rockpi4 import *
 
+elif board_id == ap_board.ROCK_PI_4_SE:
+    from adafruit_blinka.board.radxa.rockpi4 import *
+
 elif board_id == ap_board.ROCK_PI_5:
     from adafruit_blinka.board.radxa.rock5 import *