Equate fieldset names

CHANGELOG.md

@@ -14,6 +14,22 @@ such fields.
 Fix the FlexIO timer and shifter counts from four to eight, permitting access
 to all available components.
 
+**BREAKING** Rename LPI2C.SIER field "AM1F" to "AM1IE".
+
+**BREAKING** Rename SRC.SRSR field "LOCKUP" to "LOCKUP_SYSRESETREQ" for 1011,
+1015, and 1051 MCUs.
+
+**BREAKING** Rename CCM.CS1CDR field "FLEXIO1" to "FLEXIO2" for the 1050 and
+1060 families.
+
+**BREAKING** Expose the "TRNG_ACC" field in TRNG.MCTL on the 1015, 1021 MCUs.
+
+**BREAKING** Rename IOMUXC_GPR.GPR26 field "GPIO_SEL" to "GPIO_MUX1_GPIO_SEL,"
+and correct the documentation.
+
+**BREAKING** Correct the name, documentation of the SNVS.LPCR field "LVD_EN" on
+the 1176.
+
 ## [0.5.0] 2022-12-27
 
 Add support for NXP's i.MX RT 1176 dual-core MCUs. An `"imxrt1176_cm7"` feature

raltool-cfg.yaml

@@ -150,3 +150,15 @@ transforms:
       block: ocotp::Ocotp
       from: HW_OCOTP_(.*)
       to: $1
+  # Field is needlessly named 'AM1F' on the 1176.
+  # All 1000-series use AM1IE. The field meaning
+  # is the same regardless, and this lets us combine
+  # the LPI2C blocks.
+  - RenameFields:
+      fieldset: lpi2c::regs::Sier
+      from: AM1F
+      to: AM1IE
+  - RenameFields:
+      fieldset: src::regs::Srsr
+      from: LOCKUP
+      to: LOCKUP_SYSRESETREQ

raltool/src/combine.rs

@@ -126,7 +126,8 @@ fn equivalent_fieldsets(
 
     a.bit_size == b.bit_size
         && equivalent_slices(&a.fields, &b.fields, |q, r| {
-            q.bit_offset == r.bit_offset
+            q.name == r.name
+                && q.bit_offset == r.bit_offset
                 && q.array == r.array
                 && q.bit_size == r.bit_size
                 && try_equivalent_enum(&q.enum_read, &r.enum_read)

src/blocks/imxrt1011/lpi2c.rs

@@ -1291,7 +1291,7 @@ pub mod SIER {
         }
     }
     #[doc = "Address Match 1 Interrupt Enable"]
-    pub mod AM1F {
+    pub mod AM1IE {
         pub const offset: u32 = 13;
         pub const mask: u32 = 0x01 << offset;
         pub mod R {}

src/blocks/imxrt1011/src.rs

@@ -163,7 +163,7 @@ pub mod SRSR {
         }
     }
     #[doc = "Indicates a reset has been caused by CPU lockup."]
-    pub mod LOCKUP {
+    pub mod LOCKUP_SYSRESETREQ {
         pub const offset: u32 = 1;
         pub const mask: u32 = 0x01 << offset;
         pub mod R {}

src/blocks/imxrt1015/src.rs

@@ -163,7 +163,7 @@ pub mod SRSR {
         }
     }
     #[doc = "Indicates a reset has been caused by CPU lockup."]
-    pub mod LOCKUP {
+    pub mod LOCKUP_SYSRESETREQ {
         pub const offset: u32 = 1;
         pub const mask: u32 = 0x01 << offset;
         pub mod R {}