Merge pull request #790 from how2flow/odroid

ODROID-M1/S: Fix that pwm1, pwm2 pins do not match with kernel dtbos

diff --git a/src/adafruit_blinka/microcontroller/rockchip/rk3566/pin.py b/src/adafruit_blinka/microcontroller/rockchip/rk3566/pin.py
index 88141d5bcd2e8953a09c23268dafecc743504820..a32a077c5a79306a37f8fa4056461b208e6b600f 100644 (file)
--- a/src/adafruit_blinka/microcontroller/rockchip/rk3566/pin.py
+++ b/src/adafruit_blinka/microcontroller/rockchip/rk3566/pin.py
@@ -193,12 +193,12 @@ if board in ("ODROID_M1S"):
         i2cPorts.append((int(alias[-1]), GPIO3_B5, GPIO3_B6))
     alias = get_pwm_chipid("fdd70010.pwm")
     if alias is not None:
-        globals()["PWM" + alias] = GPIO0_C0
-        pwmOuts.append(((int(alias[-1]), 0), GPIO0_C0))
+        globals()["PWM" + alias] = GPIO0_B5
+        pwmOuts.append(((int(alias[-1]), 0), GPIO0_B5))
     alias = get_pwm_chipid("fdd70020.pwm")
     if alias is not None:
-        globals()["PWM" + alias] = GPIO0_C1
-        pwmOuts.append(((int(alias[-1]), 0), GPIO0_C1))
+        globals()["PWM" + alias] = GPIO0_B6
+        pwmOuts.append(((int(alias[-1]), 0), GPIO0_B6))
     alias = get_pwm_chipid("fdd70030.pwm")
     if alias is not None:
         globals()["PWM" + alias] = GPIO0_C2

diff --git a/src/adafruit_blinka/microcontroller/rockchip/rk3568b2/pin.py b/src/adafruit_blinka/microcontroller/rockchip/rk3568b2/pin.py
index 1179e1d441f2a35d4d426e726270d766c8afb28d..45a0aa61ba6707df16f9a8fb262106c9758ec696 100644 (file)
--- a/src/adafruit_blinka/microcontroller/rockchip/rk3568b2/pin.py
+++ b/src/adafruit_blinka/microcontroller/rockchip/rk3568b2/pin.py
@@ -91,12 +91,12 @@ if board in ("ODROID_M1"):
         i2cPorts.append((int(alias[-1]), GPIO3B_5, GPIO3B_6))
     alias = get_pwm_chipid("fdd70010.pwm")
     if alias is not None:
-        globals()["PWM" + alias] = GPIO0C_0
-        pwmOuts.append(((int(alias[-1]), 0), GPIO0C_0))
+        globals()["PWM" + alias] = GPIO0B_5
+        pwmOuts.append(((int(alias[-1]), 0), GPIO0B_5))
     alias = get_pwm_chipid("fdd70020.pwm")
     if alias is not None:
-        globals()["PWM" + alias] = GPIO0C_1
-        pwmOuts.append(((int(alias[-1]), 0), GPIO0C_1))
+        globals()["PWM" + alias] = GPIO0B_6
+        pwmOuts.append(((int(alias[-1]), 0), GPIO0B_6))
     alias = get_pwm_chipid("fe6f0010.pwm")
     if alias is not None:
         globals()["PWM" + alias] = GPIO3B_2