Merge rk3399_t with rk3399

[hackapet/Adafruit_Blinka.git] / src / adafruit_blinka / microcontroller / rockchip / rk3399 / pin.py

diff --git a/src/adafruit_blinka/microcontroller/rockchip/rk3399/pin.py b/src/adafruit_blinka/microcontroller/rockchip/rk3399/pin.py
index 9d6de08755a582fa7fa5b18b96f9f21305110a5a..5436a3720390b2b845f65557846af477f3096de6 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
 # SPDX-FileCopyrightText: 2021 Melissa LeBlanc-Williams for Adafruit Industries

+# See https://wiki.radxa.com/Rock4/hardware/gpio

 #
 # SPDX-License-Identifier: MIT
 #
 # 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
 
 
 from adafruit_blinka.microcontroller.generic_linux.sysfs_pin import Pin
 


@@ -45,16 +46,18 @@ I2C7_SCL = GPIO2_B0
 # SPI
 SPI1_CS = GPIO1_B2
 SPI1_SCLK = GPIO1_B1
 # 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_CS = GPIO2_B4

-SPI2_SCLK = GPIO2_A1
+SPI2_SCLK = GPIO2_B3

 SPI2_MISO = GPIO2_B1
 SPI2_MOSI = GPIO2_B2
 
 # UART
 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
 
 # PWM
 PWM0 = GPIO4_C2


@@ -62,18 +65,21 @@ PWM1 = GPIO4_C6
 
 # ordered as i2cId, SCL, SDA
 i2cPorts = (
 
 # 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
     (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),
 
 # 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
 )
 
 # SysFS analog inputs, Ordered as analog analogInId, device, and channel