Merge remote-tracking branch 'upstream/master'

diff --cc src/adafruit_blinka/microcontroller/ftdi_mpsse/mpsse/pin.py
index 6a0ea938ffe3db0a79f5ff664bdc1c857c51a9a7,42ae5abd70e1176e7f6faaf23c3e53a4d5fd98ad..dc6282abfa82ab17b9e38c796e37c0a1daeeddf9
--- 1/src/adafruit_blinka/microcontroller/ftdi_mpsse/mpsse/pin.py
--- 2/src/adafruit_blinka/microcontroller/ft232h/pin.py
+++ b/src/adafruit_blinka/microcontroller/ftdi_mpsse/mpsse/pin.py
@@@ -8,13 -8,16 +8,16 @@@ class Pin
      OUT = 1
      LOW = 0
      HIGH = 1
+     PULL_NONE = 0
+     PULL_UP = 1
+     PULL_DOWN = 2
  
 -    ft232h_gpio = None
 +    mpsse_gpio = None
  
 -    def __init__(self, pin_id=None):
 +    def __init__(self, pin_id=None, url="ftdi://ftdi:ft232h/1"):
          # setup GPIO controller if not done yet
          # use one provided by I2C as default
 -        if not Pin.ft232h_gpio:
 +        if not Pin.mpsse_gpio:
              # pylint: disable=import-outside-toplevel
              from pyftdi.i2c import I2cController
  
@@@ -34,11 -37,11 +37,11 @@@
          """Initialize the Pin"""
          if not self.id:
              raise RuntimeError("Can not init a None type pin.")
 -        # FT232H does't have configurable internal pulls?
 +        # MPSSE does't have configurable internal pulls?
          if pull:
-             raise ValueError("Internal pull up/down not currently supported.")
+             raise NotImplementedError("Internal pull up/down not currently supported.")
 -        pin_mask = Pin.ft232h_gpio.pins | 1 << self.id
 -        current = Pin.ft232h_gpio.direction
 +        pin_mask = Pin.mpsse_gpio.pins | 1 << self.id
 +        current = Pin.mpsse_gpio.direction
          if mode == self.OUT:
              current |= 1 << self.id
          else:

diff --cc src/adafruit_blinka/microcontroller/ftdi_mpsse/mpsse/spi.py
Simple merge

diff --cc src/board.py
Simple merge

diff --cc src/busio.py
Simple merge

diff --cc src/digitalio.py
index 53df36812a15675c9db2e001a53a556655276afe,a59866b9a74eb10270f775983156f22da5ae9a73..8db83991968a91875a915dff3487a886f1cf5639
--- 1/src/digitalio.py
--- 2/src/digitalio.py
+++ b/src/digitalio.py
@@@ -47,10 -51,10 +51,12 @@@ elif detector.chip.MIPS24KEC
      from adafruit_blinka.microcontroller.mips24kec.pin import Pin
  elif detector.chip.RK3308:
      from adafruit_blinka.microcontroller.rockchip.rk3308.pin import Pin
+ elif detector.chip.RK3399:
+     from adafruit_blinka.microcontroller.rockchip.rk3399.pin import Pin
  elif detector.board.ftdi_ft232h:
 -    from adafruit_blinka.microcontroller.ft232h.pin import Pin
 +    from adafruit_blinka.microcontroller.ftdi_mpsse.ft232h.pin import Pin
 +elif detector.board.ftdi_ft2232h:
 +    from adafruit_blinka.microcontroller.ftdi_mpsse.ft2232h.pin import Pin
  elif detector.board.binho_nova:
      from adafruit_blinka.microcontroller.nova.pin import Pin
  elif detector.board.greatfet_one:

diff --cc src/microcontroller/__init__.py
index f40d9f0a37218335cfe85991ed66127889b7ce41,eed47576345a9530148654681a4994a94d602bab..56396a00463b6186260250f552e326c38bed9129
--- 1/src/microcontroller/__init__.py
--- 2/src/microcontroller/__init__.py
+++ b/src/microcontroller/__init__.py
@@@ -78,9 -97,11 +97,15 @@@ elif chip_id == ap_chip.MIPS24KC
      from adafruit_blinka.microcontroller.atheros.ar9331.pin import *
  elif chip_id == ap_chip.MIPS24KEC:
      from adafruit_blinka.microcontroller.mips24kec.pin import *
 +elif chip_id == ap_chip.FT232H:
 +    from adafruit_blinka.microcontroller.ftdi_mpsse.ft232h.pin import *
 +elif chip_id == ap_chip.FT2232H:
 +    from adafruit_blinka.microcontroller.ftdi_mpsse.ft2232h.pin import *
+ elif chip_id == ap_chip.PENTIUM_N3710:
+     from adafruit_blinka.microcontroller.pentium.n3710.pin import *
+ elif chip_id == ap_chip.STM32MP157:
+     from adafruit_blinka.microcontroller.stm32.stm32mp157.pin import *
+ elif chip_id == ap_chip.MT8167:
+     from adafruit_blinka.microcontroller.mt8167.pin import *
  else:
      raise NotImplementedError("Microcontroller not supported:", chip_id)

diff --cc src/microcontroller/pin.py
Simple merge