From 114417d067404767bb5a6b5a898c4b901f7bf72e Mon Sep 17 00:00:00 2001 From: laokaiyao Date: Tue, 20 Jan 2026 10:37:55 +0800 Subject: [PATCH 1/2] docs(pms): fixed bitscrambler typo in pmu module --- .../lowpower/port/esp32p4/sleep_fpu_asm.S | 2 +- .../register/hw_ver1/soc/hp_peri_pms_struct.h | 10 +++++----- .../hw_ver1/soc/lp2hp_peri_pms_struct.h | 4 ++-- .../register/hw_ver3/soc/hp_peri_pms_struct.h | 18 +++++++++--------- .../hw_ver3/soc/lp2hp_peri_pms_struct.h | 4 ++-- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/components/esp_hw_support/lowpower/port/esp32p4/sleep_fpu_asm.S b/components/esp_hw_support/lowpower/port/esp32p4/sleep_fpu_asm.S index ba6ee1be35b..f7567aed5c9 100644 --- a/components/esp_hw_support/lowpower/port/esp32p4/sleep_fpu_asm.S +++ b/components/esp_hw_support/lowpower/port/esp32p4/sleep_fpu_asm.S @@ -8,7 +8,7 @@ #include "freertos/FreeRTOSConfig.h" #include "sdkconfig.h" - .section .tcm.text,"ax" + .section .spm.text,"ax" .global rv_core_fpu_save .type rv_core_fpu_save,@function .align 4 diff --git a/components/soc/esp32p4/register/hw_ver1/soc/hp_peri_pms_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/hp_peri_pms_struct.h index 019fc29ecdf..f36fb74db0e 100644 --- a/components/soc/esp32p4/register/hw_ver1/soc/hp_peri_pms_struct.h +++ b/components/soc/esp32p4/register/hw_ver1/soc/hp_peri_pms_struct.h @@ -1,5 +1,5 @@ /** - * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2025-2026 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -269,13 +269,13 @@ typedef union { * 1: Allowed */ uint32_t coren_mm_hp_rmt_allow:1; - /** coren_mm_hp_bitsrambler_allow : R/W; bitpos: [23]; default: 1; + /** coren_mm_hp_bitscrambler_allow : R/W; bitpos: [23]; default: 1; * Configures whether HP CPUn in machine mode has permission to access HP bit * scrambler. * 0: Not allowed * 1: Allowed */ - uint32_t coren_mm_hp_bitsrambler_allow:1; + uint32_t coren_mm_hp_bitscrambler_allow:1; /** coren_mm_hp_axi_icm_allow : R/W; bitpos: [24]; default: 1; * Configures whether HP CPUn in machine mode has permission to access HP AXI ICM. * 0: Not allowed @@ -773,12 +773,12 @@ typedef union { * 1: Allowed */ uint32_t coren_um_hp_rmt_allow:1; - /** coren_um_hp_bitsrambler_allow : R/W; bitpos: [23]; default: 1; + /** coren_um_hp_bitscrambler_allow : R/W; bitpos: [23]; default: 1; * Configures whether HP CPUn in user mode has permission to access HP bit scrambler. * 0: Not allowed * 1: Allowed */ - uint32_t coren_um_hp_bitsrambler_allow:1; + uint32_t coren_um_hp_bitscrambler_allow:1; /** coren_um_hp_axi_icm_allow : R/W; bitpos: [24]; default: 1; * Configures whether HP CPUn in user mode has permission to access HP AXI ICM. * 0: Not allowed diff --git a/components/soc/esp32p4/register/hw_ver1/soc/lp2hp_peri_pms_struct.h b/components/soc/esp32p4/register/hw_ver1/soc/lp2hp_peri_pms_struct.h index f382af778b4..0e56760b8ff 100644 --- a/components/soc/esp32p4/register/hw_ver1/soc/lp2hp_peri_pms_struct.h +++ b/components/soc/esp32p4/register/hw_ver1/soc/lp2hp_peri_pms_struct.h @@ -269,13 +269,13 @@ typedef union { * 1: Allowed */ uint32_t lp_mm_hp_rmt_allow:1; - /** lp_mm_hp_bitsrambler_allow : R/W; bitpos: [23]; default: 1; + /** lp_mm_hp_bitscrambler_allow : R/W; bitpos: [23]; default: 1; * Configures whether the LP CPU in machine mode has permission to access HP bit * scrambler. * 0: Not allowed * 1: Allowed */ - uint32_t lp_mm_hp_bitsrambler_allow:1; + uint32_t lp_mm_hp_bitscrambler_allow:1; /** lp_mm_hp_axi_icm_allow : R/W; bitpos: [24]; default: 1; * Configures whether the LP CPU in machine mode has permission to access HP AXI ICM. * 0: Not allowed diff --git a/components/soc/esp32p4/register/hw_ver3/soc/hp_peri_pms_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/hp_peri_pms_struct.h index 64ad594c4cb..ec2d98df624 100644 --- a/components/soc/esp32p4/register/hw_ver3/soc/hp_peri_pms_struct.h +++ b/components/soc/esp32p4/register/hw_ver3/soc/hp_peri_pms_struct.h @@ -1,5 +1,5 @@ /** - * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2025-2026 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -192,10 +192,10 @@ typedef union { * NA */ uint32_t reg_core0_mm_hp_rmt_allow:1; - /** reg_core0_mm_hp_bitsrambler_allow : R/W; bitpos: [23]; default: 1; + /** reg_core0_mm_hp_bitscrambler_allow : R/W; bitpos: [23]; default: 1; * NA */ - uint32_t reg_core0_mm_hp_bitsrambler_allow:1; + uint32_t reg_core0_mm_hp_bitscrambler_allow:1; /** reg_core0_mm_hp_axi_icm_allow : R/W; bitpos: [24]; default: 1; * NA */ @@ -542,10 +542,10 @@ typedef union { * NA */ uint32_t reg_core0_um_hp_rmt_allow:1; - /** reg_core0_um_hp_bitsrambler_allow : R/W; bitpos: [23]; default: 1; + /** reg_core0_um_hp_bitscrambler_allow : R/W; bitpos: [23]; default: 1; * NA */ - uint32_t reg_core0_um_hp_bitsrambler_allow:1; + uint32_t reg_core0_um_hp_bitscrambler_allow:1; /** reg_core0_um_hp_axi_icm_allow : R/W; bitpos: [24]; default: 1; * NA */ @@ -892,10 +892,10 @@ typedef union { * NA */ uint32_t reg_core1_mm_hp_rmt_allow:1; - /** reg_core1_mm_hp_bitsrambler_allow : R/W; bitpos: [23]; default: 1; + /** reg_core1_mm_hp_bitscrambler_allow : R/W; bitpos: [23]; default: 1; * NA */ - uint32_t reg_core1_mm_hp_bitsrambler_allow:1; + uint32_t reg_core1_mm_hp_bitscrambler_allow:1; /** reg_core1_mm_hp_axi_icm_allow : R/W; bitpos: [24]; default: 1; * NA */ @@ -1242,10 +1242,10 @@ typedef union { * NA */ uint32_t reg_core1_um_hp_rmt_allow:1; - /** reg_core1_um_hp_bitsrambler_allow : R/W; bitpos: [23]; default: 1; + /** reg_core1_um_hp_bitscrambler_allow : R/W; bitpos: [23]; default: 1; * NA */ - uint32_t reg_core1_um_hp_bitsrambler_allow:1; + uint32_t reg_core1_um_hp_bitscrambler_allow:1; /** reg_core1_um_hp_axi_icm_allow : R/W; bitpos: [24]; default: 1; * NA */ diff --git a/components/soc/esp32p4/register/hw_ver3/soc/lp2hp_peri_pms_struct.h b/components/soc/esp32p4/register/hw_ver3/soc/lp2hp_peri_pms_struct.h index 6fe0b0dc70a..feedef598d9 100644 --- a/components/soc/esp32p4/register/hw_ver3/soc/lp2hp_peri_pms_struct.h +++ b/components/soc/esp32p4/register/hw_ver3/soc/lp2hp_peri_pms_struct.h @@ -192,10 +192,10 @@ typedef union { * NA */ uint32_t reg_lp_mm_hp_rmt_allow:1; - /** reg_lp_mm_hp_bitsrambler_allow : R/W; bitpos: [23]; default: 1; + /** reg_lp_mm_hp_bitscrambler_allow : R/W; bitpos: [23]; default: 1; * NA */ - uint32_t reg_lp_mm_hp_bitsrambler_allow:1; + uint32_t reg_lp_mm_hp_bitscrambler_allow:1; /** reg_lp_mm_hp_axi_icm_allow : R/W; bitpos: [24]; default: 1; * NA */ From ee45f289f4d54bcb1a0401e022bc14faa0607059 Mon Sep 17 00:00:00 2001 From: wanckl Date: Tue, 16 Dec 2025 20:24:34 +0800 Subject: [PATCH 2/2] test(esp_cam_sensor): fixed cam_spi_slave build errors --- components/esp_driver_cam/test_apps/csi/main/idf_component.yml | 1 - components/esp_driver_cam/test_apps/csi/sdkconfig.defaults | 1 + components/esp_driver_cam/test_apps/dvp/sdkconfig.defaults | 1 + examples/peripherals/camera/dvp_dsi/sdkconfig.defaults | 1 + examples/peripherals/camera/dvp_isp_dsi/sdkconfig.defaults | 1 + examples/peripherals/camera/dvp_spi_lcd/sdkconfig.defaults | 1 + examples/peripherals/camera/mipi_isp_dsi/sdkconfig.defaults | 1 + examples/peripherals/isp/multi_pipelines/main/idf_component.yml | 1 - examples/peripherals/isp/multi_pipelines/sdkconfig.defaults | 1 + 9 files changed, 7 insertions(+), 2 deletions(-) diff --git a/components/esp_driver_cam/test_apps/csi/main/idf_component.yml b/components/esp_driver_cam/test_apps/csi/main/idf_component.yml index 06820194d6b..4cd68977191 100644 --- a/components/esp_driver_cam/test_apps/csi/main/idf_component.yml +++ b/components/esp_driver_cam/test_apps/csi/main/idf_component.yml @@ -1,4 +1,3 @@ dependencies: - espressif/esp_cam_sensor: ">=0.5.*" sensor_init: path: ${IDF_PATH}/examples/peripherals/camera/common_components/sensor_init diff --git a/components/esp_driver_cam/test_apps/csi/sdkconfig.defaults b/components/esp_driver_cam/test_apps/csi/sdkconfig.defaults index fa8ac618b94..ce651ce8a5b 100644 --- a/components/esp_driver_cam/test_apps/csi/sdkconfig.defaults +++ b/components/esp_driver_cam/test_apps/csi/sdkconfig.defaults @@ -1,2 +1,3 @@ CONFIG_FREERTOS_HZ=1000 CONFIG_ESP_TASK_WDT_EN=n +CONFIG_CAM_CTRL_SPI_ENABLE=n diff --git a/components/esp_driver_cam/test_apps/dvp/sdkconfig.defaults b/components/esp_driver_cam/test_apps/dvp/sdkconfig.defaults index 87397fa9453..a36f590a5fb 100644 --- a/components/esp_driver_cam/test_apps/dvp/sdkconfig.defaults +++ b/components/esp_driver_cam/test_apps/dvp/sdkconfig.defaults @@ -2,3 +2,4 @@ # Espressif IoT Development Framework (ESP-IDF) 5.4.0 Project Minimal Configuration # CONFIG_ESP_TASK_WDT_EN=n +CONFIG_CAM_CTRL_SPI_ENABLE=n diff --git a/examples/peripherals/camera/dvp_dsi/sdkconfig.defaults b/examples/peripherals/camera/dvp_dsi/sdkconfig.defaults index dc0f8f7a839..bc0080e2fe6 100644 --- a/examples/peripherals/camera/dvp_dsi/sdkconfig.defaults +++ b/examples/peripherals/camera/dvp_dsi/sdkconfig.defaults @@ -1 +1,2 @@ CONFIG_CAMERA_OV2640=y +CONFIG_CAM_CTRL_SPI_ENABLE=n diff --git a/examples/peripherals/camera/dvp_isp_dsi/sdkconfig.defaults b/examples/peripherals/camera/dvp_isp_dsi/sdkconfig.defaults index 0204a38fcf8..9bb229096cb 100644 --- a/examples/peripherals/camera/dvp_isp_dsi/sdkconfig.defaults +++ b/examples/peripherals/camera/dvp_isp_dsi/sdkconfig.defaults @@ -1,3 +1,4 @@ CONFIG_CAMERA_OV2640=y CONFIG_CAMERA_SC030IOT=y CONFIG_EXAMPLE_MIPI_DSI_DISP_USE_DMA2D=y +CONFIG_CAM_CTRL_SPI_ENABLE=n diff --git a/examples/peripherals/camera/dvp_spi_lcd/sdkconfig.defaults b/examples/peripherals/camera/dvp_spi_lcd/sdkconfig.defaults index dc0f8f7a839..bc0080e2fe6 100644 --- a/examples/peripherals/camera/dvp_spi_lcd/sdkconfig.defaults +++ b/examples/peripherals/camera/dvp_spi_lcd/sdkconfig.defaults @@ -1 +1,2 @@ CONFIG_CAMERA_OV2640=y +CONFIG_CAM_CTRL_SPI_ENABLE=n diff --git a/examples/peripherals/camera/mipi_isp_dsi/sdkconfig.defaults b/examples/peripherals/camera/mipi_isp_dsi/sdkconfig.defaults index 2a44a906d86..ca810641071 100644 --- a/examples/peripherals/camera/mipi_isp_dsi/sdkconfig.defaults +++ b/examples/peripherals/camera/mipi_isp_dsi/sdkconfig.defaults @@ -1,2 +1,3 @@ CONFIG_CAMERA_SC2336=y CONFIG_CAMERA_OV5647=y +CONFIG_CAM_CTRL_SPI_ENABLE=n diff --git a/examples/peripherals/isp/multi_pipelines/main/idf_component.yml b/examples/peripherals/isp/multi_pipelines/main/idf_component.yml index 3081b5cd829..c246d72ab1c 100644 --- a/examples/peripherals/isp/multi_pipelines/main/idf_component.yml +++ b/examples/peripherals/isp/multi_pipelines/main/idf_component.yml @@ -1,5 +1,4 @@ dependencies: - espressif/esp_cam_sensor: ">=0.5.*" idf: version: ">=5.3.0" isp_af_schemes: diff --git a/examples/peripherals/isp/multi_pipelines/sdkconfig.defaults b/examples/peripherals/isp/multi_pipelines/sdkconfig.defaults index ca5a4e969bd..cad614b043f 100644 --- a/examples/peripherals/isp/multi_pipelines/sdkconfig.defaults +++ b/examples/peripherals/isp/multi_pipelines/sdkconfig.defaults @@ -4,3 +4,4 @@ CONFIG_SPIRAM_SPEED_200M=y CONFIG_CAMERA_SC2336=y CONFIG_CAMERA_OV5647=y CONFIG_CAMERA_OV5647_ENABLE_MOTOR_BY_GPIO0=y +CONFIG_CAM_CTRL_SPI_ENABLE=n