Merge pull request #301 from toozhsu/main

Add support for Tinker Board 2 and Tinker Edge R

Author: makermelissa

adafruit_platformdetect/board.py

@@ -154,7 +154,14 @@ def id(self) -> Optional[str]:
         elif chip_id == chips.RK3308:
             board_id = self._rock_pi_id()
         elif chip_id == chips.RK3399:
-            board_id = self._rock_pi_id() or self._armbian_id() or self._diet_pi_id()
+            board_id = (
+                self._rock_pi_id()
+                or self._armbian_id()
+                or self._diet_pi_id()
+                or self._asus_tinker_board_id()
+            )
+        elif chip_id == chips.RK3399PRO:
+            board_id = self._asus_tinker_board_id()
         elif chip_id == chips.RK3399_T:
             board_id = self._rock_pi_id() or self._armbian_id()
         elif chip_id == chips.ATOM_X5_Z8350:
@@ -614,6 +621,11 @@ def _asus_tinker_board_id(self) -> Optional[str]:
         board = None
         if board_value and "ASUS Tinker Board" in board_value:
             board = boards.ASUS_TINKER_BOARD
+        if board_value and "ASUS TINKER BOARD 2" in board_value:
+            board = boards.ASUS_TINKER_BOARD_2
+        if board_value and "ASUS_TINKER_EDGE_R" in board_value:
+            board = boards.ASUS_TINKER_EDGE_R
+
         return board
 
     def _pcduino_board_id(self) -> Optional[str]:

adafruit_platformdetect/chip.py

@@ -226,6 +226,9 @@ def _linux_id(self) -> Optional[str]:
         if self.detector.check_dt_compatible_value("radxa,rock-4c-plus"):
             return chips.RK3399_T
 
+        if self.detector.check_dt_compatible_value("rockchip,rk3399pro"):
+            return chips.RK3399PRO
+
         if self.detector.check_dt_compatible_value("rockchip,rk3399"):
             return chips.RK3399
 

adafruit_platformdetect/constants/boards.py

@@ -35,6 +35,8 @@
 
 # ASUS Tinker Boards
 ASUS_TINKER_BOARD = "ASUS_TINKER_BOARD"
+ASUS_TINKER_BOARD_2 = "ASUS_TINKER_BOARD_2"
+ASUS_TINKER_EDGE_R = "ASUS_TINKER_EDGE_R"
 
 # Clockwork Pi boards
 CLOCKWORK_CPI3 = "CLOCKWORK_CPI3"
@@ -203,7 +205,11 @@
 _KHADAS_40_PIN_IDS = (KHADAS_VIM3,)
 
 # Asus Tinkerboard
-_ASUS_TINKER_BOARD_IDS = (ASUS_TINKER_BOARD,)
+_ASUS_TINKER_BOARD_IDS = (
+    ASUS_TINKER_BOARD,
+    ASUS_TINKER_BOARD_2,
+    ASUS_TINKER_EDGE_R,
+)
 
 # STM32MP1
 _STM32MP1_IDS = (

adafruit_platformdetect/constants/chips.py

@@ -55,6 +55,7 @@
 RK3308 = "RK3308"
 RK3399 = "RK3399"
 RK3399_T = "RK3399_T"
+RK3399PRO = "RK3399PRO"
 RK3328 = "RK3328"
 LPC4330 = "LPC4330"
 RK3288 = "RK3288"