From: MathijsNL <mathijsvandervegt@gmail.com>
Date: Wed, 15 Mar 2023 21:55:26 +0000 (+0100)
Subject: Merge rk3399_t with rk3399
X-Git-Tag: 8.17.0~2^2~1
X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/7404136dc709bf311722a9f67309c96b192aa257?ds=inline

Merge rk3399_t with rk3399
---

diff --git a/src/adafruit_blinka/board/radxa/rockpi4.py b/src/adafruit_blinka/board/radxa/rockpi4.py
index bd3e449..9fdccbc 100644
--- 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
index 67635fc..0000000
--- a/src/adafruit_blinka/board/radxa/rockpi4cplus.py
+++ /dev/null
@@ -1,67 +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.GPIO4_A3
-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
-
-SDA6 = D31
-SCL6 = D29
-
-SDA7 = D3
-SCL7 = D5
-
-SDA = SDA2
-SCL = SCL2
-
-SCLK = D19
-MOSI = D21
-MISO = D23
-CS = D24
-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
diff --git a/src/adafruit_blinka/microcontroller/rockchip/rk3399/pin.py b/src/adafruit_blinka/microcontroller/rockchip/rk3399/pin.py
index e7d994d..5436a37 100644
--- a/src/adafruit_blinka/microcontroller/rockchip/rk3399/pin.py
+++ b/src/adafruit_blinka/microcontroller/rockchip/rk3399/pin.py
@@ -1,22 +1,15 @@
 # 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
 
-GPIO1_A1 = Pin(33)
-GPIO1_A3 = Pin(35)
 GPIO1_A7 = Pin(39)
 GPIO1_B0 = Pin(40)
 GPIO1_B1 = Pin(41)
 GPIO1_B2 = Pin(42)
-GPIO1_C2 = Pin(50)
-GPIO1_C4 = Pin(52)
-GPIO1_C5 = Pin(53)
-GPIO1_C6 = Pin(54)
-GPIO1_C7 = Pin(55)
-GPIO1_D0 = Pin(56)
 GPIO2_A0 = Pin(64)
 GPIO2_A1 = Pin(65)
 GPIO2_A7 = Pin(71)
@@ -25,15 +18,12 @@ GPIO2_B1 = Pin(73)
 GPIO2_B2 = Pin(74)
 GPIO2_B3 = Pin(75)
 GPIO2_B4 = Pin(76)
-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_C0 = Pin(144)
-GPIO4_C1 = Pin(145)
 GPIO4_C2 = Pin(146)
 GPIO4_C3 = Pin(147)
 GPIO4_C4 = Pin(148)
@@ -48,28 +38,26 @@ ADC_IN0 = 1
 # I2C
 I2C2_SDA = GPIO2_A0
 I2C2_SCL = GPIO2_A1
-I2C3_SDA = GPIO4_C0
-I2C3_SCL = GPIO4_C1
 I2C6_SDA = GPIO2_B1
 I2C6_SCL = GPIO2_B2
 I2C7_SDA = GPIO2_A7
 I2C7_SCL = GPIO2_B0
-I2C8_SDA = GPIO1_C4
-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 +65,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
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
index 7412e8e..0000000
--- a/src/adafruit_blinka/microcontroller/rockchip/rk3399_t/pin.py
+++ /dev/null
@@ -1,86 +0,0 @@
-# SPDX-FileCopyrightText: 2023 Wouter Groeneveld
-# 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_A7 = Pin(39)
-GPIO1_B0 = Pin(40)
-GPIO1_B1 = Pin(41)
-GPIO1_B2 = Pin(42)
-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)
-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)
-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_A7
-SPI1_MOSI = GPIO1_B0
-SPI2_CS = GPIO2_B4
-SPI2_SCLK = GPIO2_B3
-SPI2_MISO = GPIO2_B1
-SPI2_MOSI = GPIO2_B2
-
-# UART
-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 = (
-    (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),
-    (2, SPI2_SCLK, SPI2_MOSI, SPI2_MISO),
-)
-
-# SysFS pwm outputs, pwm channel and pin in first tuple
-pwmOuts = (
-    ((0, 0), PWM0),
-    ((0, 0), PWM1),
-)
-
-# SysFS analog inputs, Ordered as analog analogInId, device, and channel
-analogIns = ((ADC_IN0, 0, 0),)
diff --git a/src/board.py b/src/board.py
index 479e06e..905be5e 100644
--- a/src/board.py
+++ b/src/board.py
@@ -242,7 +242,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 *
diff --git a/src/digitalio.py b/src/digitalio.py
index ed31d0a..7ce3240 100644
--- a/src/digitalio.py
+++ b/src/digitalio.py
@@ -70,7 +70,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 0951c0e..715c080 100644
--- a/src/microcontroller/__init__.py
+++ b/src/microcontroller/__init__.py
@@ -91,7 +91,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 a5b7ede..ebdac6b 100644
--- a/src/microcontroller/pin.py
+++ b/src/microcontroller/pin.py
@@ -94,7 +94,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: