From: Melissa LeBlanc-Williams <melissa@adafruit.com>
Date: Tue, 9 Mar 2021 18:19:34 +0000 (-0800)
Subject: Merge pull request #429 from thomoray/add-rockpi4c-support
X-Git-Tag: 6.4.0
X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/e74f14561a7a76f22a72cbe00e3bb8c5e7b0b964?ds=inline;hp=-c

Merge pull request #429 from thomoray/add-rockpi4c-support

Add rockpi4c support
---

e74f14561a7a76f22a72cbe00e3bb8c5e7b0b964
diff --combined src/busio.py
index d4613a3,45d8770..6749459
--- a/src/busio.py
+++ b/src/busio.py
@@@ -204,13 -204,8 +204,13 @@@ class SPI(Lockable)
          elif detector.board.any_beaglebone:
              from adafruit_blinka.microcontroller.am335x.pin import Pin
              from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
 -        elif detector.board.any_orange_pi and detector.chip.id == ap_chip.SUN8I:
 -            from adafruit_blinka.microcontroller.allwinner.h3.pin import Pin
 +        elif detector.board.any_orange_pi:
 +            if detector.chip.id == ap_chip.SUN8I:
 +                from adafruit_blinka.microcontroller.allwinner.h3.pin import Pin
 +            elif detector.chip.id == ap_chip.H5:
 +                from adafruit_blinka.microcontroller.allwinner.h5.pin import Pin
 +            elif detector.chip.id == ap_chip.H616:
 +                from adafruit_blinka.microcontroller.allwinner.h616.pin import Pin
              from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
          elif detector.board.any_nanopi and detector.chip.id == ap_chip.SUN8I:
              from adafruit_blinka.microcontroller.allwinner.h3.pin import Pin
@@@ -254,6 -249,9 +254,9 @@@
          elif detector.board.ROCK_PI_S:
              from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
              from adafruit_blinka.microcontroller.rockchip.rk3308.pin import Pin
+         elif detector.board.ROCK_PI_4:
+             from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
+             from adafruit_blinka.microcontroller.rockchip.rk3399.pin import Pin
          elif detector.board.SIFIVE_UNLEASHED:
              from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
              from adafruit_blinka.microcontroller.hfu540.pin import Pin
diff --combined src/microcontroller/__init__.py
index a5b3b75,ba99896..abd5a10
--- a/src/microcontroller/__init__.py
+++ b/src/microcontroller/__init__.py
@@@ -1,17 -1,10 +1,17 @@@
  """Microcontroller pins"""
  
 +import time
 +
  from adafruit_platformdetect.constants import chips as ap_chip
  from adafruit_blinka import Enum
  from adafruit_blinka.agnostic import board_id, chip_id
  
  
 +def delay_us(delay):
 +    """Sleep for delay usecs."""
 +    time.sleep(delay / 1e6)
 +
 +
  class Pin(Enum):
      """Reference Pin object"""
  
@@@ -75,6 -68,8 +75,8 @@@ elif chip_id == ap_chip.A33
      from adafruit_blinka.microcontroller.allwinner.a33.pin import *
  elif chip_id == ap_chip.RK3308:
      from adafruit_blinka.microcontroller.rockchip.rk3308.pin import *
+ elif chip_id == ap_chip.RK3399:
+     from adafruit_blinka.microcontroller.rockchip.rk3399.pin import *
  elif chip_id == ap_chip.H5:
      from adafruit_blinka.microcontroller.allwinner.h5.pin import *
  elif chip_id == ap_chip.IMX8MX: