Merge pull request #658 from MathijsNL/main

Fix Rock 4C Plus pin mapping and board file

src/adafruit_blinka/board/radxa/rockpi4cplus.py

@@ -12,8 +12,8 @@
 D8 = pin.GPIO4_C4
 D10 = pin.GPIO4_C3
 D11 = pin.GPIO4_C2
-D12 = pin.GPIO2_D3
-D13 = pin.GPIO1_A1
+D12 = pin.GPIO4_A3
+D13 = pin.GPIO4_C6
 D15 = pin.GPIO4_C5
 D16 = pin.GPIO4_D2
 D18 = pin.GPIO4_D4
@@ -29,10 +29,10 @@
 D32 = pin.GPIO3_C0
 D33 = pin.GPIO2_B4
 D35 = pin.GPIO4_A5
-D36 = pin.GPIO2_D4
+D36 = pin.GPIO4_A4
 D37 = pin.GPIO4_D6
-D38 = pin.GPIO1_A4
-D40 = pin.GPIO1_C4
+D38 = pin.GPIO4_A6
+D40 = pin.GPIO4_A7
 
 SDA2 = D27
 SCL2 = D28
@@ -46,10 +46,10 @@
 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
@@ -62,5 +62,6 @@
 UART_RX = UART2_RX
 
 PWM0 = pin.PWM0
+PWM1 = pin.PWM1
 
 ADC_IN0 = pin.ADC_IN0

src/adafruit_blinka/microcontroller/rockchip/rk3399_t/pin.py

@@ -1,18 +1,15 @@
 # SPDX-FileCopyrightText: 2023 Wouter Groeneveld
-# See https://wiki.radxa.com/Rock4/hardware/gpio (click EXPAND for the Pi 4C, chip RK3399_T)
+# See https://wiki.radxa.com/Rock4/hardware/gpio
 #
 # 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)
@@ -21,10 +18,12 @@
 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_A3 = Pin(131)
+GPIO4_A4 = Pin(132)
 GPIO4_A5 = Pin(133)
+GPIO4_A6 = Pin(134)
+GPIO4_A7 = Pin(135)
 GPIO4_C2 = Pin(146)
 GPIO4_C3 = Pin(147)
 GPIO4_C4 = Pin(148)
@@ -47,32 +46,41 @@
 # 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
+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),)
+pwmOuts = (
+    ((0, 0), PWM0),
+    ((0, 0), PWM1),
+)
 
 # SysFS analog inputs, Ordered as analog analogInId, device, and channel
 analogIns = ((ADC_IN0, 0, 0),)