Merge pull request #658 from MathijsNL/main

Fix Rock 4C Plus pin mapping and board file

diff --git a/src/adafruit_blinka/board/librecomputer/roc_rk3328_cc.py b/src/adafruit_blinka/board/librecomputer/roc_rk3328_cc.py
new file mode 100644 (file)
index 0000000..4501457
--- /dev/null
+++ b/src/adafruit_blinka/board/librecomputer/roc_rk3328_cc.py
@@ -0,0 +1,51 @@
+# SPDX-FileCopyrightText: 2021 Melissa LeBlanc-Williams for Adafruit Industries
+#
+# SPDX-License-Identifier: MIT
+"""Pin definitions for the ROC-RK3328-CC."""
+
+from adafruit_blinka.microcontroller.rockchip.rk3328 import pin
+
+for it in pin.i2cPorts:
+    globals()["SCL" + str(it[0])] = it[1]
+    globals()["SDA" + str(it[0])] = it[2]
+
+SCL = pin.i2cPorts[0][1]
+SDA = pin.i2cPorts[0][2]
+
+SCLK = pin.SPI0_SCLK
+MOSI = pin.SPI0_MOSI
+MISO = pin.SPI0_MISO
+SPI_CS = pin.SPI0_CS
+
+# Pinout reference:
+# https://github.com/libre-computer-project/libretech-wiring-tool/blob/master/libre-computer/roc-rk3328-cc/gpio.map
+
+# 40 pin Header J1
+P3 = pin.GPIO2_D1
+P5 = pin.GPIO2_D0
+P7 = pin.GPIO1_D4
+P8 = pin.GPIO3_A4
+P10 = pin.GPIO3_A6
+P11 = pin.GPIO2_C4
+P12 = pin.GPIO2_A6
+P13 = pin.GPIO2_C5
+P15 = pin.GPIO2_C6
+P16 = pin.GPIO3_A7
+P18 = pin.GPIO3_A5
+P19 = pin.GPIO3_A1
+P21 = pin.GPIO3_A2
+P22 = pin.GPIO0_A2
+P23 = pin.GPIO3_A0
+P24 = pin.GPIO3_B0
+P26 = pin.GPIO2_B4
+P27 = pin.GPIO2_A4
+P28 = pin.GPIO2_A5
+P29 = pin.GPIO2_C3
+P31 = pin.GPIO2_C7
+P32 = pin.GPIO0_A0
+P33 = pin.GPIO2_C0
+P35 = pin.GPIO2_C2
+P36 = pin.GPIO2_A0
+P37 = pin.GPIO2_B7
+P38 = pin.GPIO2_A1
+P40 = pin.GPIO0_D3

diff --git a/src/adafruit_blinka/microcontroller/rp2040/pin.py b/src/adafruit_blinka/microcontroller/rp2040/pin.py
index 7d29960e8bfc613a77721fb3ff53e9b48d403ac4..68fe5d10a40ca975c9f9f6e86c757a65221e24ce 100755 (executable)
--- a/src/adafruit_blinka/microcontroller/rp2040/pin.py
+++ b/src/adafruit_blinka/microcontroller/rp2040/pin.py
@@ -41,30 +41,39 @@ spiPorts = (
     (0, GP2, GP3, GP0),
     (0, GP2, GP3, GP4),
     (0, GP2, GP3, GP16),
+    (0, GP2, GP3, GP20),
     (0, GP2, GP7, GP0),
     (0, GP2, GP7, GP4),
     (0, GP2, GP7, GP16),
+    (0, GP2, GP7, GP20),
     (0, GP2, GP19, GP0),
     (0, GP2, GP19, GP4),
     (0, GP2, GP19, GP16),
+    (0, GP2, GP19, GP20),
     (0, GP6, GP3, GP0),
     (0, GP6, GP3, GP4),
     (0, GP6, GP3, GP16),
+    (0, GP6, GP3, GP20),
     (0, GP6, GP7, GP0),
     (0, GP6, GP7, GP4),
     (0, GP6, GP7, GP16),
+    (0, GP6, GP7, GP20),
     (0, GP6, GP19, GP0),
     (0, GP6, GP19, GP4),
     (0, GP6, GP19, GP16),
+    (0, GP6, GP19, GP20),
     (0, GP18, GP3, GP0),
     (0, GP18, GP3, GP4),
     (0, GP18, GP3, GP16),
+    (0, GP18, GP3, GP20),
     (0, GP18, GP7, GP0),
     (0, GP18, GP7, GP4),
     (0, GP18, GP7, GP16),
+    (0, GP18, GP7, GP20),
     (0, GP18, GP19, GP0),
     (0, GP18, GP19, GP4),
     (0, GP18, GP19, GP16),
+    (0, GP18, GP19, GP20),
     (1, GP10, GP11, GP8),
     (1, GP10, GP11, GP12),
     (1, GP10, GP15, GP8),

diff --git a/src/board.py b/src/board.py
index 25283e99ede27c4a2ad2906f4763eedfca95c414..479e06e06c597e8f3c1eae96f8dd2a414a1e2a3c 100644 (file)
--- a/src/board.py
+++ b/src/board.py
@@ -319,6 +319,9 @@ elif board_id == ap_board.SIEMENS_SIMATIC_IOT2050_BASIC:
 elif board_id == ap_board.AML_S905X_CC:
     from adafruit_blinka.board.librecomputer.aml_s905x_cc_v1 import *
 
+elif board_id == ap_board.ROC_RK3328_CC:
+    from adafruit_blinka.board.librecomputer.roc_rk3328_cc import *
+
 elif board_id == ap_board.GENERIC_LINUX_PC:
     from adafruit_blinka.board.generic_linux_pc import *