Merge branch 'fix/rng_register_prefix_discrepency_newer_targets_v5.1'…

… into 'release/v5.1' Fix: RNG register prefix discrepancy for ESP32C6 and ESP32H2 (v5.1) See merge request espressif/esp-idf!27684
espressif · Dec 8, 2023 · ca02c6d · ca02c6d
2 parents d52d82e + 6a990a3
commit ca02c6d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/components/soc/esp32c6/include/soc/lpperi_reg.h b/components/soc/esp32c6/include/soc/lpperi_reg.h
@@ -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
  */
@@ -137,13 +137,13 @@ extern "C" {
  *  need_des
  */
 #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
  */
-#define LPPERI_RND_DATA    0xFFFFFFFFU
-#define LPPERI_RND_DATA_M  (LPPERI_RND_DATA_V << LPPERI_RND_DATA_S)
-#define LPPERI_RND_DATA_V  0xFFFFFFFFU
-#define LPPERI_RND_DATA_S  0
+#define LPPERI_RNG_DATA    0xFFFFFFFFU
+#define LPPERI_RNG_DATA_M  (LPPERI_RNG_DATA_V << LPPERI_RNG_DATA_S)
+#define LPPERI_RNG_DATA_V  0xFFFFFFFFU
+#define LPPERI_RNG_DATA_S  0
 
 /** LPPERI_CPU_REG register
  *  need_des

diff --git a/components/soc/esp32c6/include/soc/lpperi_struct.h b/components/soc/esp32c6/include/soc/lpperi_struct.h
@@ -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
  */
@@ -101,10 +101,10 @@ typedef union {
  */
 typedef union {
     struct {
-        /** rnd_data : RO; bitpos: [31:0]; default: 0;
+        /** rng_data : RO; bitpos: [31:0]; default: 0;
          *  need_des
          */
-        uint32_t rnd_data:32;
+        uint32_t rng_data:32;
     };
     uint32_t val;
 } lpperi_rng_data_reg_t;

diff --git a/components/soc/esp32h2/include/soc/lpperi_reg.h b/components/soc/esp32h2/include/soc/lpperi_reg.h
@@ -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
  */
@@ -144,13 +144,13 @@ extern "C" {
  *  need_des
  */
 #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
  */
-#define LPPERI_RND_DATA    0xFFFFFFFFU
-#define LPPERI_RND_DATA_M  (LPPERI_RND_DATA_V << LPPERI_RND_DATA_S)
-#define LPPERI_RND_DATA_V  0xFFFFFFFFU
-#define LPPERI_RND_DATA_S  0
+#define LPPERI_RNG_DATA    0xFFFFFFFFU
+#define LPPERI_RNG_DATA_M  (LPPERI_RNG_DATA_V << LPPERI_RNG_DATA_S)
+#define LPPERI_RNG_DATA_V  0xFFFFFFFFU
+#define LPPERI_RNG_DATA_S  0
 
 /** LPPERI_CPU_REG register
  *  need_des

diff --git a/components/soc/esp32h2/include/soc/lpperi_struct.h b/components/soc/esp32h2/include/soc/lpperi_struct.h
@@ -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
  */
@@ -104,10 +104,10 @@ typedef union {
  */
 typedef union {
     struct {
-        /** rnd_data : RO; bitpos: [31:0]; default: 0;
+        /** rng_data : RO; bitpos: [31:0]; default: 0;
          *  need_des
          */
-        uint32_t rnd_data:32;
+        uint32_t rng_data:32;
     };
     uint32_t val;
 } lpperi_rng_data_reg_t;