Updated chip definitions

diff --git a/src/adafruit_blinka/board/jetson_tx1.py b/src/adafruit_blinka/board/jetson_tx1.py
index efcc0338e896b3da237ec891b37fa16198e8aa7d..e5dd8c770712c28b3ca4c263cb11f74b4a9d9bc5 100644 (file)
--- a/src/adafruit_blinka/board/jetson_tx1.py
+++ b/src/adafruit_blinka/board/jetson_tx1.py
@@ -1,6 +1,6 @@
 """Pin definitions for Jetson TX1."""
 
 """Pin definitions for Jetson TX1."""
 

-from adafruit_blinka.microcontroller.tegra.tx1 import pin
+from adafruit_blinka.microcontroller.tegra.t210 import x1_pin as pin

 
 SDA = pin.SDA
 SCL = pin.SCL
 
 SDA = pin.SDA
 SCL = pin.SCL

diff --git a/src/adafruit_blinka/board/jetson_tx2.py b/src/adafruit_blinka/board/jetson_tx2.py
index ec1159f0718bc9e73acc182f0a6bfa52fa182bf4..906fa56696a7a71815d4b83b1a6dec0fdb25abe2 100644 (file)
--- a/src/adafruit_blinka/board/jetson_tx2.py
+++ b/src/adafruit_blinka/board/jetson_tx2.py
@@ -1,6 +1,6 @@
 """Pin definitions for Jetson TX2."""
 
 """Pin definitions for Jetson TX2."""
 

-from adafruit_blinka.microcontroller.tegra.tx2 import pin
+from adafruit_blinka.microcontroller.tegra.t186 import pin

 
 SDA = pin.SDA
 SCL = pin.SCL
 
 SDA = pin.SDA
 SCL = pin.SCL

diff --git a/src/adafruit_blinka/board/jetson_txx.py b/src/adafruit_blinka/board/jetson_txx.py
index d4a5715d7af5c20f66304818f4cae4325b6d451d..3fc7aa334d605d9df9f33e750b1639c17821b838 100644 (file)
--- a/src/adafruit_blinka/board/jetson_txx.py
+++ b/src/adafruit_blinka/board/jetson_txx.py
@@ -1,6 +1,6 @@
 """Pin definitions for Jetson TXX."""
 
 """Pin definitions for Jetson TXX."""
 

-from adafruit_blinka.microcontroller.tegra.txx import pin
+from adafruit_blinka.microcontroller.tegra.t210 import xx_pin as pin

 
 SDA = pin.SDA
 SCL = pin.SCL
 
 SDA = pin.SDA
 SCL = pin.SCL

diff --git a/src/adafruit_blinka/board/jetson_xavier.py b/src/adafruit_blinka/board/jetson_xavier.py
index 4e26ab4fe43e2f929adae2b9e69d9b5cba666dc5..24e229f50677305d9043363bc8e3084ef0f845f8 100644 (file)
--- a/src/adafruit_blinka/board/jetson_xavier.py
+++ b/src/adafruit_blinka/board/jetson_xavier.py
@@ -1,6 +1,6 @@
 """Pin definitions for Jetson XAVIER."""
 
 """Pin definitions for Jetson XAVIER."""
 

-from adafruit_blinka.microcontroller.tegra.xavier import pin
+from adafruit_blinka.microcontroller.tegra.t194 import pin

 
 SDA = pin.SDA
 SCL = pin.SCL
 
 SDA = pin.SDA
 SCL = pin.SCL

diff --git a/src/adafruit_blinka/microcontroller/tegra/tx1/__init__.py b/src/adafruit_blinka/microcontroller/tegra/t186/__init__.py
similarity index 100%
rename from src/adafruit_blinka/microcontroller/tegra/tx1/__init__.py
rename to src/adafruit_blinka/microcontroller/tegra/t186/__init__.py

diff --git a/src/adafruit_blinka/microcontroller/tegra/tx2/pin.py b/src/adafruit_blinka/microcontroller/tegra/t186/pin.py
similarity index 100%
rename from src/adafruit_blinka/microcontroller/tegra/tx2/pin.py
rename to src/adafruit_blinka/microcontroller/tegra/t186/pin.py

diff --git a/src/adafruit_blinka/microcontroller/tegra/tx2/__init__.py b/src/adafruit_blinka/microcontroller/tegra/t194/__init__.py
similarity index 100%
rename from src/adafruit_blinka/microcontroller/tegra/tx2/__init__.py
rename to src/adafruit_blinka/microcontroller/tegra/t194/__init__.py

diff --git a/src/adafruit_blinka/microcontroller/tegra/xavier/pin.py b/src/adafruit_blinka/microcontroller/tegra/t194/pin.py
similarity index 100%
rename from src/adafruit_blinka/microcontroller/tegra/xavier/pin.py
rename to src/adafruit_blinka/microcontroller/tegra/t194/pin.py

diff --git a/src/adafruit_blinka/microcontroller/tegra/txx/__init__.py b/src/adafruit_blinka/microcontroller/tegra/t210/__init__.py
similarity index 100%
rename from src/adafruit_blinka/microcontroller/tegra/txx/__init__.py
rename to src/adafruit_blinka/microcontroller/tegra/t210/__init__.py

diff --git a/src/adafruit_blinka/microcontroller/tegra/tx1/pin.py b/src/adafruit_blinka/microcontroller/tegra/t210/x1_pin.py
similarity index 100%
rename from src/adafruit_blinka/microcontroller/tegra/tx1/pin.py
rename to src/adafruit_blinka/microcontroller/tegra/t210/x1_pin.py

diff --git a/src/adafruit_blinka/microcontroller/tegra/txx/pin.py b/src/adafruit_blinka/microcontroller/tegra/t210/xx_pin.py
similarity index 100%
rename from src/adafruit_blinka/microcontroller/tegra/txx/pin.py
rename to src/adafruit_blinka/microcontroller/tegra/t210/xx_pin.py

diff --git a/src/adafruit_blinka/microcontroller/tegra/xavier/__init__.py b/src/adafruit_blinka/microcontroller/tegra/xavier/__init__.py
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/src/digitalio.py b/src/digitalio.py
index 0d9bc5b18a3b84a411cb74675849779267f0401a..f129c47faf7d4d524aae818c0f7ded2806337074 100755 (executable)
--- a/src/digitalio.py
+++ b/src/digitalio.py
@@ -19,14 +19,15 @@ elif detector.chip.SUN8I:
     from adafruit_blinka.microcontroller.allwinner_h3.pin import Pin
 elif detector.chip.SAMA5:
     from adafruit_blinka.microcontroller.sama5.pin import Pin
     from adafruit_blinka.microcontroller.allwinner_h3.pin import Pin
 elif detector.chip.SAMA5:
     from adafruit_blinka.microcontroller.sama5.pin import Pin

-elif detector.chip.TEGRA_TX1:
-    from adafruit_blinka.microcontroller.tegra.tx1.pin import Pin
-elif detector.chip.TEGRA_TX2:
-    from adafruit_blinka.microcontroller.tegra.tx2.pin import Pin
-elif detector.chip.TEGRA_XAVIER:
-    from adafruit_blinka.microcontroller.tegra.xavier.pin import Pin
-elif detector.chip.TEGRA_TXX:
-    from adafruit_blinka.microcontroller.tegra.txx.pin import Pin
+elif detector.chip.T210:
+    if detector.board.JETSON_TX1:
+        from adafruit_blinka.microcontroller.tegra.t210.x1_pin import Pin
+    elif detector.board.JETSON_TXX:
+        from adafruit_blinka.microcontroller.tegra.t210.xx_pin import Pin
+elif detector.chip.T186:
+    from adafruit_blinka.microcontroller.tegra.t186.pin import Pin
+elif detector.chip.T194:
+    from adafruit_blinka.microcontroller.tegra.t194.pin import Pin

 elif detector.chip.STM32:
     from machine import Pin
 from adafruit_blinka import Enum, ContextManaged
 elif detector.chip.STM32:
     from machine import Pin
 from adafruit_blinka import Enum, ContextManaged

diff --git a/src/microcontroller/__init__.py b/src/microcontroller/__init__.py
index a27412616aeabe6ab19607455fb92f724acf8629..80394b7e2353b6d43c264a9ba62422618b5c0e92 100755 (executable)
--- a/src/microcontroller/__init__.py
+++ b/src/microcontroller/__init__.py
@@ -36,13 +36,11 @@ elif chip_id == ap_chip.SUN8I:
     from adafruit_blinka.microcontroller.allwinner_h3 import *
 elif chip_id == ap_chip.SAMA5:
     from adafruit_blinka.microcontroller.sama5 import *
     from adafruit_blinka.microcontroller.allwinner_h3 import *
 elif chip_id == ap_chip.SAMA5:
     from adafruit_blinka.microcontroller.sama5 import *

-elif chip_id == ap_chip.TEGRA_TX1:
-    from adafruit_blinka.microcontroller.tegra.tx1 import *
-elif chip_id == ap_chip.TEGRA_TX2:
-    from adafruit_blinka.microcontroller.tegra.tx2 import *
-elif chip_id == ap_chip.TEGRA_XAVIER:
-    from adafruit_blinka.microcontroller.tegra.xavier import *
-elif chip_id == ap_chip.TEGRA_TXX:
-    from adafruit_blinka.microcontroller.tegra.txx import *
+elif chip_id == ap_chip.T210:
+    from adafruit_blinka.microcontroller.tegra.t210 import *
+elif chip_id == ap_chip.T186:
+    from adafruit_blinka.microcontroller.tegra.t186 import *
+elif chip_id == ap_chip.T194:
+    from adafruit_blinka.microcontroller.tegra.t194 import *

 else:
     raise NotImplementedError("Microcontroller not supported:", chip_id)
 else:
     raise NotImplementedError("Microcontroller not supported:", chip_id)

diff --git a/src/microcontroller/pin.py b/src/microcontroller/pin.py
index 6314f00b6771ae88e1ffaeb2a44d900ad90b087a..7aa57c166ce7001b5c1177f3379ccc79283e8f03 100755 (executable)
--- a/src/microcontroller/pin.py
+++ b/src/microcontroller/pin.py
@@ -1,7 +1,7 @@
 """Pins named after their chip name."""
 
 """Pins named after their chip name."""
 

-import adafruit_platformdetect.chip as ap_chip
-from adafruit_blinka.agnostic import chip_id
+from adafruit_platformdetect import chip as ap_chip, board as ap_board
+from adafruit_blinka.agnostic import chip_id, board_id

 
 # We intentionally are patching into this namespace so skip the wildcard check.
 # pylint: disable=unused-wildcard-import,wildcard-import,ungrouped-imports
 
 # We intentionally are patching into this namespace so skip the wildcard check.
 # pylint: disable=unused-wildcard-import,wildcard-import,ungrouped-imports


@@ -18,13 +18,14 @@ elif chip_id == ap_chip.SUN8I:
     from adafruit_blinka.microcontroller.allwinner_h3.pin import *
 elif chip_id == ap_chip.SAMA5:
     from adafruit_blinka.microcontroller.sama5.pin import *
     from adafruit_blinka.microcontroller.allwinner_h3.pin import *
 elif chip_id == ap_chip.SAMA5:
     from adafruit_blinka.microcontroller.sama5.pin import *

-elif chip_id == ap_chip.TEGRA_TX1:
-    from adafruit_blinka.microcontroller.tegra.tx1.pin import *
-elif chip_id == ap_chip.TEGRA_TX2:
-    from adafruit_blinka.microcontroller.tegra.tx2.pin import *
-elif chip_id == ap_chip.TEGRA_XAVIER:
-    from adafruit_blinka.microcontroller.tegra.xavier.pin import *
-elif chip_id == ap_chip.TEGRA_TXX:
-    from adafruit_blinka.microcontroller.tegra.txx.pin import *
+elif chip_id == ap_chip.T210:
+    if board_id == ap_board.JETSON_TX1:
+        from adafruit_blinka.microcontroller.tegra.t210.x1_pin import *
+    elif board_id == ap_board.JETSON_TXX:
+        from adafruit_blinka.microcontroller.tegra.t210.xx_pin import *
+elif chip_id == ap_chip.T186:
+    from adafruit_blinka.microcontroller.tegra.t186.pin import *
+elif chip_id == ap_chip.T194:
+    from adafruit_blinka.microcontroller.tegra.t194.pin import *

 else:
     raise NotImplementedError("Microcontroller not supported: ", chip_id)
 else:
     raise NotImplementedError("Microcontroller not supported: ", chip_id)