Merge remote-tracking branch 'upstream/main' into u2if

Author: lesamouraipourpre

adafruit_platformdetect/board.py

@@ -77,8 +77,6 @@ def id(self):
             board_id = self._beaglebone_id()
         elif chip_id == chips.DRA74X:
             board_id = self._bbai_id()
-        elif chip_id == chips.GENERIC_X86:
-            board_id = boards.GENERIC_LINUX_PC
         elif chip_id == chips.SUN8I:
             board_id = self._armbian_id() or self._allwinner_variants_id()
         elif chip_id == chips.SAMA5:
@@ -161,6 +159,8 @@ def id(self):
             board_id = boards.CORAL_EDGE_TPU_DEV_MINI
         elif chip_id == chips.RP2040_U2IF:
             board_id = self._rp2040_u2if_id()
+        elif chip_id == chips.GENERIC_X86:
+            board_id = boards.GENERIC_LINUX_PC
         self._board_id = board_id
         return board_id
 

adafruit_platformdetect/chip.py

@@ -211,14 +211,14 @@ def _linux_id(self):
         if self.detector.check_dt_compatible_value("sun50i-h5"):
             return chips.H5
 
-        if self.detector.check_dt_compatible_value("sun50i-h6"):
-            return chips.H6
+        if self.detector.check_dt_compatible_value("sun50i-h616"):
+            return chips.H616
 
         if self.detector.check_dt_compatible_value("sun50iw9"):
             return chips.H616
 
-        if self.detector.check_dt_compatible_value("sun50i-h616"):
-            return chips.H616
+        if self.detector.check_dt_compatible_value("sun50i-h6"):
+            return chips.H6
 
         if self.detector.check_dt_compatible_value("mediatek,mt8167"):
             return chips.MT8167

adafruit_platformdetect/constants/boards.py

@@ -196,7 +196,16 @@
     ),
     (JETSON_TX2_NX, ("nvidia,p3509-0000+p3636-0001",)),
     (CLARA_AGX_XAVIER, ("nvidia,e3900-0000+p2888-0004",)),
-    (JETSON_XAVIER, ("nvidia,p2972-0000", "nvidia,p2972-0006", "nvidia,jetson-xavier")),
+    (
+        JETSON_XAVIER,
+        (
+            "nvidia,p2972-0000",
+            "nvidia,p2972-0006",
+            "nvidia,jetson-xavier",
+            "nvidia,jetson-xavier-industrial",
+            "nvidia,galen-industrial",
+        ),
+    ),
     (JETSON_NANO, ("nvidia,p3450-0000", "nvidia,p3450-0002", "nvidia,jetson-nano")),
     (
         JETSON_NX,