Merge pull request #64 from swarren/jetson-nx

Add support for NVIDIA Jetson NX

Author: makermelissa

adafruit_platformdetect/board.py

@@ -204,17 +204,14 @@ def _imx8mx_id(self):
 
     def _tegra_id(self):
         """Try to detect the id of aarch64 board."""
-        board_value = self.detector.get_device_model()
-        board = None
-        if 'tx1' in board_value.lower():
-            board = boards.JETSON_TX1
-        elif 'quill' in board_value or "storm" in board_value or "lightning" in board_value:
-            board = boards.JETSON_TX2
-        elif 'xavier' in board_value.lower() or 'agx' in board_value.lower():
-            board = boards.JETSON_XAVIER
-        elif 'nano' in board_value.lower():
-            board = boards.JETSON_NANO
-        return board
+        compatible = self.detector.get_device_compatible()
+        if not compatible:
+            return None
+        compats = compatible.split('\x00')
+        for board_id, board_compats in boards._JETSON_IDS.items():
+            if any(v in compats for v in board_compats):
+                return board_id
+        return None
 
     def _sifive_id(self):
         """Try to detect the id for Sifive RISCV64 board."""

adafruit_platformdetect/chip.py

@@ -74,11 +74,12 @@ def _linux_id(self):  # pylint: disable=too-many-branches,too-many-statements
 
             compatible = self.detector.get_device_compatible()
             if compatible and 'tegra' in compatible:
-                if 'cv' in compatible or 'nano' in compatible:
+                compats = compatible.split('\x00')
+                if 'nvidia,tegra210' in compats:
                     linux_id = chips.T210
-                elif 'quill' in compatible:
+                elif 'nvidia,tegra186' in compats:
                     linux_id = chips.T186
-                elif 'xavier' in compatible:
+                elif 'nvidia,tegra194' in compats:
                     linux_id = chips.T194
             if compatible and 'imx8m' in compatible:
                 linux_id = chips.IMX8MX

adafruit_platformdetect/constants/boards.py

@@ -38,6 +38,7 @@
 JETSON_TX2 = 'JETSON_TX2'
 JETSON_XAVIER = 'JETSON_XAVIER'
 JETSON_NANO = 'JETSON_NANO'
+JETSON_NX = 'JETSON_NX'
 
 # Google Coral dev board
 CORAL_EDGE_TPU_DEV = "CORAL_EDGE_TPU_DEV"
@@ -97,12 +98,36 @@
     CORAL_EDGE_TPU_DEV,
 )
 
-_JETSON_IDS = (
-    JETSON_TX1,
-    JETSON_TX2,
-    JETSON_XAVIER,
-    JETSON_NANO
-)
+_JETSON_IDS = {
+    JETSON_TX1: (
+        'nvidia,p2371-2180',
+        'nvidia,jetson-cv',
+    ),
+    JETSON_TX2: (
+        'nvidia,p2771-0000',
+        'nvidia,p2771-0888',
+        'nvidia,p3489-0000',
+        'nvidia,lightning',
+        'nvidia,quill',
+        'nvidia,storm',
+    ),
+    JETSON_XAVIER: (
+        'nvidia,p2972-0000',
+        'nvidia,p2972-0006',
+        'nvidia,jetson-xavier',
+    ),
+    JETSON_NANO: (
+        'nvidia,p3450-0000',
+        'nvidia,p3450-0002',
+        'nvidia,jetson-nano',
+    ),
+    JETSON_NX: (
+        'nvidia,p3509-0000+p3668-0000',
+        'nvidia,p3509-0000+p3668-0001',
+        'nvidia,p3449-0000+p3668-0000',
+        'nvidia,p3449-0000+p3668-0001',
+    ),
+}
 
 _RASPBERRY_PI_40_PIN_IDS = (
     RASPBERRY_PI_B_PLUS,