diff --git a/build/boards/default/dts/sg200x/soph_base.dtsi b/build/boards/default/dts/sg200x/soph_base.dtsi index 1dee070047..bc8f3f7368 100644 --- a/build/boards/default/dts/sg200x/soph_base.dtsi +++ b/build/boards/default/dts/sg200x/soph_base.dtsi @@ -865,13 +865,13 @@ trips { soc_thermal_trip_0: soc_thermal_trip_0 { - temperature = <100000>; /* millicelsius */ + temperature = <110000>; /* millicelsius */ hysteresis = <5000>; /* millicelsius */ type = "passive"; }; soc_thermal_trip_1: soc_thermal_trip_1 { - temperature = <110000>; /* millicelsius */ + temperature = <120000>; /* millicelsius */ hysteresis = <5000>; /* millicelsius */ type = "passive"; }; diff --git a/build/boards/sg200x/sg2002_licheervnano_sd/sg2002_licheervnano_sd_defconfig b/build/boards/sg200x/sg2002_licheervnano_sd/sg2002_licheervnano_sd_defconfig index 23625e60f4..4138f665bb 100644 --- a/build/boards/sg200x/sg2002_licheervnano_sd/sg2002_licheervnano_sd_defconfig +++ b/build/boards/sg200x/sg2002_licheervnano_sd/sg2002_licheervnano_sd_defconfig @@ -14,11 +14,13 @@ CONFIG_CP_EXT_WIRELESS=y CONFIG_STORAGE_TYPE_sd=y CONFIG_MIPI_PANEL_ZCT2133V1=y CONFIG_SENSOR_GCORE_GC4653=y +CONFIG_SENSOR_OV_OS04A10=y CONFIG_UBOOT_2021_10=y CONFIG_KERNEL_SRC_5.10=y CONFIG_KERNEL_UNCOMPRESSED=y # CONFIG_SKIP_RAMDISK is not set CONFIG_SENSOR_TUNING_PARAM_cv181x_src_gcore_gc4653=y +# CONFIG_SENSOR_TUNING_PARAM_sg200x_src_ov_os04a10=y # CONFIG_ROOTFS_OVERLAYFS is not set CONFIG_ENABLE_FREERTOS=y # CONFIG_TARGET_PACKAGE_GATORD is not set diff --git a/buildroot/configs/cvitek_SG200X_musl_riscv64_defconfig b/buildroot/configs/cvitek_SG200X_musl_riscv64_defconfig index f234160b6a..5c9d1c98db 100644 --- a/buildroot/configs/cvitek_SG200X_musl_riscv64_defconfig +++ b/buildroot/configs/cvitek_SG200X_musl_riscv64_defconfig @@ -139,6 +139,7 @@ BR2_PACKAGE_ALSA_UTILS=y BR2_PACKAGE_ALSA_UTILS_ALSACTL=y BR2_PACKAGE_ALSA_UTILS_ALSAMIXER=y BR2_PACKAGE_ALSA_UTILS_APLAY=y +BR2_PACKAGE_ALSA_UTILS_AMIXER=y BR2_PACKAGE_MPG123=y BR2_PACKAGE_BZIP2=y BR2_PACKAGE_LRZIP=y diff --git a/middleware/v2/component/isp/sensor/cv182x/ov_os04a10/os04a10_cmos_param.h b/middleware/v2/component/isp/sensor/cv182x/ov_os04a10/os04a10_cmos_param.h index a06e5e52ff..fc6986893e 100644 --- a/middleware/v2/component/isp/sensor/cv182x/ov_os04a10/os04a10_cmos_param.h +++ b/middleware/v2/component/isp/sensor/cv182x/ov_os04a10/os04a10_cmos_param.h @@ -213,7 +213,7 @@ struct combo_dev_attr_s os04a10_rx_attr = { .mac_clk = RX_MAC_CLK_400M, .mipi_attr = { .raw_data_type = RAW_DATA_12BIT, - .lane_id = {0, 1, 2, 3, 4}, + .lane_id = {2, 1, 3, 0, 4}, .wdr_mode = CVI_MIPI_WDR_MODE_VC, .dphy = { .enable = 1, diff --git a/middleware/v2/sample/common/sample_common_sensor.c b/middleware/v2/sample/common/sample_common_sensor.c index 11a993c636..2d105389e8 100644 --- a/middleware/v2/sample/common/sample_common_sensor.c +++ b/middleware/v2/sample/common/sample_common_sensor.c @@ -886,6 +886,9 @@ CVI_S32 SAMPLE_COMM_SNS_GetDevAttr(SAMPLE_SNS_TYPE_E enSnsType, VI_DEV_ATTR_S *p case GCORE_GC1084_SLAVE_MIPI_1M_30FPS_10BIT: case GCORE_GC4653_MIPI_4M_30FPS_10BIT: case GCORE_GC4653_SLAVE_MIPI_4M_30FPS_10BIT: + // omnivision + case OV_OS04A10_MIPI_4M_1440P_30FPS_12BIT: + case OV_OS04A10_MIPI_4M_1440P_30FPS_10BIT_WDR2TO1: case TECHPOINT_TP2850_MIPI_2M_30FPS_8BIT: case TECHPOINT_TP2850_MIPI_4M_30FPS_8BIT: pstViDevAttr->enBayerFormat = BAYER_FORMAT_GR; @@ -1122,6 +1125,9 @@ CVI_S32 SAMPLE_COMM_SNS_GetIspAttrBySns(SAMPLE_SNS_TYPE_E enSnsType, ISP_PUB_ATT case GCORE_GC1084_SLAVE_MIPI_1M_30FPS_10BIT: case GCORE_GC4653_MIPI_4M_30FPS_10BIT: case GCORE_GC4653_SLAVE_MIPI_4M_30FPS_10BIT: + // omnivision + case OV_OS04A10_MIPI_4M_1440P_30FPS_12BIT: + case OV_OS04A10_MIPI_4M_1440P_30FPS_10BIT_WDR2TO1: case TECHPOINT_TP2850_MIPI_2M_30FPS_8BIT: case TECHPOINT_TP2850_MIPI_4M_30FPS_8BIT: // on licheervnano