From: Melissa LeBlanc-Williams <melissa@adafruit.com>
Date: Fri, 15 Jan 2021 16:46:37 +0000 (-0700)
Subject: Merge pull request #395 from flyleaf91/master
X-Git-Tag: 5.11.0
X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/568c30950ba73848d672bc05d16ec081cab7f91b?hp=-c

Merge pull request #395 from flyleaf91/master

Add support for LubanCat i.MX6ULL board
---

568c30950ba73848d672bc05d16ec081cab7f91b
diff --combined src/board.py
index 4b66d8d,f0aa883..9f68792
--- a/src/board.py
+++ b/src/board.py
@@@ -99,9 -99,6 +99,9 @@@ elif board_id == ap_board.ORANGE_PI_2
  elif board_id == ap_board.ORANGE_PI_ZERO_PLUS_2H5:
      from adafruit_blinka.board.orangepi.orangepizeroplus2h5 import *
  
 +elif board_id == ap_board.ORANGE_PI_ZERO_PLUS:
 +    from adafruit_blinka.board.orangepi.orangepizeroplus import *
 +
  elif board_id == ap_board.BANANA_PI_M2_ZERO:
      from adafruit_blinka.board.bananapi.bpim2zero import *
  
@@@ -186,6 -183,9 +186,9 @@@ elif board_id == ap_board.UDOO_X86
  elif board_id == ap_board.STM32MP157C_DK2:
      from adafruit_blinka.board.stm32.stm32mp157c_dk2 import *
  
+ elif board_id == ap_board.LUBANCAT_IMX6ULL:
+     from adafruit_blinka.board.lubancat.lubancat_imx6ull import *
+ 
  elif "sphinx" in sys.modules:
      pass
  
diff --combined src/busio.py
index cc37936,9260ccc..8e61dc2
--- a/src/busio.py
+++ b/src/busio.py
@@@ -27,7 -27,7 +27,7 @@@ class I2C(Lockable)
      for both MicroPython and Linux.
      """
  
 -    def __init__(self, scl, sda, frequency=400000):
 +    def __init__(self, scl, sda, frequency=100000):
          self.init(scl, sda, frequency)
  
      def init(self, scl, sda, frequency):
@@@ -269,6 -269,9 +269,9 @@@ class SPI(Lockable)
          elif board_id == ap_board.ONION_OMEGA2:
              from adafruit_blinka.microcontroller.mips24kec.pin import Pin
              from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
+         elif detector.board.any_lubancat and detector.chip.id == ap_chip.IMX6ULL:
+             from adafruit_blinka.microcontroller.nxp_imx6ull.pin import Pin
+             from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
          else:
              from machine import SPI as _SPI
              from machine import Pin
diff --combined src/microcontroller/__init__.py
index a10bab6,593745b..020b070
--- a/src/microcontroller/__init__.py
+++ b/src/microcontroller/__init__.py
@@@ -66,10 -66,10 +66,12 @@@ 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.H5:
 +    from adafruit_blinka.microcontroller.allwinner.h5.pin import *
  elif chip_id == ap_chip.IMX8MX:
      from adafruit_blinka.microcontroller.nxp_imx8m import *
+ elif chip_id == ap_chip.IMX6ULL:
+     from adafruit_blinka.microcontroller.nxp_imx6ull import *
  elif chip_id == ap_chip.HFU540:
      from adafruit_blinka.microcontroller.hfu540.pin import *
  elif chip_id == ap_chip.BINHO: