diff --git a/debian-11-git-libcamera/suite/bookworm/debian/changelog b/debian-11-git-libcamera/suite/bookworm/debian/changelog index 5a8599fc04c05f559d7e81835fe87a677e13f21e..d54ed71a975699e343757e3d960b47203033119e 100644 --- a/debian-11-git-libcamera/suite/bookworm/debian/changelog +++ b/debian-11-git-libcamera/suite/bookworm/debian/changelog @@ -1,3 +1,9 @@ +libcamera (0.0.5-2bbbio1~bookworm+20230710) bookworm; urgency=low + + * Rebuild for repos.rcn-ee.com + + -- Robert Nelson <robertcnelson@gmail.com> Mon, 10 Jul 2023 16:00:53 -0500 + libcamera (0.0.5-2bbbio0~bookworm+20230710) bookworm; urgency=low * Rebuild for repos.rcn-ee.com diff --git a/debian-11-git-libcamera/suite/bookworm/debian/patches/0001-libcamera-pipeline-simple-Support-TI-CSI-RX.patch b/debian-11-git-libcamera/suite/bookworm/debian/patches/0001-libcamera-pipeline-simple-Support-TI-CSI-RX.patch new file mode 100644 index 0000000000000000000000000000000000000000..bb67ab55d9d35d18d19168cc1013214ba9b6124b --- /dev/null +++ b/debian-11-git-libcamera/suite/bookworm/debian/patches/0001-libcamera-pipeline-simple-Support-TI-CSI-RX.patch @@ -0,0 +1,41 @@ +From 954ba8a803c078784dfaa6674e687847f49a1dfb Mon Sep 17 00:00:00 2001 +From: Jai Luthra <j-luthra@ti.com> +Date: Thu, 6 Jul 2023 23:44:47 +0530 +Subject: [PATCH] libcamera: pipeline: simple: Support TI CSI-RX + +New TI SoCs from J7 and AM62 family have a camera pipeline that receives +data using Cadence's DPHY-RX and CSI-RX bridge. A pixel-grabbing "shim" +IP routes this incoming stream of data to the DMA subsystem, to finally +store the frame data in memory. + +The driver for this is not merged in mainline yet, but v7 was posted [1] +on linux-media list a few months ago. + +With some minor fixes, the work-in-progress v8 series [2] works with the +simple pipeline handler, so we enable support for this device. + +Link: https://lore.kernel.org/all/20230314115516.667-1-vaishnav.a@ti.com/ [1] +Link: https://github.com/jailuthra/linux/commits/6ff226ca13f34 [2] +Signed-off-by: Jai Luthra <j-luthra@ti.com> +Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> +Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com> +Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> +--- + src/libcamera/pipeline/simple/simple.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp +index e1f8b98..9f3c9a1 100644 +--- a/src/libcamera/pipeline/simple/simple.cpp ++++ b/src/libcamera/pipeline/simple/simple.cpp +@@ -191,6 +191,7 @@ namespace { + + static const SimplePipelineInfo supportedDevices[] = { + { "imx7-csi", { { "pxp", 1 } } }, ++ { "j721e-csi2rx", {} }, + { "mxc-isi", {} }, + { "qcom-camss", {} }, + { "sun6i-csi", {} }, +-- +2.39.2 + diff --git a/debian-11-git-libcamera/suite/bookworm/debian/patches/series b/debian-11-git-libcamera/suite/bookworm/debian/patches/series index 4bcb5acde30442f2d88acc00ef1b0af31ca8a1fd..9a818a4f33bcb275f268707079be6497a1905307 100644 --- a/debian-11-git-libcamera/suite/bookworm/debian/patches/series +++ b/debian-11-git-libcamera/suite/bookworm/debian/patches/series @@ -1,2 +1,3 @@ ppc64el-fix-ftbfs-gcc.patch skip_failing_tests.patch +0001-libcamera-pipeline-simple-Support-TI-CSI-RX.patch diff --git a/debian-11-git-libcamera/suite/bullseye/debian/changelog b/debian-11-git-libcamera/suite/bullseye/debian/changelog index 3448af121fb961fbec6e58d6f158e6e92a02e5aa..90dbb7bc801142f724e7cec4d050930bbe4725c9 100644 --- a/debian-11-git-libcamera/suite/bullseye/debian/changelog +++ b/debian-11-git-libcamera/suite/bullseye/debian/changelog @@ -1,3 +1,9 @@ +libcamera (0.0.5-2bbbio1~bullseye+20230710) bullseye; urgency=low + + * Rebuild for repos.rcn-ee.com + + -- Robert Nelson <robertcnelson@gmail.com> Mon, 10 Jul 2023 16:00:53 -0500 + libcamera (0.0.5-2bbbio0~bullseye+20230710) bullseye; urgency=low * Rebuild for repos.rcn-ee.com diff --git a/debian-11-git-libcamera/suite/bullseye/debian/patches/0001-libcamera-pipeline-simple-Support-TI-CSI-RX.patch b/debian-11-git-libcamera/suite/bullseye/debian/patches/0001-libcamera-pipeline-simple-Support-TI-CSI-RX.patch new file mode 100644 index 0000000000000000000000000000000000000000..bb67ab55d9d35d18d19168cc1013214ba9b6124b --- /dev/null +++ b/debian-11-git-libcamera/suite/bullseye/debian/patches/0001-libcamera-pipeline-simple-Support-TI-CSI-RX.patch @@ -0,0 +1,41 @@ +From 954ba8a803c078784dfaa6674e687847f49a1dfb Mon Sep 17 00:00:00 2001 +From: Jai Luthra <j-luthra@ti.com> +Date: Thu, 6 Jul 2023 23:44:47 +0530 +Subject: [PATCH] libcamera: pipeline: simple: Support TI CSI-RX + +New TI SoCs from J7 and AM62 family have a camera pipeline that receives +data using Cadence's DPHY-RX and CSI-RX bridge. A pixel-grabbing "shim" +IP routes this incoming stream of data to the DMA subsystem, to finally +store the frame data in memory. + +The driver for this is not merged in mainline yet, but v7 was posted [1] +on linux-media list a few months ago. + +With some minor fixes, the work-in-progress v8 series [2] works with the +simple pipeline handler, so we enable support for this device. + +Link: https://lore.kernel.org/all/20230314115516.667-1-vaishnav.a@ti.com/ [1] +Link: https://github.com/jailuthra/linux/commits/6ff226ca13f34 [2] +Signed-off-by: Jai Luthra <j-luthra@ti.com> +Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> +Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com> +Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> +--- + src/libcamera/pipeline/simple/simple.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp +index e1f8b98..9f3c9a1 100644 +--- a/src/libcamera/pipeline/simple/simple.cpp ++++ b/src/libcamera/pipeline/simple/simple.cpp +@@ -191,6 +191,7 @@ namespace { + + static const SimplePipelineInfo supportedDevices[] = { + { "imx7-csi", { { "pxp", 1 } } }, ++ { "j721e-csi2rx", {} }, + { "mxc-isi", {} }, + { "qcom-camss", {} }, + { "sun6i-csi", {} }, +-- +2.39.2 + diff --git a/debian-11-git-libcamera/suite/bullseye/debian/patches/series b/debian-11-git-libcamera/suite/bullseye/debian/patches/series index 4bcb5acde30442f2d88acc00ef1b0af31ca8a1fd..9a818a4f33bcb275f268707079be6497a1905307 100644 --- a/debian-11-git-libcamera/suite/bullseye/debian/patches/series +++ b/debian-11-git-libcamera/suite/bullseye/debian/patches/series @@ -1,2 +1,3 @@ ppc64el-fix-ftbfs-gcc.patch skip_failing_tests.patch +0001-libcamera-pipeline-simple-Support-TI-CSI-RX.patch diff --git a/debian-11-git-libcamera/version.sh b/debian-11-git-libcamera/version.sh index f9bfce6374482aad65792de2d75fab3ec1bee51e..b10496a3b84bbc9b802d6ef3dbd314d31361293a 100644 --- a/debian-11-git-libcamera/version.sh +++ b/debian-11-git-libcamera/version.sh @@ -18,7 +18,7 @@ dl_path="pool/main/${reprepro_dir}/" debian_version="${package_version}-2" debian_untar="${package_name}_${debian_version}.debian.tar.xz" debian_patch="" -local_patch="bbbio0" +local_patch="bbbio1" bullseye_version="~bullseye+20230710" bookworm_version="~bookworm+20230710"