alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-09-21 06:56:11 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'fix/rng_register_prefix_discrepency_newer_targets_v5.2' into 'release/v5.2'

Browse Source 
Fix: RNG register prefix discrepancy for ESP32C6 and ESP32H2 (v5.2)

See merge request espressif/esp-idf!27683
This commit is contained in:
Jiang Jiang Jian 2023-12-07 10:46:15 +08:00
commit 968b15d380
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/soc/esp32c6/include/soc/lpperi_reg.h
View File

@ -1,5 +1,5 @@
/** /**
* SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@ -137,13 +137,13 @@ extern "C" {
* need_des * need_des
*/ */
#define LPPERI_RNG_DATA_REG (DR_REG_LPPERI_BASE + 0x8) #define LPPERI_RNG_DATA_REG (DR_REG_LPPERI_BASE + 0x8)
/** LPPERI_RND_DATA : RO; bitpos: [31:0]; default: 0; /** LPPERI_RNG_DATA : RO; bitpos: [31:0]; default: 0;
* need_des * need_des
*/ */
#define LPPERI_RND_DATA 0xFFFFFFFFU #define LPPERI_RNG_DATA 0xFFFFFFFFU
#define LPPERI_RND_DATA_M (LPPERI_RND_DATA_V << LPPERI_RND_DATA_S) #define LPPERI_RNG_DATA_M (LPPERI_RNG_DATA_V << LPPERI_RNG_DATA_S)
#define LPPERI_RND_DATA_V 0xFFFFFFFFU #define LPPERI_RNG_DATA_V 0xFFFFFFFFU
#define LPPERI_RND_DATA_S 0 #define LPPERI_RNG_DATA_S 0
/** LPPERI_CPU_REG register /** LPPERI_CPU_REG register
* need_des * need_des

6
components/soc/esp32c6/include/soc/lpperi_struct.h
View File

@ -1,5 +1,5 @@
/** /**
* SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@ -101,10 +101,10 @@ typedef union {
*/ */
typedef union { typedef union {
struct { struct {
/** rnd_data : RO; bitpos: [31:0]; default: 0; /** rng_data : RO; bitpos: [31:0]; default: 0;
* need_des * need_des
*/ */
uint32_t rnd_data:32; uint32_t rng_data:32;
}; };
uint32_t val; uint32_t val;
} lpperi_rng_data_reg_t; } lpperi_rng_data_reg_t;

12
components/soc/esp32h2/include/soc/lpperi_reg.h
View File

@ -1,5 +1,5 @@
/** /**
* SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@ -144,13 +144,13 @@ extern "C" {
* need_des * need_des
*/ */
#define LPPERI_RNG_DATA_REG (DR_REG_LPPERI_BASE + 0x8) #define LPPERI_RNG_DATA_REG (DR_REG_LPPERI_BASE + 0x8)
/** LPPERI_RND_DATA : RO; bitpos: [31:0]; default: 0; /** LPPERI_RNG_DATA : RO; bitpos: [31:0]; default: 0;
* need_des * need_des
*/ */
#define LPPERI_RND_DATA 0xFFFFFFFFU #define LPPERI_RNG_DATA 0xFFFFFFFFU
#define LPPERI_RND_DATA_M (LPPERI_RND_DATA_V << LPPERI_RND_DATA_S) #define LPPERI_RND_GATA_M (LPPERI_RND_GATA_V << LPPERI_RND_GATA_S)
#define LPPERI_RND_DATA_V 0xFFFFFFFFU #define LPPERI_RND_GATA_V 0xFFFFFFFFU
#define LPPERI_RND_DATA_S 0 #define LPPERI_RND_GATA_S 0
/** LPPERI_CPU_REG register /** LPPERI_CPU_REG register
* need_des * need_des

6
components/soc/esp32h2/include/soc/lpperi_struct.h
View File

@ -1,5 +1,5 @@
/** /**
* SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@ -104,10 +104,10 @@ typedef union {
*/ */
typedef union { typedef union {
struct { struct {
/** rnd_data : RO; bitpos: [31:0]; default: 0; /** rng_data : RO; bitpos: [31:0]; default: 0;
* need_des * need_des
*/ */
uint32_t rnd_data:32; uint32_t rng_data:32;
}; };
uint32_t val; uint32_t val;
} lpperi_rng_data_reg_t; } lpperi_rng_data_reg_t;