Merge pull request #134 from zouxiaoh/iotg_ipu6

Intel IMX390&TI960 enabled on MTL, iot kernel 6.11-rc3

CMakeLists.txt

@@ -251,7 +251,8 @@ if (NOT CAL_BUILD)
     find_package(LIBDRM)
     if(LIBDRM_FOUND AND ("${LIBDRM_VERSION}" VERSION_GREATER_EQUAL 2.4.114))
         include_directories(${LIBDRM_INCLUDE_DIRS})
-        set(LIBCAMHAL_LINK_LIBS ${LIBCAMHAL_LINK_LIBS} ${LIBDRM_LIBS})
+        link_directories(${LIBDRM_LIBRARY_DIRS})
+        set(LIBCAMHAL_LINK_LIBS ${LIBCAMHAL_LINK_LIBS} ${LIBDRM_LIBRARIES})
         add_definitions(-DLIBDRM_SUPPORT_MMAP_OFFSET)
     endif()
 endif()
@@ -331,28 +332,32 @@ endif()
     # Link ia_imaging
     find_package(IA_IMAGING)
     set(TARGET_INCLUDE ${TARGET_INCLUDE} ${IA_IMAGING${TARGET_SUFFIX}_INCLUDE_DIRS})
-    set(TARGET_LINK_LIBS ${TARGET_LINK_LIBS} ${IA_IMAGING${TARGET_SUFFIX}_LIBS})
+    set(TARGET_LINK_LIBS ${TARGET_LINK_LIBS} ${IA_IMAGING${TARGET_SUFFIX}_LIBRARIES})
+    link_directories(${IA_IMAGING${TARGET_SUFFIX}_LIBRARY_DIRS})
 
     if(USE_PG_LITE_PIPE)
         find_package(LIBGCSS)
         set(TARGET_INCLUDE ${TARGET_INCLUDE} ${LIBGCSS${TARGET_SUFFIX}_INCLUDE_DIRS})
-        set(TARGET_LINK_LIBS ${TARGET_LINK_LIBS} ${LIBGCSS${TARGET_SUFFIX}_LIBS})
+        set(TARGET_LINK_LIBS ${TARGET_LINK_LIBS} ${LIBGCSS${TARGET_SUFFIX}_LIBRARIES})
+        link_directories(${LIBGCSS${TARGET_SUFFIX}_LIBRARY_DIRS})
         # Include libipu(4) headers
         find_package(LIBIPU)
         set(TARGET_INCLUDE ${TARGET_INCLUDE} ${LIBIPU${TARGET_SUFFIX}_INCLUDE_DIRS})
-        set(TARGET_LINK_LIBS ${TARGET_LINK_LIBS} ${LIBIPU${TARGET_SUFFIX}_LIBS})
+        set(TARGET_LINK_LIBS ${TARGET_LINK_LIBS} ${LIBIPU${TARGET_SUFFIX}_LIBRARIES})
+        link_directories(${LIBIPU${TARGET_SUFFIX}_LIBRARY_DIRS})
     else()
         # Link libiacss
         find_package(LIBIACSS)
         set(TARGET_INCLUDE ${TARGET_INCLUDE} ${LIBIACSS${TARGET_SUFFIX}_INCLUDE_DIRS})
-        set(TARGET_LINK_LIBS ${TARGET_LINK_LIBS} ${LIBIACSS${TARGET_SUFFIX}_LIBS})
+        set(TARGET_LINK_LIBS ${TARGET_LINK_LIBS} ${LIBIACSS${TARGET_SUFFIX}_LIBRARIES})
+        link_directories(${LIBIACSS${TARGET_SUFFIX}_LIBRARY_DIRS})
     endif()
 
 #--------------------------- Add libcamhal target  ---------------------------
 
 if (BUILD_CAMHAL_PLUGIN)
-    set(CAMHAL_TARGET ${IPU_VER})
-    set(CAMHAL_STATIC_TARGET ${IPU_VER}_static)
+    set(CAMHAL_TARGET camhal${IPU_VER})
+    set(CAMHAL_STATIC_TARGET camhal${IPU_VER}_static)
 else()
     set(CAMHAL_TARGET camhal)
     set(CAMHAL_STATIC_TARGET camhal_static)
@@ -386,6 +391,7 @@ else()
     set_target_properties(${CAMHAL_TARGET} PROPERTIES OUTPUT_NAME ${CAMHAL_TARGET})
 endif()
 
+
 #--------------------------- Install settings ---------------------------
 if (NOT CAL_BUILD)
     if (NOT BUILD_CAMHAL_PLUGIN)

cmake/FindIA_IMAGING.cmake

@@ -20,72 +20,44 @@ if(TARGET ia_aiq)
 endif()
 
 # Get include and lib paths for IA_IMAGING from pkgconfig
-include(FindPackageHandleStandardArgs)
 
 find_package(PkgConfig)
 pkg_check_modules(IA_IMAGING${TARGET_SUFFIX} ia_imaging${TARGET_SUFFIX})
 if(NOT IA_IMAGING${TARGET_SUFFIX}_FOUND)
     message(FATAL_ERROR "IA_IMAGING${TARGET_SUFFIX} not found")
 endif()
 
-set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} ${IA_IMAGING${TARGET_SUFFIX}_LIBRARY_DIRS})
-
-# Libraries
-find_library(IA_CCA${TARGET_SUFFIX}_LIB         ia_cca${TARGET_SUFFIX})
-find_library(IA_AIQ${TARGET_SUFFIX}_LIB         ia_aiq${TARGET_SUFFIX})
-find_library(IA_AIQB_PARSER${TARGET_SUFFIX}_LIB ia_aiqb_parser${TARGET_SUFFIX})
-find_library(IA_CMC_PARSER${TARGET_SUFFIX}_LIB  ia_cmc_parser${TARGET_SUFFIX})
-find_library(IA_EXC${TARGET_SUFFIX}_LIB         ia_exc${TARGET_SUFFIX})
-find_library(IA_MKN${TARGET_SUFFIX}_LIB         ia_mkn${TARGET_SUFFIX})
-# SENSOR_EMD_DECODER
-find_library(IA_EMD${TARGET_SUFFIX}_LIB         ia_emd_decoder${TARGET_SUFFIX})
+set(IA_IMAGING${TARGET_SUFFIX}_LIBRARIES
+    ia_cca${TARGET_SUFFIX}
+    ia_aiq${TARGET_SUFFIX}
+    ia_aiqb_parser${TARGET_SUFFIX}
+    ia_cmc_parser${TARGET_SUFFIX}
+    ia_exc${TARGET_SUFFIX}
+    ia_mkn${TARGET_SUFFIX}
+    ia_emd_decoder${TARGET_SUFFIX}
+    ia_nvm${TARGET_SUFFIX}
+    ia_log${TARGET_SUFFIX}
+    ia_dvs${TARGET_SUFFIX}
+    ia_coordinate${TARGET_SUFFIX}
+    ia_ltm${TARGET_SUFFIX}
+    ia_dvs${TARGET_SUFFIX}
+    ia_isp_bxt${TARGET_SUFFIX}
+    broxton_ia_pal${TARGET_SUFFIX}
 # DOL_FEATURE_S
-find_library(IA_BCOMP${TARGET_SUFFIX}_LIB       ia_bcomp${TARGET_SUFFIX})
+    ia_bcomp${TARGET_SUFFIX}
 # DOL_FEATURE_E
-find_library(IA_NVM${TARGET_SUFFIX}_LIB         ia_nvm${TARGET_SUFFIX})
-find_library(IA_LOG${TARGET_SUFFIX}_LIB         ia_log${TARGET_SUFFIX})
-find_library(IA_DVS${TARGET_SUFFIX}_LIB         ia_dvs${TARGET_SUFFIX})
-find_library(IA_COORDINATE${TARGET_SUFFIX}_LIB  ia_coordinate${TARGET_SUFFIX})
-find_library(IA_LTM${TARGET_SUFFIX}_LIB         ia_ltm${TARGET_SUFFIX})
-find_library(IA_DVS${TARGET_SUFFIX}_LIB         ia_dvs${TARGET_SUFFIX})
-find_library(IA_ISP_BXT${TARGET_SUFFIX}_LIB     ia_isp_bxt${TARGET_SUFFIX})
-find_library(BXT_IA_PAL${TARGET_SUFFIX}_LIB     broxton_ia_pal${TARGET_SUFFIX})
-
-set(IA_IMAGING${TARGET_SUFFIX}_LIBS
-    ${IA_CCA${TARGET_SUFFIX}_LIB}
-    ${IA_AIQ${TARGET_SUFFIX}_LIB}
-    ${IA_AIQB_PARSER${TARGET_SUFFIX}_LIB}
-    ${IA_CMC_PARSER${TARGET_SUFFIX}_LIB}
-    ${IA_EXC${TARGET_SUFFIX}_LIB}
-    ${IA_MKN${TARGET_SUFFIX}_LIB}
-    ${IA_EMD${TARGET_SUFFIX}_LIB}
-    ${IA_BCOMP${TARGET_SUFFIX}_LIB}
-    ${IA_NVM${TARGET_SUFFIX}_LIB}
-    ${IA_LOG${TARGET_SUFFIX}_LIB}
-    ${IA_DVS${TARGET_SUFFIX}_LIB}
-    ${IA_COORDINATE${TARGET_SUFFIX}_LIB}
-    ${IA_LTM${TARGET_SUFFIX}_LIB}
-    ${IA_DVS${TARGET_SUFFIX}_LIB}
-    ${IA_OB${TARGET_SUFFIX}_LIB}
-    ${IA_ISP_BXT${TARGET_SUFFIX}_LIB}
-    ${BXT_IA_PAL${TARGET_SUFFIX}_LIB}
 )
 
 if (NOT ENABLE_SANDBOXING)
-    find_library(IA_LARD${TARGET_SUFFIX}_LIB ia_lard${TARGET_SUFFIX})
-    set(IA_IMAGING${TARGET_SUFFIX}_LIBS ${IA_IMAGING${TARGET_SUFFIX}_LIBS} ${IA_LARD${TARGET_SUFFIX}_LIB})
+    set(IA_IMAGING${TARGET_SUFFIX}_LIBRARIES
+        ${IA_IMAGING${TARGET_SUFFIX}_LIBRARIES}
+        ia_lard${TARGET_SUFFIX}
+    )
 endif() #ENABLE_SANDBOXING
 
 if (USE_PG_LITE_PIPE)
-    find_library(IA_P2P${TARGET_SUFFIX}_LIB ia_p2p${TARGET_SUFFIX})
-    set(IA_IMAGING${TARGET_SUFFIX}_LIBS ${IA_IMAGING${TARGET_SUFFIX}_LIBS} ${IA_P2P${TARGET_SUFFIX}_LIB})
-endif()
-
-# handle the QUIETLY and REQUIRED arguments and set EXPAT_FOUND to TRUE if
-# all listed variables are TRUE
-find_package_handle_standard_args(IA_IMAGING${TARGET_SUFFIX}
-                                  REQUIRED_VARS IA_IMAGING${TARGET_SUFFIX}_INCLUDE_DIRS IA_IMAGING${TARGET_SUFFIX}_LIBS)
-
-if(NOT IA_IMAGING${TARGET_SUFFIX}_FOUND)
-    message(FATAL_ERROR "IA_IMAGING${TARGET_SUFFIX} not found")
+    set(IA_IMAGING${TARGET_SUFFIX}_LIBRARIES
+        ${IA_IMAGING${TARGET_SUFFIX}_LIBRARIES}
+        ia_p2p${TARGET_SUFFIX}
+    )
 endif()

cmake/FindLIBDRM.cmake

@@ -15,25 +15,9 @@
 #
 
 # Get include and lib paths for LIBDRM from pkgconfig
-include(FindPackageHandleStandardArgs)
 
 find_package(PkgConfig)
 pkg_check_modules(LIBDRM libdrm)
 if(NOT LIBDRM_FOUND)
     message(SEND_ERROR "LIBDRM not found")
 endif()
-
-set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} ${LIBDRM_LIBRARY_DIRS})
-
-# Libraries
-find_library(DRM_LIB drm)
-set(LIBDRM_LIBS ${DRM_LIB})
-
-# handle the QUIETLY and REQUIRED arguments and set EXPAT_FOUND to TRUE if
-# all listed variables are TRUE
-find_package_handle_standard_args(LIBDRM REQUIRED_VARS LIBDRM_INCLUDE_DIRS LIBDRM_LIBS)
-
-if(NOT LIBDRM_FOUND)
-        message(SEND_ERROR "LIBDRM not found")
-endif()
-

cmake/FindLIBGCSS.cmake

@@ -15,25 +15,9 @@
 #
 
 # Get include and lib paths for LIBGCSS from pkgconfig
-include(FindPackageHandleStandardArgs)
 
 find_package(PkgConfig)
 pkg_check_modules(LIBGCSS${TARGET_SUFFIX} libgcss${TARGET_SUFFIX})
 if(NOT LIBGCSS${TARGET_SUFFIX}_FOUND)
     message(FATAL_ERROR "LIBGCSS${TARGET_SUFFIX} not found")
 endif()
-
-set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} ${LIBGCSS${TARGET_SUFFIX}_LIBRARY_DIRS})
-
-# Libraries
-find_library(GCSS${TARGET_SUFFIX}_LIB gcss${TARGET_SUFFIX})
-set(LIBGCSS${TARGET_SUFFIX}_LIBS ${GCSS${TARGET_SUFFIX}_LIB})
-
-# handle the QUIETLY and REQUIRED arguments and set EXPAT_FOUND to TRUE if
-# all listed variables are TRUE
-find_package_handle_standard_args(LIBGCSS${TARGET_SUFFIX} REQUIRED_VARS LIBGCSS${TARGET_SUFFIX}_INCLUDE_DIRS LIBGCSS${TARGET_SUFFIX}_LIBS)
-
-if(NOT LIBGCSS${TARGET_SUFFIX}_FOUND)
-        message(FATAL_ERROR "LIBGCSS${TARGET_SUFFIX} not found")
-endif()
-

cmake/FindLIBIACSS.cmake

@@ -15,32 +15,9 @@
 #
 
 # Get include and lib paths for LIBIACSS from pkgconfig
-include(FindPackageHandleStandardArgs)
 
 find_package(PkgConfig)
-pkg_check_modules(LIBIACSS libiacss)
-if(NOT LIBIACSS_FOUND)
-    message(FATAL_ERROR "LIBIACSS not found")
+pkg_check_modules(LIBIACSS${TARGET_SUFFIX} libiacss${TARGET_SUFFIX})
+if(NOT LIBIACSS${TARGET_SUFFIX}_FOUND)
+    message(FATAL_ERROR "LIBIACSS${TARGET_SUFFIX} not found")
 endif()
-
-set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} ${LIBIACSS_LIBRARY_DIRS})
-
-# Libraries
-find_library(GCSS_LIB      gcss)
-find_library(IA_CAMERA_LIB ia_camera)
-find_library(IA_CIPF_LIB   ia_cipf)
-set(LIBIACSS_LIBS
-    ${GCSS_LIB}
-    ${IA_CAMERA_LIB}
-    ${IA_CIPF_LIB}
-    )
-
-# handle the QUIETLY and REQUIRED arguments and set EXPAT_FOUND to TRUE if
-# all listed variables are TRUE
-find_package_handle_standard_args(LIBIACSS
-                                  REQUIRED_VARS LIBIACSS_INCLUDE_DIRS LIBIACSS_LIBS)
-
-if(NOT LIBIACSS_FOUND)
-    message(FATAL_ERROR "LIBIACSS not found")
-endif()
-

cmake/FindLIBIPU.cmake

@@ -28,26 +28,9 @@ else()
 endif()
 
 # Get include and lib paths for LIBIPU from pkgconfig
-include(FindPackageHandleStandardArgs)
 
-# Include directory
 find_package(PkgConfig)
 pkg_check_modules(LIBIPU${TARGET_SUFFIX} ${libipu_ver})
 if(NOT LIBIPU${TARGET_SUFFIX}_FOUND)
     message(FATAL_ERROR "LIBIPU${TARGET_SUFFIX} not found")
 endif()
-
-set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} ${LIBIPU${TARGET_SUFFIX}_LIBRARY_DIRS})
-
-# Libraries
-find_library(IPU${TARGET_SUFFIX}_LIB NAMES ${libipu_ver}.a)
-set(LIBIPU${TARGET_SUFFIX}_LIBS ${IPU${TARGET_SUFFIX}_LIB})
-
-# handle the QUIETLY and REQUIRED arguments and set EXPAT_FOUND to TRUE if
-# all listed variables are TRUE
-find_package_handle_standard_args(LIBIPU${TARGET_SUFFIX}
-                                  REQUIRED_VARS LIBIPU${TARGET_SUFFIX}_INCLUDE_DIRS LIBIPU${TARGET_SUFFIX}_LIBS)
-
-if(NOT LIBIPU${TARGET_SUFFIX}_FOUND)
-    message(FATAL_ERROR "LIBIPU${TARGET_SUFFIX} not found")
-endif()

config/linux/ipu6/gcss/graph_settings_hm11b1.xml

@@ -262,7 +262,7 @@ limitations under the License.
   <sis_b width="160" height="92" stream_id="60001" />
   <sis_a width="320" height="200" stream_id="60001" />
   <sensor vflip="0" hflip="0" mode_id="11B1_RGBIR">
-            <port_0 format="BG10" width="1292" height="800" />
+            <port_0 format="BG10" width="1312" height="800" />
         </sensor>
   <csi_be>
     <output format="GR10" width="1292" height="800" />
@@ -1131,7 +1131,7 @@ limitations under the License.
   <still0 width="1280" height="720" stream_id="60000" bpp="8" format="Linear" />
   <sis_a_stills_only width="320" height="184" stream_id="60000" />
   <sensor vflip="0" hflip="0" mode_id="11B1_RGBIR">
-            <port_0 format="BG10" width="1292" height="800" />
+            <port_0 format="BG10" width="1312" height="800" />
         </sensor>
   <csi_be>
     <output format="GR10" width="1292" height="800" />

config/linux/ipu6/sensors/hm11b1-uf.xml

@@ -16,12 +16,12 @@
 
 <CameraSettings>
     <Sensor name="hm11b1-uf" description="HM11B1 sensor.">
-        <MediaCtlConfig id="0" ConfigMode="AUTO" outputWidth="1292" outputHeight="800" format="V4L2_PIX_FMT_SGRBG10"><!-- RAW10 BE capture -->
+        <MediaCtlConfig id="0" ConfigMode="AUTO" outputWidth="1312" outputHeight="800" format="V4L2_PIX_FMT_SGRBG10"><!-- RAW10 BE capture -->
             <format name="hm11b1 $I2CBUS" pad="0" width="1292" height="800" format="V4L2_MBUS_FMT_SGRBG10_1X10"/>
             <format name="Intel IPU6 CSI-2 $CSI_PORT" pad="0" width="1292" height="800" format="V4L2_MBUS_FMT_SGRBG10_1X10"/>
             <format name="Intel IPU6 CSI2 BE SOC 0" pad="0" width="1292" height="800" format="V4L2_MBUS_FMT_SGRBG10_1X10"/>
-            <format name="Intel IPU6 CSI2 BE SOC 0" pad="1" width="1292" height="800" format="V4L2_MBUS_FMT_SGRBG10_1X10"/>
-            <selection name="Intel IPU6 CSI2 BE SOC 0" pad="1" target="V4L2_SEL_TGT_CROP" left="0" top="0" width="1292" height="800"/>
+            <format name="Intel IPU6 CSI2 BE SOC 0" pad="1" width="1312" height="800" format="V4L2_MBUS_FMT_SGRBG10_1X10"/>
+            <selection name="Intel IPU6 CSI2 BE SOC 0" pad="1" target="V4L2_SEL_TGT_CROP" left="0" top="0" width="1312" height="800"/>
 
             <link srcName="hm11b1 $I2CBUS" srcPad="0" sinkName="Intel IPU6 CSI-2 $CSI_PORT" sinkPad="0" enable="true"/>
             <link srcName="Intel IPU6 CSI-2 $CSI_PORT" srcPad="1" sinkName="Intel IPU6 CSI2 BE SOC 0" sinkPad="0" enable="true"/>
@@ -31,9 +31,11 @@
             <videonode name="Intel IPU6 CSI-2 $CSI_PORT" videoNodeType="VIDEO_ISYS_RECEIVER"/>
             <videonode name="hm11b1 $I2CBUS" videoNodeType="VIDEO_PIXEL_ARRAY"/>
         </MediaCtlConfig>
-        <MediaCtlConfig id="0" mediaCfg="1" ConfigMode="AUTO" outputWidth="1292" outputHeight="800" format="V4L2_PIX_FMT_SGRBG10"><!-- RAW10 BE capture -->
+        <MediaCtlConfig id="0" mediaCfg="1" ConfigMode="AUTO" outputWidth="1312" outputHeight="800" format="V4L2_PIX_FMT_SGRBG10"><!-- RAW10 BE capture -->
             <format name="hm11b1 $I2CBUS" pad="0" width="1292" height="800" format="V4L2_MBUS_FMT_SGRBG10_1X10"/>
             <format name="Intel IPU6 CSI2 $CSI_PORT" pad="0" width="1292" height="800" format="V4L2_MBUS_FMT_SGRBG10_1X10"/>
+            <format name="Intel IPU6 CSI2 $CSI_PORT" pad="1" width="1312" height="800" format="V4L2_MBUS_FMT_SGRBG10_1X10"/>
+            <selection name="Intel IPU6 CSI2 $CSI_PORT" pad="1" target="V4L2_SEL_TGT_CROP" left="0" top="0" width="1312" height="800"/>
 
             <link srcName="hm11b1 $I2CBUS" srcPad="0" sinkName="Intel IPU6 CSI2 $CSI_PORT" sinkPad="0" enable="true"/>
             <link srcName="Intel IPU6 CSI2 $CSI_PORT" srcPad="1" sinkName="Intel IPU6 ISYS Capture $CAPTURE_ID" sinkPad="0" enable="true"/>
@@ -74,7 +76,7 @@
         <!-- <TuningMode, cmc tag, aiq tag, isp tag, others tag>  -->
         <lardTags value="VIDEO,DFLT,DFLT,DFLT,DFLT"/>
 
-        <supportedISysSizes value="1292x800"/> <!-- ascending order request -->
+        <supportedISysSizes value="1312x800"/> <!-- ascending order request -->
         <supportedISysFormat value="V4L2_PIX_FMT_SGRBG10"/>
         <enableAIQ value="true"/>
         <iSysRawFormat value="V4L2_PIX_FMT_SGRBG10"/>

config/linux/ipu6ep/sensors/imx390.xml

@@ -666,7 +666,7 @@
 
             <videonode name="Intel IPU6 BE SOC 2 capture 3" videoNodeType="VIDEO_GENERIC"/>
             <videonode name="Intel IPU6 CSI-2 2" videoNodeType="VIDEO_ISYS_RECEIVER"/>
-            <videonode name="imx390 d" videoNodeType="VIDEO_PIXEL_ARRAY"/>
+            <videonode name="imx390 h" videoNodeType="VIDEO_PIXEL_ARRAY"/>
         </MediaCtlConfig>
         <StaticMetadata>
             <!-- list of stream config info. Meanings of each part is "format,widthxheight,field(0 is none, 7 is alternate),mcId" -->
@@ -1280,7 +1280,7 @@
             <videonode name="imx390 g" videoNodeType="VIDEO_PIXEL_ARRAY"/>
         </MediaCtlConfig>
         <MediaCtlConfig id="1" ConfigMode="AUTO" outputWidth="1280" outputHeight="960" format="V4L2_PIX_FMT_SGRBG12">
-            <control name="imx390 f" ctrlId="V4L2_CID_TEST_PATTERN" value="1" ctrlName="set Len Shading Correction"/>
+            <control name="imx390 g" ctrlId="V4L2_CID_TEST_PATTERN" value="1" ctrlName="set Len Shading Correction"/>
             <format name="imx390 g" pad="0" width="1280" height="960" format="V4L2_MBUS_FMT_SGRBG12_1X12"/>
             <format name="TI960 b" pad="2" width="1280" height="960" format="V4L2_MBUS_FMT_SGRBG12_1X12"/>
             <format name="TI960 b" pad="4" width="1280" height="960" format="V4L2_MBUS_FMT_SGRBG12_1X12"/>
@@ -1386,7 +1386,7 @@
 
             <videonode name="Intel IPU6 BE SOC 2 capture 3" videoNodeType="VIDEO_GENERIC"/>
             <videonode name="Intel IPU6 CSI-2 2" videoNodeType="VIDEO_ISYS_RECEIVER"/>
-            <videonode name="imx390 d" videoNodeType="VIDEO_PIXEL_ARRAY"/>
+            <videonode name="imx390 h" videoNodeType="VIDEO_PIXEL_ARRAY"/>
         </MediaCtlConfig>
         <StaticMetadata>
             <!-- list of stream config info. Meanings of each part is "format,widthxheight,field(0 is none, 7 is alternate),mcId" -->

config/linux/ipu6ep/sensors/ov01a10-uf.xml

@@ -36,6 +36,8 @@
         <MediaCtlConfig id="0" mediaCfg="1" ConfigMode="AUTO" outputWidth="1280" outputHeight="798" format="V4L2_PIX_FMT_SGRBG10"><!-- RAW10 BE capture -->
             <format name="ov01a10 $I2CBUS" pad="0" width="1280" height="800" format="V4L2_MBUS_FMT_SBGGR10_1X10"/>
             <format name="Intel IPU6 CSI2 $CSI_PORT" pad="0" width="1280" height="800" format="V4L2_MBUS_FMT_SBGGR10_1X10"/>
+            <format name="Intel IPU6 CSI2 $CSI_PORT" pad="1" width="1280" height="798" format="V4L2_MBUS_FMT_SBGGR10_1X10"/>
+            <selection name="Intel IPU6 CSI2 $CSI_PORT" pad="1" target="V4L2_SEL_TGT_CROP" left="0" top="1" width="1280" height="798"/>
 
             <link srcName="ov01a10 $I2CBUS" srcPad="0" sinkName="Intel IPU6 CSI2 $CSI_PORT" sinkPad="0" enable="true"/>
             <link srcName="Intel IPU6 CSI2 $CSI_PORT" srcPad="1" sinkName="Intel IPU6 ISYS Capture $CAPTURE_ID" sinkPad="0" enable="true"/>

config/linux/ipu6ep/sensors/ov8856-uf.xml

@@ -34,6 +34,8 @@
         <MediaCtlConfig id="0" mediaCfg="1" ConfigMode="AUTO" outputWidth="3296" outputHeight="2464" format="V4L2_PIX_FMT_SGRBG10"> <!-- RAW10 BE capture -->
             <format name="ov8856 $I2CBUS" pad="0" width="3280" height="2464" format="V4L2_MBUS_FMT_SGRBG10_1X10"/>
             <format name="Intel IPU6 CSI2 $CSI_PORT" pad="0" width="3280" height="2464" format="V4L2_MBUS_FMT_SGRBG10_1X10"/>
+            <format name="Intel IPU6 CSI2 $CSI_PORT" pad="1" width="3296" height="2464" format="V4L2_MBUS_FMT_SGRBG10_1X10"/>
+            <selection name="Intel IPU6 CSI2 $CSI_PORT" pad="1" target="V4L2_SEL_TGT_CROP" left="0" top="0" width="3296" height="2464"/>
 
             <link srcName="ov8856 $I2CBUS" srcPad="0" sinkName="Intel IPU6 CSI2 $CSI_PORT" sinkPad="0" enable="true"/>
             <link srcName="Intel IPU6 CSI2 $CSI_PORT" srcPad="1" sinkName="Intel IPU6 ISYS Capture $CAPTURE_ID" sinkPad="0" enable="true"/>

config/linux/ipu6ep/sensors/ov8856-wf.xml

@@ -34,6 +34,8 @@
         <MediaCtlConfig id="0" mediaCfg="1" ConfigMode="AUTO" outputWidth="3296" outputHeight="2464" format="V4L2_PIX_FMT_SGRBG10"> <!-- RAW10 BE capture -->
             <format name="ov8856 $I2CBUS" pad="0" width="3280" height="2464" format="V4L2_MBUS_FMT_SGRBG10_1X10"/>
             <format name="Intel IPU6 CSI2 $CSI_PORT" pad="0" width="3280" height="2464" format="V4L2_MBUS_FMT_SGRBG10_1X10"/>
+            <format name="Intel IPU6 CSI2 $CSI_PORT" pad="1" width="3296" height="2464" format="V4L2_MBUS_FMT_SGRBG10_1X10"/>
+            <selection name="Intel IPU6 CSI2 $CSI_PORT" pad="1" target="V4L2_SEL_TGT_CROP" left="0" top="0" width="3296" height="2464"/>
 
             <link srcName="ov8856 $I2CBUS" srcPad="0" sinkName="Intel IPU6 CSI2 $CSI_PORT" sinkPad="0" enable="true"/>
             <link srcName="Intel IPU6 CSI2 $CSI_PORT" srcPad="1" sinkName="Intel IPU6 ISYS Capture $CAPTURE_ID" sinkPad="0" enable="true"/>

config/linux/ipu6epmtl/libcamhal_profile.xml

@@ -22,6 +22,7 @@
         <availableSensors value="ov05c10-uf-4,ov08x40-uf-0,ov13b10-uf-0,ov13b10-wf-4,ov5675-uf-4,ov01a1s-uf-0,ov01a10-uf-0,ov01a10-uf-4,
                                  ov02c10-uf-0,ov02c10-uf-1,ov02c10-uf-4,ov02e10-uf-1,ov02e10-uf-4,
                                  hm2170-uf-0,hm2170-uf-1,hm2170-uf-4,hm2172-uf-1,hm2172-uf-4,hi556-uf-1,
-                                 imx390,ar0234-1-0,ar0234-2-4,external_source,ar0234_usb,lt6911uxc,lt6911uxe-1-0,lt6911uxe-2-4"/>
+                                 imx390-1-0,imx390-2-0,imx390-3-0,imx390-4-0,imx390-5-4,imx390-6-4,ar0234-1-0,ar0234-2-4,
+                                 external_source,ar0234_usb,lt6911uxc,lt6911uxe-1-0,lt6911uxe-2-4"/>
     </Common>
 </CameraSettings>