Merge branch 'adafruit:main' into main

diff --git a/src/adafruit_blinka/board/radxa/radxazero3.py b/src/adafruit_blinka/board/radxa/radxazero3.py
index 46a44d68d9b57ca05bdcb9bc0ce6c8613cc3f970..d6c3878eb1c7bc4360b892f58141e95104a72086 100644 (file)
--- a/src/adafruit_blinka/board/radxa/radxazero3.py
+++ b/src/adafruit_blinka/board/radxa/radxazero3.py
@@ -63,3 +63,7 @@ TXD = D0_D1
 RXD = D0_D0
 TX = D0_D1
 RX = D0_D0
+
+# PWM
+PWM8 = D3_B1
+PWM9 = D3_B2
\ No newline at end of file

diff --git a/src/adafruit_blinka/microcontroller/rockchip/rk3566/pin.py b/src/adafruit_blinka/microcontroller/rockchip/rk3566/pin.py
index bfb3013890ad73c099584e637fcff973da2a47ae..ccf1861c4fb83b6498793e67156b07c101f55c8d 100644 (file)
--- a/src/adafruit_blinka/microcontroller/rockchip/rk3566/pin.py
+++ b/src/adafruit_blinka/microcontroller/rockchip/rk3566/pin.py
@@ -241,6 +241,16 @@ if board in ("ODROID_M1S"):
         globals()[alias + "_TX"] = GPIO2_A4
         globals()[alias + "_RX"] = GPIO2_A3
         uartPorts.append((int(alias[-1]), GPIO2_A4, GPIO2_A3))
+        
+if board in ("RADXA_ZERO3"):
+    alias = get_pwm_chipid("fe6f0000.pwm")
+    if alias is not None:
+        globals()["PWM" + alias] = GPIO3_B1
+        pwmOuts.append(((int(alias[-1]), 0), GPIO3_B1))
+    alias = get_pwm_chipid("fe6f0010.pwm")
+    if alias is not None:
+        globals()["PWM" + alias] = GPIO3_B2
+        pwmOuts.append(((int(alias[-1]), 0), GPIO3_B2))
 
 analogIns = tuple(analogIns)
 i2cPorts = tuple(i2cPorts)