Merge pull request #27 from tier4/release/v1.5.0

Release/v1.5.0

README.md

@@ -1,5 +1,5 @@
-# TIER IV Automotive HDR Camera C1/C2 Device Driver
-This repository contains the device driver for the [TIER IV Automotive HDR Camera C1/C2](https://sensor.tier4.jp/automotive-hdr-camera). 
+# TIER IV Automotive HDR Camera Device Driver
+This repository contains the device driver for the [TIER IV Automotive HDR Camera C1, C2, and C3](https://sensor.tier4.jp/automotive-hdr-camera). 
 
 If you want to use the official driver, please refer to the [Installation and Usage section](#installation-and-usage) and proceed with the installation.
 
@@ -23,11 +23,13 @@ You can download the deb package and build kernel module on the target ECU.
 The device type (i.e., C1 or C2) assignment is fixed at every GMSL2 port.
 The following table shows the default assignment:
 
-| overlay command \                                               | GMSL2 port No. | 1  | 2  | 3  | 4  | 5  | 6  | 7  | 8  |
-|-----------------------------------------------------------------|----------------|----|----|----|----|----|----|----|----|
-| `TIERIV(Tier4) ISX021 GMSL2 Camera Device Tree Overlay`        |                | C1 | C1 | C1 | C1 | C1 | C1 | C1 | C1 |
-| `TIERIV(Tier4) IMX490 GMSL2 Camera Device Tree Overlay`        |                | C2 | C2 | C2 | C2 | C2 | C2 | C2 | C2 |
-| `TIERIV(Tier4) ISX021 IMX490 GMSL2 Camera Device Tree Overlay` |                | C1 | C1 | C2 | C2 | C1 | C1 | C2 | C2 |
+| overlay command \                                                     | GMSL2 port No. | 1  | 2  | 3  | 4  | 5  | 6  | 7  | 8  |
+|-----------------------------------------------------------------------|----------------|----|----|----|----|----|----|----|----|
+| `TIERIV(Tier4) ISX021 GMSL2 Camera Device Tree Overlay`               |                | C1 | C1 | C1 | C1 | C1 | C1 | C1 | C1 |
+| `TIERIV(Tier4) IMX490 GMSL2 Camera Device Tree Overlay`               |                | C2 | C2 | C2 | C2 | C2 | C2 | C2 | C2 |
+| `TIERIV(Tier4) IMX728 GMSL2 Camera Device Tree Overlay`               |                | C3 | C3 | C3 | C3 | C3 | C3 | C3 | C3 |
+| `TIERIV(Tier4) ISX021 IMX490 GMSL2 Camera Device Tree Overlay`        |                | C1 | C1 | C2 | C2 | C1 | C1 | C2 | C2 |
+| `TIERIV(Tier4) ISX021 IMX490 IMX728 GMSL2 Camera Device Tree Overlay` |                | C1 | C1 | C2 | C2 | C3 | C3 | C3 | C3 |
 
 (e.g., If user executes `$ sudo /opt/nvidia/jetson-io/config-by-hardware.py -n 2="TIERIV ISX021 GMSL2 Camera Device Tree Overlay"`
 on the driver installation process, all ports are assigned for C1 cameras. Please see [drivers/README.md](drivers/README.md#combine-device-tree-overlaydtbo-with-original-dtb) for the detail of the overlay command.)

drivers/debian/changelog

@@ -1,3 +1,10 @@
+tier4-camera-gmsl (1.5.0) focal; urgency=medium
+
+  * Added C3 camera support
+  * Added L4T 35.4.1 support for ADLINK RQX-58G
+
+ -- tier4 <[email protected]>  Fri, 29 Sep 2024 13:58:20 +0900
+
 tier4-camera-gmsl (1.4.5) focal; urgency=medium
 
   * Added L4T 35.4.1 support for Nvidia Jetson AGX Orin development kit.
@@ -12,23 +19,23 @@ tier4-camera-gmsl (1.4.4) focal; urgency=medium
 
 tier4-camera-gmsl (1.4.3) focal; urgency=medium
 
-  * Fixed cache coherency issue.
+  * Support old FPGA and RQX-59G
 
- -- tier4 <ros@rqx58g>  Wed, 14 Feb 2024 11:42:59 +0900
+ -- tier4 <tier4@tier4-desktop>  Wed, 08 Nov 2023 01:43:00 +0900
 
-tier4-camera-gmsl (1.4.2) focal; urgency=medium 
+tier4-camera-gmsl (1.4.2) focal; urgency=medium
 
   * Support distortion correction for C2 camera
 
  -- tier4 <tier4@tier4-desktop>  Wed, 11 Oct 2023 01:42:00 +0900
 
-tier4-camera-gmsl (1.4.1) focal; urgency=medium 
+tier4-camera-gmsl (1.4.1) focal; urgency=medium
 
   * Support C2 slow clock mode
 
  -- tier4 <tier4@tier4-desktop>  Mon, 21 Aug 2023 01:41:00 +0900
 
-tier4-camera-gmsl (1.4.0) focal; urgency=medium 
+tier4-camera-gmsl (1.4.0) focal; urgency=medium
 
   *  Support Embedded data
 
@@ -82,7 +89,7 @@ tier4-isx021-gmsl (1.0.2) unstable; urgency=medium
 
 tier4-isx021-gmsl (1.0.1) unstable; urgency=low
 
-  * 
+  *
 
  -- yukke <yukke@yukke-ThinkPad-X1-Extreme>  Tue, 17 May 2022 18:20:08 +0900
 

drivers/debian/prerm

@@ -2,8 +2,19 @@
 
 #!/bin/sh
 NAME=tier4-camera-gmsl
-VERSION=1.4.5
+VERSION=1.5.0
 KERNEL_REL=$(uname -r)
+
+ISX021_GMSL_DTBO=$(ls /boot/tier4-isx021-gmsl*)
+ISX021_GMSL_DTBO_EXIST=$?
+
+IMX490_GMSL_DTBO=$(ls /boot/tier4-imx490-gmsl-*)
+ISX490_GMSL_DTBO_EXIST=$?
+
+IMX728_GMSL_DTBO=$(ls /boot/tier4-imx728-gmsl-*)
+IMX728_GMSL_DTBO_EXIST=$?
+
+
 set -e
 case "$1" in
     remove|upgrade|deconfigure)
@@ -12,21 +23,28 @@ case "$1" in
          rm -rf /usr/src/$NAME-$VERSION
          rm -f /lib/modules/$KERNEL_REL/updates/dkms/tier4-isx021.ko
          rm -f /lib/modules/$KERNEL_REL/updates/dkms/tier4-imx490.ko
+         rm -f /lib/modules/$KERNEL_REL/updates/dkms/tier4-imx728.ko
          rm -f /lib/modules/$KERNEL_REL/updates/dkms/tier4-max9295.ko
          rm -f /lib/modules/$KERNEL_REL/updates/dkms/tier4-max9296.ko
          rm -f /lib/modules/$KERNEL_REL/updates/dkms/tier4-gw5300.ko
          rm -f /lib/modules/$KERNEL_REL/updates/dkms/tier4-fpga.ko
          rm -f /lib/firmware/tier4-isx021.bin
-         rm -f /etc/modules-load.d/tier4-imx490-gmsl.conf
          rm -f /etc/modules-load.d/tier4-isx021-gmsl.conf
+         rm -f /etc/modules-load.d/tier4-imx490-gmsl.conf
+         rm -f /etc/modules-load.d/tier4-imx728-gmsl.conf
          rm -f /etc/modprobe.d/tier4-isx021.conf
          rm -f /etc/modprobe.d/tier4-imx490.conf
-         rm -rf /boot/tier4-isx021-gmsl-device-tree-overlay.dtbo
-         rm -rf /boot/tier4-isx021-gmsl-device-tree-overlay-orin.dtbo
-         rm -rf /boot/tier4-imx490-gmsl-device-tree-overlay.dtbo
-         rm -rf /boot/tier4-imx490-gmsl-device-tree-overlay-orin.dtbo
-         rm -rf /boot/tier4-isx021-imx490-gmsl-device-tree-overlay.dtbo
-         rm -rf /boot/tier4-isx021-imx490-gmsl-device-tree-overlay-orin.dtbo
+         rm -f /etc/modprobe.d/tier4-imx728.conf
+
+         if [ $ISX021_GMSL_DTBO_EXIST = 0 ]; then
+             rm -f $ISX021_GMSL_DTBO
+         fi
+         if [ $IMX490_GMSL_DTBO_EXIST = 0 ]; then
+             rm -f $IMX490_GMSL_DTBO
+         fi
+         if [ $IMX728_GMSL_DTBO_EXIST = 0 ]; then
+             rm -f $IMX728_GMSL_DTBO
+         fi
       fi
     ;;
 

drivers/dkms.conf

@@ -1,5 +1,5 @@
 PACKAGE_NAME="tier4-camera-gmsl"
-PACKAGE_VERSION="1.4.5"
+PACKAGE_VERSION="1.5.0"
 PROCS_NUM=`nproc`
 [ $PROCS_NUM -gt 16 ] && PROCS_NUM=16
 MAKE="make all -j$PROCS_NUM"
@@ -23,5 +23,8 @@ DEST_MODULE_LOCATION[4]="/updates"
 BUILT_MODULE_NAME[5]="tier4-fpga"
 DEST_MODULE_LOCATION[5]="/updates"
 
+BUILT_MODULE_NAME[6]="tier4-imx728"
+DEST_MODULE_LOCATION[6]="/updates"
+
 AUTOINSTALL="yes"
 # REMAKE_INITRD=no