Merge branch 'main' of https://github.com/adafruit/Adafruit_Blinka

diff --git a/src/adafruit_blinka/microcontroller/allwinner/a33/__init__.py b/src/adafruit_blinka/microcontroller/allwinner/a33/__init__.py
index bd5f1feb2ebd463226dc6dd9355540a408bcbf5f..b9e6b1f799c9345c3f3b551d1e2ad09639f4f029 100644 (file)
--- a/src/adafruit_blinka/microcontroller/allwinner/a33/__init__.py
+++ b/src/adafruit_blinka/microcontroller/allwinner/a33/__init__.py
@@ -1 +1,2 @@
 """Definition for the AllWinner A33 chip"""
+from .pin import *

diff --git a/src/adafruit_blinka/microcontroller/allwinner/a64/__init__.py b/src/adafruit_blinka/microcontroller/allwinner/a64/__init__.py
index 7dbcd8c99164d237578768e5cbbce597211c0ca4..3075e97478f50ad5415e698b15de03ec924c319e 100644 (file)
--- a/src/adafruit_blinka/microcontroller/allwinner/a64/__init__.py
+++ b/src/adafruit_blinka/microcontroller/allwinner/a64/__init__.py
@@ -1 +1,2 @@
 """Definition for the AllWinner A64 chip"""
+from .pin import *

diff --git a/src/adafruit_blinka/microcontroller/allwinner/h3/__init__.py b/src/adafruit_blinka/microcontroller/allwinner/h3/__init__.py
index 80bc28f0096ddb74875d4cc47f51dc0620302dbc..49d6c8adfb9e8e475017cefd06e19e184dbf2c80 100644 (file)
--- a/src/adafruit_blinka/microcontroller/allwinner/h3/__init__.py
+++ b/src/adafruit_blinka/microcontroller/allwinner/h3/__init__.py
@@ -1 +1,2 @@
 """Definition for the AllWinner H3 chip"""
+from .pin import *

diff --git a/src/adafruit_blinka/microcontroller/allwinner/h5/__init__.py b/src/adafruit_blinka/microcontroller/allwinner/h5/__init__.py
index d5658bae680a871c270e2c806cd0ab7b54725d68..bde3093da0d9b8a54e615793d9344b5ec3ce7a15 100644 (file)
--- a/src/adafruit_blinka/microcontroller/allwinner/h5/__init__.py
+++ b/src/adafruit_blinka/microcontroller/allwinner/h5/__init__.py
@@ -1 +1,2 @@
 """Definition for the AllWinner H5 chip"""
+from .pin import *

diff --git a/src/adafruit_blinka/microcontroller/allwinner/h6/__init__.py b/src/adafruit_blinka/microcontroller/allwinner/h6/__init__.py
index 0eabf00e9fc5191524f74bd67855369fb2b0f346..7ae56992bbd67a122578590b41414f4e5f5d0e59 100644 (file)
--- a/src/adafruit_blinka/microcontroller/allwinner/h6/__init__.py
+++ b/src/adafruit_blinka/microcontroller/allwinner/h6/__init__.py
@@ -1 +1,2 @@
 """Definition for the AllWinner H6 chip"""
+from .pin import *

diff --git a/src/adafruit_blinka/microcontroller/allwinner/h616/__init__.py b/src/adafruit_blinka/microcontroller/allwinner/h616/__init__.py
index 82e66ce03c0f5b694560f0b6b5b503bf03bbed6a..affd8df5187fce9b60f1a8935a6a782955ecb9cd 100644 (file)
--- a/src/adafruit_blinka/microcontroller/allwinner/h616/__init__.py
+++ b/src/adafruit_blinka/microcontroller/allwinner/h616/__init__.py
@@ -1 +1,2 @@
 """Definition for the AllWinner H616 chip"""
+from .pin import *

diff --git a/src/adafruit_blinka/microcontroller/am335x/__init__.py b/src/adafruit_blinka/microcontroller/am335x/__init__.py
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a01e4aa643f2194af3efa0347719a999d23652e9 100644 (file)
--- a/src/adafruit_blinka/microcontroller/am335x/__init__.py
+++ b/src/adafruit_blinka/microcontroller/am335x/__init__.py
@@ -0,0 +1 @@
+from .pin import *

diff --git a/src/adafruit_blinka/microcontroller/amlogic/meson_g12_common/__init__.py b/src/adafruit_blinka/microcontroller/amlogic/meson_g12_common/__init__.py
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a01e4aa643f2194af3efa0347719a999d23652e9 100644 (file)
--- a/src/adafruit_blinka/microcontroller/amlogic/meson_g12_common/__init__.py
+++ b/src/adafruit_blinka/microcontroller/amlogic/meson_g12_common/__init__.py
@@ -0,0 +1 @@
+from .pin import *

diff --git a/src/adafruit_blinka/microcontroller/amlogic/s905/__init__.py b/src/adafruit_blinka/microcontroller/amlogic/s905/__init__.py
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a01e4aa643f2194af3efa0347719a999d23652e9 100644 (file)
--- a/src/adafruit_blinka/microcontroller/amlogic/s905/__init__.py
+++ b/src/adafruit_blinka/microcontroller/amlogic/s905/__init__.py
@@ -0,0 +1 @@
+from .pin import *

diff --git a/src/adafruit_blinka/microcontroller/amlogic/s905x3/__init__.py b/src/adafruit_blinka/microcontroller/amlogic/s905x3/__init__.py
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a01e4aa643f2194af3efa0347719a999d23652e9 100644 (file)
--- a/src/adafruit_blinka/microcontroller/amlogic/s905x3/__init__.py
+++ b/src/adafruit_blinka/microcontroller/amlogic/s905x3/__init__.py
@@ -0,0 +1 @@
+from .pin import *

diff --git a/src/adafruit_blinka/microcontroller/amlogic/s922x/__init__.py b/src/adafruit_blinka/microcontroller/amlogic/s922x/__init__.py
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a01e4aa643f2194af3efa0347719a999d23652e9 100644 (file)
--- a/src/adafruit_blinka/microcontroller/amlogic/s922x/__init__.py
+++ b/src/adafruit_blinka/microcontroller/amlogic/s922x/__init__.py
@@ -0,0 +1 @@
+from .pin import *

diff --git a/src/adafruit_blinka/microcontroller/atheros/__init__.py b/src/adafruit_blinka/microcontroller/atheros/__init__.py
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a01e4aa643f2194af3efa0347719a999d23652e9 100644 (file)
--- a/src/adafruit_blinka/microcontroller/atheros/__init__.py
+++ b/src/adafruit_blinka/microcontroller/atheros/__init__.py
@@ -0,0 +1 @@
+from .pin import *

diff --git a/src/adafruit_blinka/microcontroller/bcm2711/__init__.py b/src/adafruit_blinka/microcontroller/bcm2711/__init__.py
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a01e4aa643f2194af3efa0347719a999d23652e9 100644 (file)
--- a/src/adafruit_blinka/microcontroller/bcm2711/__init__.py
+++ b/src/adafruit_blinka/microcontroller/bcm2711/__init__.py
@@ -0,0 +1 @@
+from .pin import *

diff --git a/src/adafruit_blinka/microcontroller/bcm283x/__init__.py b/src/adafruit_blinka/microcontroller/bcm283x/__init__.py
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a01e4aa643f2194af3efa0347719a999d23652e9 100644 (file)
--- a/src/adafruit_blinka/microcontroller/bcm283x/__init__.py
+++ b/src/adafruit_blinka/microcontroller/bcm283x/__init__.py
@@ -0,0 +1 @@
+from .pin import *

diff --git a/src/adafruit_blinka/microcontroller/dra74x/__init__.py b/src/adafruit_blinka/microcontroller/dra74x/__init__.py
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a01e4aa643f2194af3efa0347719a999d23652e9 100644 (file)
--- a/src/adafruit_blinka/microcontroller/dra74x/__init__.py
+++ b/src/adafruit_blinka/microcontroller/dra74x/__init__.py
@@ -0,0 +1 @@
+from .pin import *

diff --git a/src/adafruit_blinka/microcontroller/ftdi_mpsse/ft2232h/__init__.py b/src/adafruit_blinka/microcontroller/ftdi_mpsse/ft2232h/__init__.py
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a01e4aa643f2194af3efa0347719a999d23652e9 100644 (file)
--- a/src/adafruit_blinka/microcontroller/ftdi_mpsse/ft2232h/__init__.py
+++ b/src/adafruit_blinka/microcontroller/ftdi_mpsse/ft2232h/__init__.py
@@ -0,0 +1 @@
+from .pin import *

diff --git a/src/adafruit_blinka/microcontroller/ftdi_mpsse/ft232h/__init__.py b/src/adafruit_blinka/microcontroller/ftdi_mpsse/ft232h/__init__.py
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a01e4aa643f2194af3efa0347719a999d23652e9 100644 (file)
--- a/src/adafruit_blinka/microcontroller/ftdi_mpsse/ft232h/__init__.py
+++ b/src/adafruit_blinka/microcontroller/ftdi_mpsse/ft232h/__init__.py
@@ -0,0 +1 @@
+from .pin import *

diff --git a/src/adafruit_blinka/microcontroller/ftdi_mpsse/mpsse/__init__.py b/src/adafruit_blinka/microcontroller/ftdi_mpsse/mpsse/__init__.py
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a01e4aa643f2194af3efa0347719a999d23652e9 100644 (file)
--- a/src/adafruit_blinka/microcontroller/ftdi_mpsse/mpsse/__init__.py
+++ b/src/adafruit_blinka/microcontroller/ftdi_mpsse/mpsse/__init__.py
@@ -0,0 +1 @@
+from .pin import *

diff --git a/src/adafruit_blinka/microcontroller/hfu540/__init__.py b/src/adafruit_blinka/microcontroller/hfu540/__init__.py
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a01e4aa643f2194af3efa0347719a999d23652e9 100644 (file)
--- a/src/adafruit_blinka/microcontroller/hfu540/__init__.py
+++ b/src/adafruit_blinka/microcontroller/hfu540/__init__.py
@@ -0,0 +1 @@
+from .pin import *

diff --git a/src/adafruit_blinka/microcontroller/mcp2221/__init__.py b/src/adafruit_blinka/microcontroller/mcp2221/__init__.py
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a01e4aa643f2194af3efa0347719a999d23652e9 100644 (file)
--- a/src/adafruit_blinka/microcontroller/mcp2221/__init__.py
+++ b/src/adafruit_blinka/microcontroller/mcp2221/__init__.py
@@ -0,0 +1 @@
+from .pin import *

diff --git a/src/adafruit_blinka/microcontroller/mips24kec/__init__.py b/src/adafruit_blinka/microcontroller/mips24kec/__init__.py
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a01e4aa643f2194af3efa0347719a999d23652e9 100644 (file)
--- a/src/adafruit_blinka/microcontroller/mips24kec/__init__.py
+++ b/src/adafruit_blinka/microcontroller/mips24kec/__init__.py
@@ -0,0 +1 @@
+from .pin import *

diff --git a/src/adafruit_blinka/microcontroller/mt8167/__init__.py b/src/adafruit_blinka/microcontroller/mt8167/__init__.py
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a01e4aa643f2194af3efa0347719a999d23652e9 100644 (file)
--- a/src/adafruit_blinka/microcontroller/mt8167/__init__.py
+++ b/src/adafruit_blinka/microcontroller/mt8167/__init__.py
@@ -0,0 +1 @@
+from .pin import *

diff --git a/src/adafruit_blinka/microcontroller/nova/__init__.py b/src/adafruit_blinka/microcontroller/nova/__init__.py
index d9b7f7577d79b25e31118d489792d27b7f62c116..7ddbf639208f514edb80107aa6a3c9ecd968743f 100644 (file)
--- a/src/adafruit_blinka/microcontroller/nova/__init__.py
+++ b/src/adafruit_blinka/microcontroller/nova/__init__.py
@@ -1,4 +1,5 @@
 """Generic Connection class for Binho Nova to keep track of connection"""
+from .pin import *
 
 
 class Connection:

diff --git a/src/adafruit_blinka/microcontroller/nxp_imx6ull/__init__.py b/src/adafruit_blinka/microcontroller/nxp_imx6ull/__init__.py
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a01e4aa643f2194af3efa0347719a999d23652e9 100644 (file)
--- a/src/adafruit_blinka/microcontroller/nxp_imx6ull/__init__.py
+++ b/src/adafruit_blinka/microcontroller/nxp_imx6ull/__init__.py
@@ -0,0 +1 @@
+from .pin import *

diff --git a/src/adafruit_blinka/microcontroller/nxp_imx8m/__init__.py b/src/adafruit_blinka/microcontroller/nxp_imx8m/__init__.py
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a01e4aa643f2194af3efa0347719a999d23652e9 100644 (file)
--- a/src/adafruit_blinka/microcontroller/nxp_imx8m/__init__.py
+++ b/src/adafruit_blinka/microcontroller/nxp_imx8m/__init__.py
@@ -0,0 +1 @@
+from .pin import *

diff --git a/src/adafruit_blinka/microcontroller/nxp_lpc4330/__init__.py b/src/adafruit_blinka/microcontroller/nxp_lpc4330/__init__.py
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a01e4aa643f2194af3efa0347719a999d23652e9 100644 (file)
--- a/src/adafruit_blinka/microcontroller/nxp_lpc4330/__init__.py
+++ b/src/adafruit_blinka/microcontroller/nxp_lpc4330/__init__.py
@@ -0,0 +1 @@
+from .pin import *

diff --git a/src/adafruit_blinka/microcontroller/pentium/n3710/__init__.py b/src/adafruit_blinka/microcontroller/pentium/n3710/__init__.py
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a01e4aa643f2194af3efa0347719a999d23652e9 100644 (file)
--- a/src/adafruit_blinka/microcontroller/pentium/n3710/__init__.py
+++ b/src/adafruit_blinka/microcontroller/pentium/n3710/__init__.py
@@ -0,0 +1 @@
+from .pin import *

diff --git a/src/adafruit_blinka/microcontroller/rockchip/rk3308/__init__.py b/src/adafruit_blinka/microcontroller/rockchip/rk3308/__init__.py
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a01e4aa643f2194af3efa0347719a999d23652e9 100644 (file)
--- a/src/adafruit_blinka/microcontroller/rockchip/rk3308/__init__.py
+++ b/src/adafruit_blinka/microcontroller/rockchip/rk3308/__init__.py
@@ -0,0 +1 @@
+from .pin import *

diff --git a/src/adafruit_blinka/microcontroller/rockchip/rk3328/__init__.py b/src/adafruit_blinka/microcontroller/rockchip/rk3328/__init__.py
index 83fc22c66bb42798a5fe8c5979e7417036915c40..9cf13e869e7738f3dc468d0bc9739d508a26e604 100644 (file)
--- a/src/adafruit_blinka/microcontroller/rockchip/rk3328/__init__.py
+++ b/src/adafruit_blinka/microcontroller/rockchip/rk3328/__init__.py
@@ -1 +1,2 @@
 """Definition for the Rockchip RK3328 chip"""
+from .pin import *

diff --git a/src/adafruit_blinka/microcontroller/rockchip/rk3399/__init__.py b/src/adafruit_blinka/microcontroller/rockchip/rk3399/__init__.py
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a01e4aa643f2194af3efa0347719a999d23652e9 100644 (file)
--- a/src/adafruit_blinka/microcontroller/rockchip/rk3399/__init__.py
+++ b/src/adafruit_blinka/microcontroller/rockchip/rk3399/__init__.py
@@ -0,0 +1 @@
+from .pin import *

diff --git a/src/adafruit_blinka/microcontroller/rp2040/__init__.py b/src/adafruit_blinka/microcontroller/rp2040/__init__.py
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a01e4aa643f2194af3efa0347719a999d23652e9 100644 (file)
--- a/src/adafruit_blinka/microcontroller/rp2040/__init__.py
+++ b/src/adafruit_blinka/microcontroller/rp2040/__init__.py
@@ -0,0 +1 @@
+from .pin import *

diff --git a/src/adafruit_blinka/microcontroller/rp2040_u2if/__init__.py b/src/adafruit_blinka/microcontroller/rp2040_u2if/__init__.py
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a01e4aa643f2194af3efa0347719a999d23652e9 100644 (file)
--- a/src/adafruit_blinka/microcontroller/rp2040_u2if/__init__.py
+++ b/src/adafruit_blinka/microcontroller/rp2040_u2if/__init__.py
@@ -0,0 +1 @@
+from .pin import *

diff --git a/src/adafruit_blinka/microcontroller/sama5/__init__.py b/src/adafruit_blinka/microcontroller/sama5/__init__.py
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a01e4aa643f2194af3efa0347719a999d23652e9 100644 (file)
--- a/src/adafruit_blinka/microcontroller/sama5/__init__.py
+++ b/src/adafruit_blinka/microcontroller/sama5/__init__.py
@@ -0,0 +1 @@
+from .pin import *

diff --git a/src/adafruit_blinka/microcontroller/samsung/exynos5422/__init__.py b/src/adafruit_blinka/microcontroller/samsung/exynos5422/__init__.py
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a01e4aa643f2194af3efa0347719a999d23652e9 100644 (file)
--- a/src/adafruit_blinka/microcontroller/samsung/exynos5422/__init__.py
+++ b/src/adafruit_blinka/microcontroller/samsung/exynos5422/__init__.py
@@ -0,0 +1 @@
+from .pin import *

diff --git a/src/adafruit_blinka/microcontroller/snapdragon/apq8016/__init__.py b/src/adafruit_blinka/microcontroller/snapdragon/apq8016/__init__.py
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a01e4aa643f2194af3efa0347719a999d23652e9 100644 (file)
--- a/src/adafruit_blinka/microcontroller/snapdragon/apq8016/__init__.py
+++ b/src/adafruit_blinka/microcontroller/snapdragon/apq8016/__init__.py
@@ -0,0 +1 @@
+from .pin import *

diff --git a/src/adafruit_blinka/microcontroller/starfive/JH71x0/__init__.py b/src/adafruit_blinka/microcontroller/starfive/JH71x0/__init__.py
index 6f9f142fb83cd79890a4a9c5e1cd19229d3b2f3a..1b9ba3a36663b1d7815d29cb41801bd2c0d5afb1 100644 (file)
--- a/src/adafruit_blinka/microcontroller/starfive/JH71x0/__init__.py
+++ b/src/adafruit_blinka/microcontroller/starfive/JH71x0/__init__.py
@@ -1 +1,2 @@
 """Definition for the StarFive JH71x0 chip"""
+from .pin import *

diff --git a/src/adafruit_blinka/microcontroller/stm32/stm32f405/__init__.py b/src/adafruit_blinka/microcontroller/stm32/stm32f405/__init__.py
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a01e4aa643f2194af3efa0347719a999d23652e9 100644 (file)
--- a/src/adafruit_blinka/microcontroller/stm32/stm32f405/__init__.py
+++ b/src/adafruit_blinka/microcontroller/stm32/stm32f405/__init__.py
@@ -0,0 +1 @@
+from .pin import *

diff --git a/src/adafruit_blinka/microcontroller/stm32/stm32mp157/__init__.py b/src/adafruit_blinka/microcontroller/stm32/stm32mp157/__init__.py
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a01e4aa643f2194af3efa0347719a999d23652e9 100644 (file)
--- a/src/adafruit_blinka/microcontroller/stm32/stm32mp157/__init__.py
+++ b/src/adafruit_blinka/microcontroller/stm32/stm32mp157/__init__.py
@@ -0,0 +1 @@
+from .pin import *

diff --git a/src/adafruit_blinka/microcontroller/tegra/t186/__init__.py b/src/adafruit_blinka/microcontroller/tegra/t186/__init__.py
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a01e4aa643f2194af3efa0347719a999d23652e9 100644 (file)
--- a/src/adafruit_blinka/microcontroller/tegra/t186/__init__.py
+++ b/src/adafruit_blinka/microcontroller/tegra/t186/__init__.py
@@ -0,0 +1 @@
+from .pin import *

diff --git a/src/adafruit_blinka/microcontroller/tegra/t194/__init__.py b/src/adafruit_blinka/microcontroller/tegra/t194/__init__.py
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a01e4aa643f2194af3efa0347719a999d23652e9 100644 (file)
--- a/src/adafruit_blinka/microcontroller/tegra/t194/__init__.py
+++ b/src/adafruit_blinka/microcontroller/tegra/t194/__init__.py
@@ -0,0 +1 @@
+from .pin import *

diff --git a/src/adafruit_blinka/microcontroller/tegra/t210/__init__.py b/src/adafruit_blinka/microcontroller/tegra/t210/__init__.py
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a01e4aa643f2194af3efa0347719a999d23652e9 100644 (file)
--- a/src/adafruit_blinka/microcontroller/tegra/t210/__init__.py
+++ b/src/adafruit_blinka/microcontroller/tegra/t210/__init__.py
@@ -0,0 +1 @@
+from .pin import *

diff --git a/src/microcontroller/__init__.py b/src/microcontroller/__init__.py
index 59bf33de5a5d24b91457ac73645602430e4706ef..da71099c908bbd33ddf7dc2a28a3b0036c88968e 100755 (executable)
--- a/src/microcontroller/__init__.py
+++ b/src/microcontroller/__init__.py
@@ -11,6 +11,7 @@ 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
+import microcontroller.pin
 
 
 def delay_us(delay):
@@ -37,12 +38,10 @@ class Pin(Enum):
         for key in dir(board):
             if getattr(board, key) is self:
                 return "board.{}".format(key)
-        import microcontroller.pin as pin
-
         # pylint: enable=import-outside-toplevel, cyclic-import
 
-        for key in dir(pin):
-            if getattr(pin, key) is self:
+        for key in dir(microcontroller.pin):
+            if getattr(microcontroller.pin, key) is self:
                 return "microcontroller.pin.{}".format(key)
         return repr(self)
 
@@ -62,11 +61,11 @@ elif chip_id == ap_chip.BCM2XXX:
         "RASPBERRY_PI_400",
         "RASPBERRY_PI_CM4",
     ]:
-        from adafruit_blinka.microcontroller.bcm2711.pin import *
+        from adafruit_blinka.microcontroller.bcm2711 import *
     else:
-        from adafruit_blinka.microcontroller.bcm283x.pin import *
+        from adafruit_blinka.microcontroller.bcm283x import *
 elif chip_id == ap_chip.DRA74X:
-    from adafruit_blinka.microcontroller.dra74x.pin import *
+    from adafruit_blinka.microcontroller.dra74x import *
 elif chip_id == ap_chip.AM33XX:
     from adafruit_blinka.microcontroller.am335x import *
 elif chip_id == ap_chip.JH71x0:
@@ -74,11 +73,11 @@ elif chip_id == ap_chip.JH71x0:
 elif chip_id == ap_chip.SUN8I:
     from adafruit_blinka.microcontroller.allwinner.h3 import *
 elif chip_id == ap_chip.H5:
-    from adafruit_blinka.microcontroller.allwinner.h5.pin import *
+    from adafruit_blinka.microcontroller.allwinner.h5 import *
 elif chip_id == ap_chip.H6:
-    from adafruit_blinka.microcontroller.allwinner.h6.pin import *
+    from adafruit_blinka.microcontroller.allwinner.h6 import *
 elif chip_id == ap_chip.H616:
-    from adafruit_blinka.microcontroller.allwinner.h616.pin import *
+    from adafruit_blinka.microcontroller.allwinner.h616 import *
 elif chip_id == ap_chip.SAMA5:
     from adafruit_blinka.microcontroller.sama5 import *
 elif chip_id == ap_chip.T210:
@@ -88,57 +87,57 @@ elif chip_id == ap_chip.T186:
 elif chip_id == ap_chip.T194:
     from adafruit_blinka.microcontroller.tegra.t194 import *
 elif chip_id == ap_chip.S905:
-    from adafruit_blinka.microcontroller.amlogic.s905.pin import *
+    from adafruit_blinka.microcontroller.amlogic.s905 import *
 elif chip_id == ap_chip.S905X3:
-    from adafruit_blinka.microcontroller.amlogic.s905x3.pin import *
+    from adafruit_blinka.microcontroller.amlogic.s905x3 import *
 elif chip_id == ap_chip.S922X:
-    from adafruit_blinka.microcontroller.amlogic.s922x.pin import *
+    from adafruit_blinka.microcontroller.amlogic.s922x import *
 elif chip_id == ap_chip.EXYNOS5422:
-    from adafruit_blinka.microcontroller.samsung.exynos5422.pin import *
+    from adafruit_blinka.microcontroller.samsung.exynos5422 import *
 elif chip_id == ap_chip.APQ8016:
-    from adafruit_blinka.microcontroller.snapdragon.apq8016.pin import *
+    from adafruit_blinka.microcontroller.snapdragon.apq8016 import *
 elif chip_id == ap_chip.A64:
-    from adafruit_blinka.microcontroller.allwinner.a64.pin import *
+    from adafruit_blinka.microcontroller.allwinner.a64 import *
 elif chip_id == ap_chip.A33:
-    from adafruit_blinka.microcontroller.allwinner.a33.pin import *
+    from adafruit_blinka.microcontroller.allwinner.a33 import *
 elif chip_id == ap_chip.RK3308:
-    from adafruit_blinka.microcontroller.rockchip.rk3308.pin import *
+    from adafruit_blinka.microcontroller.rockchip.rk3308 import *
 elif chip_id == ap_chip.RK3399:
-    from adafruit_blinka.microcontroller.rockchip.rk3399.pin import *
+    from adafruit_blinka.microcontroller.rockchip.rk3399 import *
 elif chip_id == ap_chip.RK3328:
-    from adafruit_blinka.microcontroller.rockchip.rk3328.pin import *
+    from adafruit_blinka.microcontroller.rockchip.rk3328 import *
 elif chip_id == ap_chip.H3:
-    from adafruit_blinka.microcontroller.allwinner.h3.pin import *
+    from adafruit_blinka.microcontroller.allwinner.h3 import *
 elif chip_id == ap_chip.H5:
-    from adafruit_blinka.microcontroller.allwinner.h5.pin import *
+    from adafruit_blinka.microcontroller.allwinner.h5 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 *
+    from adafruit_blinka.microcontroller.hfu540 import *
 elif chip_id == ap_chip.BINHO:
     from adafruit_blinka.microcontroller.nova import *
 elif chip_id == ap_chip.LPC4330:
     from adafruit_blinka.microcontroller.nxp_lpc4330 import *
 elif chip_id == ap_chip.MCP2221:
-    from adafruit_blinka.microcontroller.mcp2221.pin import *
+    from adafruit_blinka.microcontroller.mcp2221 import *
 elif chip_id == ap_chip.MIPS24KC:
     from adafruit_blinka.microcontroller.atheros.ar9331 import *
 elif chip_id == ap_chip.MIPS24KEC:
     from adafruit_blinka.microcontroller.mips24kec import *
 elif chip_id == ap_chip.FT232H:
-    from adafruit_blinka.microcontroller.ftdi_mpsse.ft232h.pin import *
+    from adafruit_blinka.microcontroller.ftdi_mpsse.ft232h import *
 elif chip_id == ap_chip.FT2232H:
-    from adafruit_blinka.microcontroller.ftdi_mpsse.ft2232h.pin import *
+    from adafruit_blinka.microcontroller.ftdi_mpsse.ft2232h import *
 elif chip_id == ap_chip.PENTIUM_N3710:
-    from adafruit_blinka.microcontroller.pentium.n3710.pin import *
+    from adafruit_blinka.microcontroller.pentium.n3710 import *
 elif chip_id == ap_chip.STM32MP157:
-    from adafruit_blinka.microcontroller.stm32.stm32mp157.pin import *
+    from adafruit_blinka.microcontroller.stm32.stm32mp157 import *
 elif chip_id == ap_chip.MT8167:
-    from adafruit_blinka.microcontroller.mt8167.pin import *
+    from adafruit_blinka.microcontroller.mt8167 import *
 elif chip_id == ap_chip.RP2040_U2IF:
-    from adafruit_blinka.microcontroller.rp2040_u2if.pin import *
+    from adafruit_blinka.microcontroller.rp2040_u2if import *
 elif chip_id == ap_chip.GENERIC_X86:
     print("WARNING: GENERIC_X86 is not fully supported. Some features may not work.")
 elif "sphinx" in sys.modules: