Merge branch 'adafruit:main' into main

diff --git a/src/adafruit_blinka/board/orangepi/orangepi3b.py b/src/adafruit_blinka/board/orangepi/orangepi3b.py
new file mode 100644 (file)
index 0000000..7ec49ad
--- /dev/null
+++ b/src/adafruit_blinka/board/orangepi/orangepi3b.py
@@ -0,0 +1,84 @@
+# SPDX-FileCopyrightText: 2021 Melissa LeBlanc-Williams for Adafruit Industries
+#
+# SPDX-License-Identifier: MIT
+"""Pin definitions for the Orangepi 3B."""
+
+from adafruit_blinka.microcontroller.rockchip.rk3566 import pin
+
+# D pin number is ordered by physical pin sequence
+# Reference: https://service.robots.org.nz/wiki/Wiki.jsp?page=OrangePi
+
+# D2 = VCC5V0_SYS
+D3 = pin.I2C2_SDA_M1
+# D4 = VCC5V0_SYS
+D5 = pin.I2C2_SCL_M1
+# D6 = GND
+D7 = pin.GPIO4_C3  # GPIO4_C3/PWM15
+D8 = pin.GPIO0_D1
+# D9 = GND
+D10 = pin.GPIO0_D0
+D11 = pin.GPIO3_C6
+D12 = pin.GPIO3_C7
+D13 = pin.GPIO4_A0
+# D14 = GND
+D15 = pin.GPIO4_A2
+D16 = pin.GPIO4_A3
+# D17 = Vcc3V3_SYS
+D18 = pin.GPIO4_A1
+D19 = pin.SPI3_MOSI_M0
+# D20 = GND
+D21 = pin.SPI3_MISO_M0
+D22 = pin.GPIO4_A4
+D23 = pin.SPI3_CLK_M0
+D24 = pin.SPI3_CS0_M0
+# D25 = GND
+D26 = pin.GPIO4_A7
+D27 = pin.I2C3_SDA_M0
+D28 = pin.I2C3_SCL_M0
+D29 = pin.GPIO4_A5
+# D30 = GND
+D31 = pin.GPIO3_D4
+D32 = pin.GPIO4_C0
+D33 = pin.GPIO3_D7
+# D34 = GND
+D35 = pin.GPIO3_D0
+D36 = pin.GPIO3_D5
+D37 = pin.GPIO3_D3
+D38 = pin.GPIO3_D2
+# D39 = GND
+D40 = pin.GPIO3_D1
+
+# UART
+UART2_TX_M0 = pin.GPIO0_D1
+UART2_RX_M0 = pin.GPIO0_D0
+
+UART7_TX_M2 = pin.GPIO4_A2
+UART7_RX_M2 = pin.GPIO4_A3
+
+UART3_TX_M0 = pin.GPIO1_A1
+UART3_RX_M0 = pin.GPIO1_A0
+
+UART9_TX_M2 = pin.GPIO4_A4
+UART9_RX_M2 = pin.GPIO4_A5
+
+# I2C
+I2C2_SCL_M1 = pin.I2C2_SCL_M1
+I2C2_SDA_M1 = pin.I2C2_SDA_M1
+I2C3_SCL_M0 = pin.I2C3_SCL_M0
+I2C3_SDA_M0 = pin.I2C3_SDA_M0
+
+# Default I2C
+SCL = I2C2_SCL_M1
+SDA = I2C2_SDA_M1
+
+# SPI
+SPI3_MISO = pin.SPI3_MISO_M0
+SPI3_MOSI = pin.SPI3_MOSI_M0
+SPI3_CLK = pin.SPI3_CLK_M0
+SPI3_CS0 = pin.SPI3_CS0_M0
+
+# Default SPI
+MOSI = SPI3_MOSI
+MISO = SPI3_MISO
+SCLK = SPI3_CLK
+CS = SPI3_CS0

diff --git a/src/adafruit_blinka/microcontroller/rockchip/rk3566/pin.py b/src/adafruit_blinka/microcontroller/rockchip/rk3566/pin.py
index 1a8952b8b2938da1d58a21a5785c6b1769e82a9d..e95f390e7cc067397ae10f456d1295582ad97d6b 100644 (file)
--- a/src/adafruit_blinka/microcontroller/rockchip/rk3566/pin.py
+++ b/src/adafruit_blinka/microcontroller/rockchip/rk3566/pin.py
@@ -93,6 +93,15 @@ GPIO3_D2 = Pin((3, 26))
 GPIO3_D3 = Pin((3, 27))
 GPIO3_D4 = Pin((3, 28))
 GPIO3_D5 = Pin((3, 29))
+GPIO3_D6 = Pin((3, 30))
+GPIO3_D7 = Pin((3, 31))
+
+# GPIO4
+GPIO4_A0 = Pin((4, 0))
+GPIO4_A1 = Pin((4, 1))
+GPIO4_A2 = Pin((4, 2))
+GPIO4_A3 = Pin((4, 3))
+
 GPIO4_A4 = Pin((4, 4))
 GPIO4_A5 = Pin((4, 5))
 GPIO4_A6 = Pin((4, 6))
@@ -169,7 +178,8 @@ PWM1 = GPIO0_C7
 # ordered as i2cId, SCL, SDA
 i2cPorts = [
     (1, I2C1_SCL, I2C1_SDA),
-    (2, I2C2_SCL_M0, I2C2_SDA_M0),
+    # (2, I2C2_SCL_M0, I2C2_SDA_M0),
+    (2, I2C2_SCL_M1, I2C2_SDA_M1),
     (3, I2C3_SCL_M0, I2C3_SDA_M0),
     (4, I2C4_SCL_M0, I2C4_SDA_M0),
     (5, I2C5_SCL_M0, I2C5_SDA_M0),

diff --git a/src/board.py b/src/board.py
index 9243fee4f3a1550ea400fe04ffefbb4139cb0a14..c0d141e9c1ee0397646d7f8c651e5e7ad6741860 100644 (file)
--- a/src/board.py
+++ b/src/board.py
@@ -134,6 +134,9 @@ elif board_id == ap_board.ORANGE_PI_ZERO_2:
 elif board_id == ap_board.ORANGE_PI_3:
     from adafruit_blinka.board.orangepi.orangepi3 import *
 
+elif board_id == ap_board.ORANGE_PI_3B:
+    from adafruit_blinka.board.orangepi.orangepi3b import *
+
 elif board_id == ap_board.ORANGE_PI_4:
     from adafruit_blinka.board.orangepi.orangepi4 import *