Merge pull request #26 from tier4/feat/support_orin_devkit_3541

tier4 · Aug 29, 2024 · 5334718 · 5334718
2 parents 07975c2 + cd581d4
commit 5334718
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 5 deletions.
diff --git a/drivers/debian/changelog b/drivers/debian/changelog
@@ -1,4 +1,10 @@
-tier4-camera-gmsl (1.4.4) UNRELEASED; urgency=medium
+tier4-camera-gmsl (1.4.5) focal; urgency=medium
+
+  * Added L4T 35.4.1 support for Nvidia Jetson AGX Orin development kit.
+
+ -- tier4 <[email protected]>  Mon, 26 Aug 2024 15:36:53 +0900
+
+tier4-camera-gmsl (1.4.4) focal; urgency=medium
 
   * Fixed MAX9295 output clock frequency settings. This fixes the camera frame rate in the case of master mode. 
 

diff --git a/drivers/debian/prerm b/drivers/debian/prerm
@@ -2,7 +2,7 @@
 
 #!/bin/sh
 NAME=tier4-camera-gmsl
-VERSION=1.4.4
+VERSION=1.4.5
 KERNEL_REL=$(uname -r)
 set -e
 case "$1" in

diff --git a/drivers/dkms.conf b/drivers/dkms.conf
@@ -1,5 +1,5 @@
 PACKAGE_NAME="tier4-camera-gmsl"
-PACKAGE_VERSION="1.4.4"
+PACKAGE_VERSION="1.4.5"
 PROCS_NUM=`nproc`
 [ $PROCS_NUM -gt 16 ] && PROCS_NUM=16
 MAKE="make all -j$PROCS_NUM"

diff --git a/drivers/src/Makefile b/drivers/src/Makefile
@@ -166,6 +166,14 @@ else ifeq ($(L4T_RELEASE_MAIN), R35)
                 TARGET_ISX021_IMX490_DTS := tier4-isx021-imx490-gmsl-device-tree-overlay-orin-devkit-r3521
                 TARGET_IMX490_DTS        := tier4-imx490-gmsl-device-tree-overlay-orin-devkit-r3521
                 MAKE_OVERLAY_DTS_CMD     := make_overlay_dts_orin-devkit.py  r35.2.1
+            else ifeq ($(L4T_RELEASE_MAJOR), 4) # 35.4.1
+                KERNELRELEASE                   := 5.10.104-tegra
+                TARGET_ISX021_DTS               := tier4-isx021-gmsl-device-tree-overlay-orin-devkit-r3521
+                TARGET_IMX490_DTS               := tier4-imx490-gmsl-device-tree-overlay-orin-devkit-r3521
+                TARGET_IMX728_DTS               := tier4-imx728-gmsl-device-tree-overlay-orin-devkit-r3521
+                TARGET_ISX021_IMX490_DTS        := tier4-isx021-imx490-gmsl-device-tree-overlay-orin-devkit-r3521
+                TARGET_ISX021_IMX490_IMX728_DTS := tier4-isx021-imx490-imx728-gmsl-device-tree-overlay-orin-devkit-r3521
+                MAKE_OVERLAY_DTS_CMD            := make_overlay_dts_orin-devkit.py  r35.4.1
             else
                 KERNELRELEASE            := Unknown
                 TARGET_ISX021_DTS        := Unknown

diff --git a/drivers/src/make_overlay_dts_orin-devkit.py b/drivers/src/make_overlay_dts_orin-devkit.py
@@ -2937,10 +2937,10 @@ def get_serdes_pix_clk(str_revision, str_camera_type):
 
 if l4t_revision == "R35.1":
     str_rev_num = "351"
-elif l4t_revision == "R35.2.1":
+elif (l4t_revision == "R35.2.1") or (l4t_revision == "R35.4.1"):
     str_rev_num = "3521"
 else:
-    print(" Error!! : 1st argument should be R35.1 or R35.2.1")
+    print(" Error!! : 1st argument should be R35.1 or R35.2.1 or R35.4.1")
     usage()
     str_rev_num = "000"
 
@@ -2969,6 +2969,27 @@ def get_serdes_pix_clk(str_revision, str_camera_type):
     usage()
     sys.exit()
 
+# Replacing for R35.4.1.
+# This is due to the implementation of `min_gain_val` being -1 in L4T R35.4.1. 
+if l4t_revision == "R35.4.1":
+    str_i2c_isx021_0_p2 = str_i2c_isx021_0_p2.replace('min_gain_val = "0"', 'min_gain_val = "1"')
+    str_i2c_isx021_1_p2 = str_i2c_isx021_1_p2.replace('min_gain_val = "0"', 'min_gain_val = "1"')
+    str_i2c_isx021_2_p2 = str_i2c_isx021_2_p2.replace('min_gain_val = "0"', 'min_gain_val = "1"')
+    str_i2c_isx021_3_p2 = str_i2c_isx021_3_p2.replace('min_gain_val = "0"', 'min_gain_val = "1"')
+    str_i2c_isx021_4_p2 = str_i2c_isx021_4_p2.replace('min_gain_val = "0"', 'min_gain_val = "1"')
+    str_i2c_isx021_5_p2 = str_i2c_isx021_5_p2.replace('min_gain_val = "0"', 'min_gain_val = "1"')
+    str_i2c_isx021_6_p2 = str_i2c_isx021_6_p2.replace('min_gain_val = "0"', 'min_gain_val = "1"')
+    str_i2c_isx021_7_p2 = str_i2c_isx021_7_p2.replace('min_gain_val = "0"', 'min_gain_val = "1"')
+
+    str_i2c_imx490_0_p2 = str_i2c_imx490_0_p2.replace('min_gain_val = "0"', 'min_gain_val = "1"')
+    str_i2c_imx490_1_p2 = str_i2c_imx490_1_p2.replace('min_gain_val = "0"', 'min_gain_val = "1"')
+    str_i2c_imx490_2_p2 = str_i2c_imx490_2_p2.replace('min_gain_val = "0"', 'min_gain_val = "1"')
+    str_i2c_imx490_3_p2 = str_i2c_imx490_3_p2.replace('min_gain_val = "0"', 'min_gain_val = "1"')
+    str_i2c_imx490_4_p2 = str_i2c_imx490_4_p2.replace('min_gain_val = "0"', 'min_gain_val = "1"')
+    str_i2c_imx490_5_p2 = str_i2c_imx490_5_p2.replace('min_gain_val = "0"', 'min_gain_val = "1"')
+    str_i2c_imx490_6_p2 = str_i2c_imx490_6_p2.replace('min_gain_val = "0"', 'min_gain_val = "1"')
+    str_i2c_imx490_7_p2 = str_i2c_imx490_7_p2.replace('min_gain_val = "0"', 'min_gain_val = "1"')
+
 for i in range(MAX_NUM_CAMERAS):
     if i & 0x0 == 0:
         err = check_and_set_next_port(i, temp_cam)