Merge branch 'backport/h264_regdma_retention_v6.0' into 'release/v6.0'

feat(esp32p4): add H264 REGDMA link and sleep retention module

See merge request espressif/esp-idf!48375
This commit is contained in:
morris
2026-05-14 11:57:50 +08:00
5 changed files with 14 additions and 0 deletions
@@ -1943,6 +1943,10 @@ config SOC_JPEG_ENCODE_SUPPORTED
bool
default y
config SOC_H264_ENCODER_SUPPORTED
bool
default y
config SOC_LCDCAM_CAM_SUPPORT_RGB_YUV_CONV
bool
default y
@@ -63,6 +63,7 @@ typedef enum periph_retention_module {
SLEEP_RETENTION_MODULE_EMAC = 37,
SLEEP_RETENTION_MODULE_JPEG = 38,
SLEEP_RETENTION_MODULE_LCDCAM = 39,
SLEEP_RETENTION_MODULE_H264 = 40,
SLEEP_RETENTION_MODULE_MAX = SOC_PM_RETENTION_MODULE_NUM - 1
} periph_retention_module_t;
@@ -107,6 +108,7 @@ typedef enum periph_retention_module {
: ((m) == SLEEP_RETENTION_MODULE_SDM0) ? true \
: ((m) == SLEEP_RETENTION_MODULE_LCDCAM) ? true \
: ((m) == SLEEP_RETENTION_MODULE_JPEG) ? true \
: ((m) == SLEEP_RETENTION_MODULE_H264) ? true \
: false)
#ifdef __cplusplus
@@ -746,6 +746,9 @@
#define SOC_JPEG_DECODE_SUPPORTED (1)
#define SOC_JPEG_ENCODE_SUPPORTED (1)
/*--------------------------- H264 --------------------------------*/
#define SOC_H264_ENCODER_SUPPORTED (1)
/*--------------------------- CAM ---------------------------------*/
#define SOC_LCDCAM_CAM_SUPPORT_RGB_YUV_CONV (1)
+2
View File
@@ -68,6 +68,7 @@ extern "C" {
#define REGDMA_EMAC_LINK(_pri) ((0x27 << 8) | _pri)
#define REGDMA_JPEG_LINK(_pri) ((0x28 << 8) | _pri)
#define REGDMA_LCDCAM_LINK(_pri) ((0x29 << 8) | _pri)
#define REGDMA_H264_LINK(_pri) ((0x2a << 8) | _pri)
#define REGDMA_MODEM_FE_LINK(_pri) ((0xFF << 8) | _pri)
@@ -98,6 +99,7 @@ extern "C" {
#define REGDMA_LINK_PRI_EMAC REGDMA_LINK_PRI_GENERAL_PERIPH
#define REGDMA_LINK_PRI_LCDCAM REGDMA_LINK_PRI_GENERAL_PERIPH
#define REGDMA_LINK_PRI_JPEG REGDMA_LINK_PRI_GENERAL_PERIPH
#define REGDMA_LINK_PRI_H264 REGDMA_LINK_PRI_GENERAL_PERIPH
typedef enum {
REGDMA_LINK_PRI_0 = 0,