Merge remote-tracking branch 'adafruit/main'

diff --git a/src/adafruit_blinka/board/librecomputer/aml_s905x_cc_v1.py b/src/adafruit_blinka/board/librecomputer/aml_s905x_cc_v1.py
index e84812cc7a7282a1e75d4e90c93af5c959bf884b..0ce256371e419bba40753eb97dba90350aa6a405 100644 (file)
--- a/src/adafruit_blinka/board/librecomputer/aml_s905x_cc_v1.py
+++ b/src/adafruit_blinka/board/librecomputer/aml_s905x_cc_v1.py
@@ -12,10 +12,10 @@ for it in pin.i2cPorts:
 SCL = pin.i2cPorts[0][1]
 SDA = pin.i2cPorts[0][2]
 
-SCLK = pin.SPI1_SCLK
-MOSI = pin.SPI1_MOSI
-MISO = pin.SPI1_MISO
-SPI_CS = pin.SPI1_CS
+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/aml-s905x-cc/gpio.map

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/board/orangepi/orangepi4.py b/src/adafruit_blinka/board/orangepi/orangepi4.py
index e767a74a57630d0af452623b1f2fea977dc47480..6c772c20b1d4dd2157ea5bf3ff7ab083e6c7f020 100644 (file)
--- a/src/adafruit_blinka/board/orangepi/orangepi4.py
+++ b/src/adafruit_blinka/board/orangepi/orangepi4.py
@@ -5,61 +5,77 @@
 
 from adafruit_blinka.microcontroller.rockchip.rk3399 import pin
 
-D3 = pin.GPIO2_A7  # /I2C7_SDA/PIN 71/
-D5 = pin.GPIO2_B0  # /I2C7_SCL/PIN 72/
-D7 = pin.GPIO2_B3  # /SPI2_CLK/PIN 75/
-D8 = pin.GPIO4_C4  # /UART2_TXD/PIN 148/
-D10 = pin.GPIO4_C3  # /UART2_RXD/PIN 147/
-D11 = pin.GPIO4_C2  # /PWM0/PIN 146/
-D13 = pin.GPIO4_C6  # /PWM1/PIN 150/
-D15 = pin.GPIO4_C5  # /SPDIF_TX/PIN 149/
-D16 = pin.GPIO4_D2  # /PIN 154/
-D17 = pin.GPIO4_D4  # /PIN 156/
-D19 = pin.GPIO1_B0  # /UART4_TXD/SPI1_TXD/PIN 40/
-D21 = pin.GPIO1_A7  # /UART4_RXD/SPI1_RXD/PIN 39/
-D22 = pin.GPIO4_D5  # /PIN 157/
-D23 = pin.GPIO1_B1  # /SPI1_CLK/PIN 41/
-D24 = pin.GPIO1_B2  # /SPI1_CS/PIN 42/
-D27 = pin.GPIO2_A0  # /I2C2_SDA/PIN 64/
-D28 = pin.GPIO2_A1  # /I2C2_SCL/PIN 65/
-D29 = pin.GPIO2_B2  # /I2C6_SCL/SPI2_TXD/PIN 74/
-D31 = pin.GPIO2_B1  # /I2C6_SDA/SPI2_RXD/PIN 73/
-D32 = pin.GPIO3_C0  # /SPDIF_TX/UART3_CTS/PIN 112/
-D33 = pin.GPIO2_B4  # /SPI2_CS/PIN 76/
-D35 = pin.GPIO4_A5  # /I2S1_LRCK_TX/PIN 133/
-D36 = pin.GPIO4_A4  # /I2S1_LRCK_RX/PIN 132/
-D37 = pin.GPIO4_D6  # /PIN 158/
-D38 = pin.GPIO4_A6  # /I2S1_SDI/PIN 134/
-D40 = pin.GPIO4_A7  # /I2S1_SDO/PIN 135/
+# D pin number is ordered by physical pin sequence
+# Reference: https://service.robots.org.nz/wiki/Wiki.jsp?page=OrangePi
 
-SDA2 = D27
-SCL2 = D28
+# +------+-----+----------+------+---+OrangePi 4+---+---+--+----------+-----+------+
+# | GPIO | wPi |   Name   | Mode | V | Physical | V | Mode | Name     | wPi | GPIO |
+# +------+-----+----------+------+---+----++----+---+------+----------+-----+------+
+# |      |     |     3.3V |      |   |  1 || 2  |   |      | 5V       |     |      |
+# |   64 |   0 | I2C2_SDA |   IN | 1 |  3 || 4  |   |      | 5V       |     |      |
+# |   65 |   1 | I2C2_SCL |   IN | 1 |  5 || 6  |   |      | GND      |     |      |
+# |  150 |   2 |     PWM1 | ALT2 | 1 |  7 || 8  | 1 | ALT2 | I2C3_SCL | 3   | 145  |
+# |      |     |      GND |      |   |  9 || 10 | 1 | ALT2 | I2C3_SDA | 4   | 144  |
+# |   33 |   5 | GPIO1_A1 |   IN | 0 | 11 || 12 | 1 | IN   | GPIO1_C2 | 6   | 50   |
+# |   35 |   7 | GPIO1_A3 |  OUT | 1 | 13 || 14 |   |      | GND      |     |      |
+# |   92 |   8 | GPIO2_D4 |   IN | 0 | 15 || 16 | 0 | IN   | GPIO1_C6 | 9   | 54   |
+# |      |     |     3.3V |      |   | 17 || 18 | 0 | IN   | GPIO1_C7 | 10  | 55   |
+# |   40 |  11 | SPI1_TXD | ALT3 | 0 | 19 || 20 |   |      | GND      |     |      |
+# |   39 |  12 | SPI1_RXD | ALT3 | 1 | 21 || 22 | 0 | IN   | GPIO1_D0 | 13  | 56   |
+# |   41 |  14 | SPI1_CLK | ALT3 | 1 | 23 || 24 | 1 | ALT3 | SPI1_CS  | 15  | 42   |
+# |      |     |      GND |      |   | 25 || 26 | 0 | IN   | GPIO4_C5 | 16  | 149  |
+# |   64 |  17 | I2C2_SDA |   IN | 1 | 27 || 28 | 1 | IN   | I2C2_SCL | 18  | 65   |
+# |      |     |  I2S0_RX |      |   | 29 || 30 |   |      | GND      |     |      |
+# |      |     |  I2S0_TX |      |   | 31 || 32 |   |      | I2S_CLK  |     |      |
+# |      |     | I2S0_SCK |      |   | 33 || 34 |   |      | GND      |     |      |
+# |      |     | I2S0_SI0 |      |   | 35 || 36 |   |      | I2S0_SO0 |     |      |
+# |      |     | I2S0_SI1 |      |   | 37 || 38 |   |      | I2S0_SI2 |     |      |
+# |      |     |      GND |      |   | 39 || 40 |   |      | I2S0_SI3 |     |      |
+# +------+-----+----------+------+---+----++----+---+------+----------+-----+------+
+# | GPIO | wPi |   Name   | Mode | V | Physical | V | Mode | Name     | wPi | GPIO |
+# +------+-----+----------+------+---+OrangePi 4+---+---+--+----------+-----+------+
 
-SDA6 = D31
-SCL6 = D29
+# D1 = VCC3V3_SYS
+# D2 = VCC5V0_SYS
+D3 = pin.I2C2_SDA  # I2C2_SDA_3V0
+# D4 = VCC5V0_SYS
+D5 = pin.I2C2_SCL  # I2C2_SCL_3V0
+# D6 = GND
+D7 = pin.GPIO4_C6  # GPIO4_C6/PWM1
+D8 = pin.I2C3_SCL  # I2C3_SCL
+# D9 = GND
+D10 = pin.I2C3_SDA  # I2C3_SDA
+D11 = pin.GPIO1_A1  # GPIO1_A1
+D12 = pin.GPIO1_C2  # GPIO1_C2
+D13 = pin.GPIO1_A3  # GPIO1_A3
+# D14 = GND
+D15 = pin.GPIO2_D4  # GPIO2_D4
+D16 = pin.GPIO1_C6  # GPIO1_C6
+# D17 = GND
+D18 = pin.GPIO1_C7  # GPIO1_C7
+D19 = pin.GPIO1_B0  # UART4_TX / SPI1_TXD
+# D20 = GND
+D21 = pin.GPIO1_A7  # UART4_RX / SPI1_RXD
+D22 = pin.GPIO1_D0  # GPIO1_D0
+D23 = pin.GPIO1_B1  # SPI1_CLK
+D24 = pin.GPIO1_B2  # SPI1_CSn0
+# D25 = GND
+D26 = pin.GPIO4_C5  # GPIO4_C5
+D27 = pin.I2C2_SDA  # I2C2_SDA
+D28 = pin.I2C2_SCL  # I2C2_SCL
+# D29 = pin.I2S0_LRCK_RX
+# D30 = GND
+# D31 = pin.I2S0_LRCK_TX
+# D32 = pin.I2S_CLK
+# D33 = pin.I2S0_SCLK
+# D34 = GND
+# D35 = pin.I2S0_SDI0
+# D36 = pin.I2S0_SDO0
+# D37 = pin.I2S0_SDI1SDO_3
+# D38 = pin.I2S0_SDI2SDO2
+# D39 = GND
+# D40 = pin.I2S0_SDI3SDO1
 
-SDA7 = D3
-SCL7 = D5
-
-SDA = SDA2
-SCL = SCL2
-
-SCLK = D7
-MOSI = D29
-MISO = D31
-CS = D33
-SCK = SCLK
-
-UART2_TX = D8
-UART2_RX = D10
-
-UART4_TX = D19
-UART4_RX = D21
-
-UART_TX = UART2_TX
-UART_RX = UART2_RX
-
-PWM0 = pin.PWM0
-PWM1 = pin.PWM1
-
-ADC_IN0 = pin.ADC_IN0
+# UART
+UART4_TX = pin.GPIO1_B0
+UART4_RX = pin.GPIO1_A7

diff --git a/src/adafruit_blinka/board/radxa/rockpi4.py b/src/adafruit_blinka/board/radxa/rockpi4.py
index bd3e449e4575e6e1ebde39de0dc536a7a9c3a69b..9fdccbc1b241a1b553c0261e609d8d12abc86e2a 100644 (file)
--- a/src/adafruit_blinka/board/radxa/rockpi4.py
+++ b/src/adafruit_blinka/board/radxa/rockpi4.py
@@ -1,37 +1,38 @@
 # SPDX-FileCopyrightText: 2021 Melissa LeBlanc-Williams for Adafruit Industries
+# See https://wiki.radxa.com/Rock4/hardware/gpio for pinout
 #
 # SPDX-License-Identifier: MIT
-"""Pin definitions for the Rock Pi 4."""
+"""Pin definitions for the Rock Pi 4 Family."""
 
 from adafruit_blinka.microcontroller.rockchip.rk3399 import pin
 
-D3 = pin.GPIO2_A7  # /I2C7_SDA/PIN 71/
-D5 = pin.GPIO2_B0  # /I2C7_SCL/PIN 72/
-D7 = pin.GPIO2_B3  # /SPI2_CLK/PIN 75/
-D8 = pin.GPIO4_C4  # /UART2_TXD/PIN 148/
-D10 = pin.GPIO4_C3  # /UART2_RXD/PIN 147/
-D11 = pin.GPIO4_C2  # /PWM0/PIN 146/
+D3 = pin.GPIO2_A7
+D5 = pin.GPIO2_B0
+D7 = pin.GPIO2_B3
+D8 = pin.GPIO4_C4
+D10 = pin.GPIO4_C3
+D11 = pin.GPIO4_C2
 D12 = pin.GPIO4_A3
-D13 = pin.GPIO4_C6  # /PWM1/PIN 150/
-D15 = pin.GPIO4_C5  # /SPDIF_TX/PIN 149/
-D16 = pin.GPIO4_D2  # /PIN 154/
-D18 = pin.GPIO4_D4  # /PIN 156/
-D19 = pin.GPIO1_B0  # /UART4_TXD/SPI1_TXD/PIN 40/
-D21 = pin.GPIO1_A7  # /UART4_RXD/SPI1_RXD/PIN 39/
-D22 = pin.GPIO4_D5  # /PIN 157/
-D23 = pin.GPIO1_B1  # /SPI1_CLK/PIN 41/
-D24 = pin.GPIO1_B2  # /SPI1_CS/PIN 42/
-D27 = pin.GPIO2_A0  # /I2C2_SDA/PIN 64/
-D28 = pin.GPIO2_A1  # /I2C2_SCL/PIN 65/
-D29 = pin.GPIO2_B2  # /I2C6_SCL/SPI2_TXD/PIN 74/
-D31 = pin.GPIO2_B1  # /I2C6_SDA/SPI2_RXD/PIN 73/
-D32 = pin.GPIO3_C0  # /SPDIF_TX/UART3_CTS/PIN 112/
-D33 = pin.GPIO2_B4  # /SPI2_CS/PIN 76/
-D35 = pin.GPIO4_A5  # /I2S1_LRCK_TX/PIN 133/
-D36 = pin.GPIO4_A4  # /I2S1_LRCK_RX/PIN 132/
-D37 = pin.GPIO4_D6  # /PIN 158/
-D38 = pin.GPIO4_A6  # /I2S1_SDI/PIN 134/
-D40 = pin.GPIO4_A7  # /I2S1_SDO/PIN 135/
+D13 = pin.GPIO4_C6
+D15 = pin.GPIO4_C5
+D16 = pin.GPIO4_D2
+D18 = pin.GPIO4_D4
+D19 = pin.GPIO1_B0
+D21 = pin.GPIO1_A7
+D22 = pin.GPIO4_D5
+D23 = pin.GPIO1_B1
+D24 = pin.GPIO1_B2
+D27 = pin.GPIO2_A0
+D28 = pin.GPIO2_A1
+D29 = pin.GPIO2_B2
+D31 = pin.GPIO2_B1
+D32 = pin.GPIO3_C0
+D33 = pin.GPIO2_B4
+D35 = pin.GPIO4_A5
+D36 = pin.GPIO4_A4
+D37 = pin.GPIO4_D6
+D38 = pin.GPIO4_A6
+D40 = pin.GPIO4_A7
 
 SDA2 = D27
 SCL2 = D28
@@ -45,10 +46,10 @@ SCL7 = D5
 SDA = SDA2
 SCL = SCL2
 
-SCLK = D7
-MOSI = D29
-MISO = D31
-CS = D33
+SCLK = D19
+MOSI = D21
+MISO = D23
+CS = D24
 SCK = SCLK
 
 UART2_TX = D8

diff --git a/src/adafruit_blinka/board/radxa/rockpi4cplus.py b/src/adafruit_blinka/board/radxa/rockpi4cplus.py
deleted file mode 100644 (file)
index fd1d4ad..0000000
--- a/src/adafruit_blinka/board/radxa/rockpi4cplus.py
+++ /dev/null
@@ -1,66 +0,0 @@
-# SPDX-FileCopyrightText: 2023 Wouter Groeneveld
-# See https://wiki.radxa.com/Rock4/hardware/gpio for pinout
-#
-# SPDX-License-Identifier: MIT
-"""Pin definitions for the Rock Pi 4 C+."""
-
-from adafruit_blinka.microcontroller.rockchip.rk3399_t import pin
-
-D3 = pin.GPIO2_A7
-D5 = pin.GPIO2_B0
-D7 = pin.GPIO2_B3
-D8 = pin.GPIO4_C4
-D10 = pin.GPIO4_C3
-D11 = pin.GPIO4_C2
-D12 = pin.GPIO2_D3
-D13 = pin.GPIO1_A1
-D15 = pin.GPIO4_C5
-D16 = pin.GPIO4_D2
-D18 = pin.GPIO4_D4
-D19 = pin.GPIO1_B0
-D21 = pin.GPIO1_A7
-D22 = pin.GPIO4_D5
-D23 = pin.GPIO1_B1
-D24 = pin.GPIO1_B2
-D27 = pin.GPIO2_A0
-D28 = pin.GPIO2_A1
-D29 = pin.GPIO2_B2
-D31 = pin.GPIO2_B1
-D32 = pin.GPIO3_C0
-D33 = pin.GPIO2_B4
-D35 = pin.GPIO4_A5
-D36 = pin.GPIO2_D4
-D37 = pin.GPIO4_D6
-D38 = pin.GPIO1_A4
-D40 = pin.GPIO1_C4
-
-SDA2 = D27
-SCL2 = D28
-
-SDA6 = D31
-SCL6 = D29
-
-SDA7 = D3
-SCL7 = D5
-
-SDA = SDA2
-SCL = SCL2
-
-SCLK = D7
-MOSI = D29
-MISO = D31
-CS = D33
-SCK = SCLK
-
-UART2_TX = D8
-UART2_RX = D10
-
-UART4_TX = D19
-UART4_RX = D21
-
-UART_TX = UART2_TX
-UART_RX = UART2_RX
-
-PWM0 = pin.PWM0
-
-ADC_IN0 = pin.ADC_IN0

diff --git a/src/adafruit_blinka/microcontroller/amlogic/s905x/pin.py b/src/adafruit_blinka/microcontroller/amlogic/s905x/pin.py
index a2ff1947281797486bf1027204afe3a22c38d02e..ea6b51e57b8c4eb325590cd1132af22b726c0b0b 100644 (file)
--- a/src/adafruit_blinka/microcontroller/amlogic/s905x/pin.py
+++ b/src/adafruit_blinka/microcontroller/amlogic/s905x/pin.py
@@ -53,6 +53,10 @@ UART1_TX = GPIO287
 UART2_RX = GPIO292
 UART2_TX = GPIO291
 
+SPI0_SCLK = GPIO290
+SPI0_MISO = GPIO288
+SPI0_MOSI = GPIO287
+SPI0_CS = GPIO289
 SPI1_SCLK = GPIO223
 SPI1_MISO = GPIO288
 SPI1_MOSI = GPIO287
@@ -63,7 +67,7 @@ i2cPorts = (
     (1, I2C1_SCK, I2C1_SDA),
 )
 
-spiPorts = (0, SPI1_SCLK, SPI1_MOSI, SPI1_MISO)
+spiPorts = ((0, SPI0_SCLK, SPI0_MOSI, SPI0_MISO), (1, SPI1_SCLK, SPI1_MOSI, SPI1_MISO))
 
 uartPorts = (
     (1, UART1_TX, UART1_RX),

diff --git a/src/adafruit_blinka/microcontroller/rockchip/rk3399/pin.py b/src/adafruit_blinka/microcontroller/rockchip/rk3399/pin.py
index e7d994d751595565743a49acda4dabaa62fae266..f9912ae2dc6a632f17b9a841266507676da1c5e0 100644 (file)
--- a/src/adafruit_blinka/microcontroller/rockchip/rk3399/pin.py
+++ b/src/adafruit_blinka/microcontroller/rockchip/rk3399/pin.py
@@ -1,7 +1,8 @@
 # SPDX-FileCopyrightText: 2021 Melissa LeBlanc-Williams for Adafruit Industries
+# See https://wiki.radxa.com/Rock4/hardware/gpio
 #
 # SPDX-License-Identifier: MIT
-"""A Pin class for use with Rockchip RK3399."""
+"""A Pin class for use with Rockchip RK3399 and RK3399_T."""
 
 from adafruit_blinka.microcontroller.generic_linux.sysfs_pin import Pin
 
@@ -60,16 +61,18 @@ I2C8_SCL = GPIO1_C5
 # SPI
 SPI1_CS = GPIO1_B2
 SPI1_SCLK = GPIO1_B1
-SPI1_MISO = GPIO1_B0
-SPI1_MOSI = GPIO1_A7
+SPI1_MISO = GPIO1_A7
+SPI1_MOSI = GPIO1_B0
 SPI2_CS = GPIO2_B4
 SPI2_SCLK = GPIO2_B3
 SPI2_MISO = GPIO2_B1
 SPI2_MOSI = GPIO2_B2
 
 # UART
-UART0_TX = GPIO4_C4
-UART0_RX = GPIO4_C3
+UART2_TX = GPIO4_C4
+UART2_RX = GPIO4_C3
+UART4_TX = GPIO1_B0
+UART4_RX = GPIO1_A7
 
 # PWM
 PWM0 = GPIO4_C2
@@ -77,18 +80,21 @@ PWM1 = GPIO4_C6
 
 # ordered as i2cId, SCL, SDA
 i2cPorts = (
-    (0, I2C2_SCL, I2C2_SDA),
-    (1, I2C6_SCL, I2C6_SDA),
+    (2, I2C2_SCL, I2C2_SDA),
+    (6, I2C6_SCL, I2C6_SDA),
     (7, I2C7_SCL, I2C7_SDA),
 )
 
 # ordered as spiId, sckId, mosiId, misoId
-spiPorts = ((1, SPI1_SCLK, SPI1_MOSI, SPI1_MISO),)
+spiPorts = (
+    (1, SPI1_SCLK, SPI1_MOSI, SPI1_MISO),
+    (2, SPI2_SCLK, SPI2_MOSI, SPI2_MISO),
+)
 
 # SysFS pwm outputs, pwm channel and pin in first tuple
 pwmOuts = (
     ((0, 0), PWM0),
-    ((1, 0), PWM1),
+    ((0, 0), PWM1),
 )
 
 # SysFS analog inputs, Ordered as analog analogInId, device, and channel

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

diff --git a/src/adafruit_blinka/microcontroller/rockchip/rk3399_t/pin.py b/src/adafruit_blinka/microcontroller/rockchip/rk3399_t/pin.py
deleted file mode 100644 (file)
index e72e45b..0000000
--- a/src/adafruit_blinka/microcontroller/rockchip/rk3399_t/pin.py
+++ /dev/null
@@ -1,78 +0,0 @@
-# SPDX-FileCopyrightText: 2023 Wouter Groeneveld
-# See https://wiki.radxa.com/Rock4/hardware/gpio (click EXPAND for the Pi 4C, chip RK3399_T)
-#
-# SPDX-License-Identifier: MIT
-"""A Pin class for use with Rockchip RK3399_T."""
-
-from adafruit_blinka.microcontroller.generic_linux.sysfs_pin import Pin
-
-GPIO1_A1 = Pin(33)
-GPIO1_A4 = Pin(36)
-GPIO1_A7 = Pin(39)
-GPIO1_B0 = Pin(40)
-GPIO1_B1 = Pin(41)
-GPIO1_B2 = Pin(42)
-GPIO1_C4 = Pin(52)
-GPIO2_A0 = Pin(64)
-GPIO2_A1 = Pin(65)
-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_D3 = Pin(91)
-GPIO2_D4 = Pin(92)
-GPIO3_C0 = Pin(112)
-GPIO4_A5 = Pin(133)
-GPIO4_C2 = Pin(146)
-GPIO4_C3 = Pin(147)
-GPIO4_C4 = Pin(148)
-GPIO4_C5 = Pin(149)
-GPIO4_C6 = Pin(150)
-GPIO4_D2 = Pin(154)
-GPIO4_D4 = Pin(156)
-GPIO4_D5 = Pin(157)
-GPIO4_D6 = Pin(158)
-ADC_IN0 = 1
-
-# I2C
-I2C2_SDA = GPIO2_A0
-I2C2_SCL = GPIO2_A1
-I2C6_SDA = GPIO2_B1
-I2C6_SCL = GPIO2_B2
-I2C7_SDA = GPIO2_A7
-I2C7_SCL = GPIO2_B0
-
-# SPI
-SPI1_CS = GPIO1_B2
-SPI1_SCLK = GPIO1_B1
-SPI1_MISO = GPIO1_B0
-SPI1_MOSI = GPIO1_A7
-SPI2_CS = GPIO2_B4
-SPI2_SCLK = GPIO2_B3
-SPI2_MISO = GPIO2_B1
-SPI2_MOSI = GPIO2_B2
-
-# UART
-UART0_TX = GPIO4_C4
-UART0_RX = GPIO4_C3
-
-# PWM
-PWM0 = GPIO4_C2
-
-# ordered as i2cId, SCL, SDA
-i2cPorts = (
-    (0, I2C2_SCL, I2C2_SDA),
-    (1, I2C6_SCL, I2C6_SDA),
-    (7, I2C7_SCL, I2C7_SDA),
-)
-
-# ordered as spiId, sckId, mosiId, misoId
-spiPorts = ((1, SPI1_SCLK, SPI1_MOSI, SPI1_MISO),)
-
-# SysFS pwm outputs, pwm channel and pin in first tuple
-pwmOuts = (((0, 0), PWM0),)
-
-# SysFS analog inputs, Ordered as analog analogInId, device, and channel
-analogIns = ((ADC_IN0, 0, 0),)

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 c389fded8d15ea25175542434523ca6028105e79..fc3b754df73420199df01e4da459e3c774fd86df 100644 (file)
--- a/src/board.py
+++ b/src/board.py
@@ -248,7 +248,7 @@ elif board_id == ap_board.ROCK_PI_4:
     from adafruit_blinka.board.radxa.rockpi4 import *
 
 elif board_id == ap_board.ROCK_PI_4_C_PLUS:
-    from adafruit_blinka.board.radxa.rockpi4cplus import *
+    from adafruit_blinka.board.radxa.rockpi4 import *
 
 elif board_id == ap_board.ROCK_PI_5:
     from adafruit_blinka.board.radxa.rock5 import *
@@ -325,6 +325,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 *
 

diff --git a/src/digitalio.py b/src/digitalio.py
index 46af5eac3854c95f578ac8d15de224c71b9fb882..3f3a36b76d64c5ba8e79d2428c13a319d66dd501 100644 (file)
--- a/src/digitalio.py
+++ b/src/digitalio.py
@@ -78,7 +78,7 @@ elif detector.chip.RK3308:
 elif detector.chip.RK3399:
     from adafruit_blinka.microcontroller.rockchip.rk3399.pin import Pin
 elif detector.chip.RK3399_T:
-    from adafruit_blinka.microcontroller.rockchip.rk3399_t.pin import Pin
+    from adafruit_blinka.microcontroller.rockchip.rk3399.pin import Pin
 elif detector.chip.RK3588:
     from adafruit_blinka.microcontroller.rockchip.rk3588.pin import Pin
 elif detector.chip.RK3328:

diff --git a/src/microcontroller/__init__.py b/src/microcontroller/__init__.py
index a73c4dd6d6c02331143042710f7346973d3312b9..ad8c90a8b915f881d5597858a82ac657ce9e114a 100644 (file)
--- a/src/microcontroller/__init__.py
+++ b/src/microcontroller/__init__.py
@@ -99,7 +99,7 @@ elif chip_id == ap_chip.RK3308:
 elif chip_id == ap_chip.RK3399:
     from adafruit_blinka.microcontroller.rockchip.rk3399 import *
 elif chip_id == ap_chip.RK3399_T:
-    from adafruit_blinka.microcontroller.rockchip.rk3399_t import *
+    from adafruit_blinka.microcontroller.rockchip.rk3399 import *
 elif chip_id == ap_chip.RK3588:
     from adafruit_blinka.microcontroller.rockchip.rk3588 import *
 elif chip_id == ap_chip.RK3328:

diff --git a/src/microcontroller/pin.py b/src/microcontroller/pin.py
index bd6702bf18c90710ee7714078729b661d60b3892..cdb613be40185a399239c6394a025da782b36512 100644 (file)
--- a/src/microcontroller/pin.py
+++ b/src/microcontroller/pin.py
@@ -102,7 +102,7 @@ elif chip_id == ap_chip.RK3308:
 elif chip_id == ap_chip.RK3399:
     from adafruit_blinka.microcontroller.rockchip.rk3399.pin import *
 elif chip_id == ap_chip.RK3399_T:
-    from adafruit_blinka.microcontroller.rockchip.rk3399_t.pin import *
+    from adafruit_blinka.microcontroller.rockchip.rk3399.pin import *
 elif chip_id == ap_chip.RK3588:
     from adafruit_blinka.microcontroller.rockchip.rk3588.pin import *
 elif chip_id == ap_chip.RK3328: