From: Ryan L <ryestar101@gmail.com>
Date: Thu, 3 Nov 2022 15:28:23 +0000 (+0000)
Subject: Merge remote-tracking branch 'adafruit/main'
X-Git-Tag: 8.23.0~1^2~20
X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/494fc9fb46873dd14c555664e14070a9e456c1df?ds=inline;hp=-c

Merge remote-tracking branch 'adafruit/main'
---

494fc9fb46873dd14c555664e14070a9e456c1df
diff --combined src/board.py
index 83ad73c,c21ed30..70e6348
--- a/src/board.py
+++ b/src/board.py
@@@ -130,6 -130,9 +130,9 @@@ elif board_id == ap_board.ORANGE_PI_4_L
  elif board_id == ap_board.BANANA_PI_M2_ZERO:
      from adafruit_blinka.board.bananapi.bpim2zero import *
  
+ elif board_id == ap_board.BANANA_PI_M2_PLUS:
+     from adafruit_blinka.board.bananapi.bpim2plus import *
+ 
  elif board_id == ap_board.BANANA_PI_M5:
      from adafruit_blinka.board.bananapi.bpim5 import *
  
@@@ -208,12 -211,6 +211,12 @@@ elif board_id == ap_board.PINE64
  elif board_id == ap_board.PINEH64:
      from adafruit_blinka.board.pineH64 import *
  
 +elif board_id == ap_board.PCDUINO2:
 +    from adafruit_blinka.board.linksprite.pcduino2 import *
 +
 +elif board_id == ap_board.PCDUINO3:
 +    from adafruit_blinka.board.linksprite.pcduino3 import *
 +
  elif board_id == ap_board.SOPINE:
      from adafruit_blinka.board.soPine import *
  
@@@ -286,6 -283,9 +289,9 @@@ elif board_id == ap_board.LICHEE_RV
  elif board_id == ap_board.SIEMENS_SIMATIC_IOT2050_ADV:
      from adafruit_blinka.board.siemens.siemens_iot2050 import *
  
+ elif board_id == ap_board.AML_S905X_CC:
+     from adafruit_blinka.board.librecomputer.aml_s905x_cc_v1 import *
+ 
  elif "sphinx" in sys.modules:
      pass
  
diff --combined src/digitalio.py
index 2c14d80,3032706..2c6566a
--- a/src/digitalio.py
+++ b/src/digitalio.py
@@@ -24,10 -24,6 +24,10 @@@ elif detector.chip.JH71x0
      from adafruit_blinka.microcontroller.starfive.JH71x0.pin import Pin
  elif detector.chip.DRA74X:
      from adafruit_blinka.microcontroller.dra74x.pin import Pin
 +elif detector.chip.SUN4I:
 +    from adafruit_blinka.microcontroller.allwinner.a10.pin import Pin
 +elif detector.chip.SUN7I:
 +    from adafruit_blinka.microcontroller.allwinner.a10.pin import Pin
  elif detector.chip.SUN8I:
      from adafruit_blinka.microcontroller.allwinner.h3.pin import Pin
  elif detector.chip.SAMA5:
@@@ -42,6 -38,8 +42,8 @@@ elif detector.chip.T234
      from adafruit_blinka.microcontroller.tegra.t234.pin import Pin
  elif detector.chip.S905:
      from adafruit_blinka.microcontroller.amlogic.s905.pin import Pin
+ elif detector.board.aml_s905x_cc:
+     from adafruit_blinka.microcontroller.amlogic.s905x.pin import Pin
  elif detector.chip.S905X3:
      from adafruit_blinka.microcontroller.amlogic.s905x3.pin import Pin
  elif detector.chip.S905Y2:
@@@ -60,10 -58,6 +62,10 @@@ elif detector.chip.IMX6ULL
      from adafruit_blinka.microcontroller.nxp_imx6ull.pin import Pin
  elif detector.chip.HFU540:
      from adafruit_blinka.microcontroller.hfu540.pin import Pin
 +elif detector.chip.A10:
 +    from adafruit_blinka.microcontroller.allwinner.a10.pin import Pin
 +elif detector.chip.A30:
 +    from adafruit_blinka.microcontroller.allwinner.a10.pin import Pin
  elif detector.chip.A64:
      from adafruit_blinka.microcontroller.allwinner.a64.pin import Pin
  elif detector.chip.A33:
diff --combined src/microcontroller/__init__.py
index fac109e,5858481..d4dc4c4
--- a/src/microcontroller/__init__.py
+++ b/src/microcontroller/__init__.py
@@@ -48,10 -48,6 +48,10 @@@ elif chip_id == ap_chip.AM65XX
      from adafruit_blinka.microcontroller.am65xx import *
  elif chip_id == ap_chip.JH71x0:
      from adafruit_blinka.microcontroller.starfive.JH71x0 import *
 +elif chip_id == ap_chip.SUN4I:
 +    from adafruit_blinka.microcontroller.allwinner.a10 import *
 +elif chip_id == ap_chip.SUN7I:
 +    from adafruit_blinka.microcontroller.allwinner.a10 import *
  elif chip_id == ap_chip.SUN8I:
      from adafruit_blinka.microcontroller.allwinner.h3 import *
  elif chip_id == ap_chip.H5:
@@@ -72,6 -68,8 +72,8 @@@ elif chip_id == ap_chip.T234
      from adafruit_blinka.microcontroller.tegra.t234 import *
  elif chip_id == ap_chip.S905:
      from adafruit_blinka.microcontroller.amlogic.s905 import *
+ elif chip_id == ap_chip.S905X:
+     from adafruit_blinka.microcontroller.amlogic.s905x import *
  elif chip_id == ap_chip.S905X3:
      from adafruit_blinka.microcontroller.amlogic.s905x3 import *
  elif chip_id == ap_chip.S905Y2:
@@@ -84,10 -82,6 +86,10 @@@ elif chip_id == ap_chip.EXYNOS5422
      from adafruit_blinka.microcontroller.samsung.exynos5422 import *
  elif chip_id == ap_chip.APQ8016:
      from adafruit_blinka.microcontroller.snapdragon.apq8016 import *
 +elif chip_id == ap_chip.A10:
 +    from adafruit_blinka.microcontroller.allwinner.a10 import *
 +elif chip_id == ap_chip.A20:
 +    from adafruit_blinka.microcontroller.allwinner.a10 import *
  elif chip_id == ap_chip.A64:
      from adafruit_blinka.microcontroller.allwinner.a64 import *
  elif chip_id == ap_chip.A33:
diff --combined src/microcontroller/pin.py
index 68e576a,d21ccb2..7d57700
--- a/src/microcontroller/pin.py
+++ b/src/microcontroller/pin.py
@@@ -33,10 -33,6 +33,10 @@@ elif chip_id == ap_chip.AM65XX
      from adafruit_blinka.microcontroller.am65xx.pin import *
  elif chip_id == ap_chip.JH71x0:
      from adafruit_blinka.microcontroller.starfive.JH71x0.pin import *
 +elif chip_id == ap_chip.SUN4I:
 +    from adafruit_blinka.microcontroller.allwinner.a10.pin import *
 +elif chip_id == ap_chip.SUN7I:
 +    from adafruit_blinka.microcontroller.allwinner.a10.pin import *
  elif chip_id == ap_chip.SUN8I:
      from adafruit_blinka.microcontroller.allwinner.h3.pin import *
  elif chip_id == ap_chip.H3:
@@@ -59,6 -55,8 +59,8 @@@ elif chip_id == ap_chip.T234
      from adafruit_blinka.microcontroller.tegra.t234.pin import *
  elif chip_id == ap_chip.S905:
      from adafruit_blinka.microcontroller.amlogic.s905.pin import *
+ elif chip_id == ap_chip.S905X:
+     from adafruit_blinka.microcontroller.amlogic.s905x.pin import *
  elif chip_id == ap_chip.S905X3:
      from adafruit_blinka.microcontroller.amlogic.s905x3.pin import *
  elif chip_id == ap_chip.S905Y2:
@@@ -87,10 -85,6 +89,10 @@@ elif chip_id == ap_chip.LPC4330
      from adafruit_blinka.microcontroller.nxp_lpc4330.pin import *
  elif chip_id == ap_chip.MCP2221:
      from adafruit_blinka.microcontroller.mcp2221.pin import *
 +elif chip_id == ap_chip.A10:
 +    from adafruit_blinka.microcontroller.allwinner.a10.pin import *
 +elif chip_id == ap_chip.A20:
 +    from adafruit_blinka.microcontroller.allwinner.a10.pin import *
  elif chip_id == ap_chip.A64:
      from adafruit_blinka.microcontroller.allwinner.a64.pin import *
  elif chip_id == ap_chip.A33: