From: Brent Rubell <brentru@users.noreply.github.com>
Date: Fri, 14 Jun 2024 14:30:38 +0000 (-0400)
Subject: Merge branch 'adafruit:main' into add-pwmout-generic-board
X-Git-Tag: 8.43.0^2~2
X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/a70019b2c07d42accb700e85c5df28d45d4f7694?hp=9918df54467106dae7c302fb4fa90480568bbf7a

Merge branch 'adafruit:main' into add-pwmout-generic-board
---

diff --git a/src/adafruit_blinka/board/orangepi/orangepipc2.py b/src/adafruit_blinka/board/orangepi/orangepipc2.py
new file mode 100644
index 0000000..d662f35
--- /dev/null
+++ b/src/adafruit_blinka/board/orangepi/orangepipc2.py
@@ -0,0 +1,44 @@
+# SPDX-FileCopyrightText: 2021 Melissa LeBlanc-Williams for Adafruit Industries
+#
+# SPDX-License-Identifier: MIT
+"""Pin definitions for the Orange Pi PC2."""
+
+from adafruit_blinka.microcontroller.allwinner.h5 import pin
+
+PA12 = pin.PA12
+SDA = pin.PA12
+PA11 = pin.PA11
+SCL = pin.PA11
+PA6 = pin.PA6
+PA1 = pin.PA1
+PA0 = pin.PA0
+PA3 = pin.PA3
+PA15 = pin.PA15
+MOSI = pin.SPI1_MOSI
+PA16 = pin.PA16
+MISO = pin.SPI1_MISO
+PA14 = pin.PA14
+SCK = pin.SPI1_SCLK
+SCLK = pin.SPI1_SCLK
+PA19 = pin.PA19
+PA7 = pin.PA7
+PA8 = pin.PA8
+PA9 = pin.PA9
+PA10 = pin.PA10
+PD11 = pin.PD11
+
+PC5 = pin.PC5
+TX = pin.PC5
+PC6 = pin.PC6
+RX = pin.PC6
+PD14 = pin.PD14
+PC4 = pin.PC4
+PC7 = pin.PC7
+PA2 = pin.PA2
+PA13 = pin.PA13
+PA21 = pin.PA21
+PA18 = pin.PA18
+PG8 = pin.PG8
+PG9 = pin.PG9
+PG6 = pin.PG6
+PG7 = pin.PG7
diff --git a/src/adafruit_blinka/microcontroller/allwinner/h5/pin.py b/src/adafruit_blinka/microcontroller/allwinner/h5/pin.py
index 16b035d..8ba1431 100644
--- a/src/adafruit_blinka/microcontroller/allwinner/h5/pin.py
+++ b/src/adafruit_blinka/microcontroller/allwinner/h5/pin.py
@@ -43,6 +43,8 @@ SPI0_SCLK = PC2
 PC3 = Pin((1, 67))
 SPI0_CS = PC3
 PC4 = Pin((1, 68))
+PC5 = Pin((1, 69))
+PC6 = Pin((1, 70))
 PC7 = Pin((1, 71))
 
 PD11 = Pin((1, 107))
diff --git a/src/adafruit_blinka/microcontroller/rockchip/rk3399/pin.py b/src/adafruit_blinka/microcontroller/rockchip/rk3399/pin.py
index 792cff9..3cfad48 100644
--- a/src/adafruit_blinka/microcontroller/rockchip/rk3399/pin.py
+++ b/src/adafruit_blinka/microcontroller/rockchip/rk3399/pin.py
@@ -207,6 +207,7 @@ UART4_RX = GPIO1_A7
 # PWM
 PWM0 = GPIO4_C2
 PWM1 = GPIO4_C6
+PWM2 = GPIO1_C3
 
 # ordered as i2cId, SCL, SDA
 i2cPorts = (
@@ -224,7 +225,8 @@ spiPorts = (
 # SysFS pwm outputs, pwm channel and pin in first tuple
 pwmOuts = (
     ((0, 0), PWM0),
-    ((0, 0), PWM1),
+    ((1, 0), PWM1),
+    ((2, 0), PWM2),
 )
 
 # SysFS analog inputs, Ordered as analog analogInId, device, and channel
diff --git a/src/board.py b/src/board.py
index d66b000..0cd745a 100644
--- a/src/board.py
+++ b/src/board.py
@@ -96,6 +96,9 @@ elif board_id == ap_board.BEAGLEV_STARLIGHT:
 elif board_id == ap_board.ORANGE_PI_PC:
     from adafruit_blinka.board.orangepi.orangepipc import *
 
+elif board_id == ap_board.ORANGE_PI_PC2:
+    from adafruit_blinka.board.orangepi.orangepipc2 import *
+
 elif board_id == ap_board.ORANGE_PI_R1:
     from adafruit_blinka.board.orangepi.orangepir1 import *