From: Melissa LeBlanc-Williams <melissa@adafruit.com>
Date: Tue, 12 Mar 2024 15:37:12 +0000 (-0700)
Subject: Merge pull request #790 from how2flow/odroid
X-Git-Tag: 8.35.0
X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/db9616f6d0c1e0889f6e67c611c898ad43f9bc35?hp=-c

Merge pull request #790 from how2flow/odroid

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

db9616f6d0c1e0889f6e67c611c898ad43f9bc35
diff --combined src/adafruit_blinka/microcontroller/rockchip/rk3566/pin.py
index 88141d5,ef283b9..a32a077
--- a/src/adafruit_blinka/microcontroller/rockchip/rk3566/pin.py
+++ b/src/adafruit_blinka/microcontroller/rockchip/rk3566/pin.py
@@@ -64,13 -64,9 +64,13 @@@ GPIO2_C4 = Pin((2, 20)
  GPIO2_C5 = Pin((2, 21))
  GPIO2_C6 = Pin((2, 22))
  GPIO3_A1 = Pin((3, 1))
 +GPIO3_A2 = Pin((3, 2))
 +GPIO3_A3 = Pin((3, 3))
 +GPIO3_A4 = Pin((3, 4))
  GPIO3_A5 = Pin((3, 5))
  GPIO3_A6 = Pin((3, 6))
  GPIO3_A7 = Pin((3, 7))
 +GPIO3_B0 = Pin((3, 8))
  GPIO3_B1 = Pin((3, 9))
  GPIO3_B2 = Pin((3, 10))
  GPIO3_B3 = Pin((3, 11))
@@@ -193,12 -189,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