From ac3b6c20545b88e7b65c63f6e4a6d919c6d224c5 Mon Sep 17 00:00:00 2001
From: eZio Pan <eziopan@qq.com>
Date: Sat, 24 Feb 2024 17:05:04 +0800
Subject: [PATCH] split `FMC` into `NOR_PSRAM`, `NAND` and `SDRAM`

---
 data/registers/fmc_v4.yaml | 63 +++++++++++++++++++++++---------------
 transforms/FMC.yaml        | 21 +++++++++++++
 2 files changed, 60 insertions(+), 24 deletions(-)

diff --git a/data/registers/fmc_v4.yaml b/data/registers/fmc_v4.yaml
index 93fbf98..d22ce49 100644
--- a/data/registers/fmc_v4.yaml
+++ b/data/registers/fmc_v4.yaml
@@ -1,5 +1,37 @@
 block/FMC:
   description: Flexible memory controller.
+  items:
+  - name: NOR_PSRAM
+    byte_offset: 0
+    block: NOR_PSRAM
+  - name: NAND
+    byte_offset: 128
+    block: NAND
+  - name: SDRAM
+    byte_offset: 320
+    block: SDRAM
+block/NAND:
+  items:
+  - name: PCR
+    description: NAND Flash control registers.
+    byte_offset: 0
+    fieldset: PCR
+  - name: SR
+    description: FIFO status and interrupt register.
+    byte_offset: 4
+    fieldset: SR
+  - name: PMEM
+    description: Common memory space timing register.
+    byte_offset: 8
+    fieldset: PMEM
+  - name: PATT
+    description: Attribute memory space timing register.
+    byte_offset: 12
+    fieldset: PATT
+  - name: ECCR
+    description: ECC result registers.
+    byte_offset: 20
+block/NOR_PSRAM:
   items:
   - name: BCR1
     description: SRAM/NOR-Flash chip-select control register for bank 1.
@@ -23,25 +55,6 @@ block/FMC:
     description: PSRAM chip select counter register.
     byte_offset: 32
     fieldset: PCSCNTR
-  - name: PCR
-    description: NAND Flash control registers.
-    byte_offset: 128
-    fieldset: PCR
-  - name: SR
-    description: FIFO status and interrupt register.
-    byte_offset: 132
-    fieldset: SR
-  - name: PMEM
-    description: Common memory space timing register.
-    byte_offset: 136
-    fieldset: PMEM
-  - name: PATT
-    description: Attribute memory space timing register.
-    byte_offset: 140
-    fieldset: PATT
-  - name: ECCR
-    description: ECC result registers.
-    byte_offset: 148
   - name: BWTR
     description: SRAM/NOR-Flash write timing registers 1.
     array:
@@ -49,31 +62,33 @@ block/FMC:
       stride: 8
     byte_offset: 260
     fieldset: BWTR
+block/SDRAM:
+  items:
   - name: SDCR
     description: SDRAM control registers 1.
     array:
       len: 2
       stride: 4
-    byte_offset: 320
+    byte_offset: 0
     fieldset: SDCR
   - name: SDTR
     description: SDRAM timing registers 1.
     array:
       len: 2
       stride: 4
-    byte_offset: 328
+    byte_offset: 8
     fieldset: SDTR
   - name: SDCMR
     description: SDRAM Command Mode register.
-    byte_offset: 336
+    byte_offset: 16
     fieldset: SDCMR
   - name: SDRTR
     description: SDRAM refresh timer register.
-    byte_offset: 340
+    byte_offset: 20
     fieldset: SDRTR
   - name: SDSR
     description: SDRAM status register.
-    byte_offset: 344
+    byte_offset: 24
     fieldset: SDSR
 fieldset/BCR:
   description: SRAM/NOR-Flash chip-select control register for bank 4.
diff --git a/transforms/FMC.yaml b/transforms/FMC.yaml
index bc8f5da..23f71d7 100644
--- a/transforms/FMC.yaml
+++ b/transforms/FMC.yaml
@@ -19,3 +19,24 @@ transforms:
     blocks: FMC
     from: ^(BTR|BWTR|SDCR|SDTR)\d+$
     to: $1
+
+  - !MakeBlock
+    blocks: FMC
+    from: ^(BCR\d*|BW?TR\d*|PCSCNTR)$
+    to_outer: NOR_PSRAM
+    to_block: NOR_PSRAM
+    to_inner: $1
+
+  - !MakeBlock
+    blocks: FMC
+    from: ^(PCR|SR|PMEM|PATT|ECCR)$
+    to_outer: NAND
+    to_block: NAND
+    to_inner: $1
+
+  - !MakeBlock
+    blocks: FMC
+    from: ^(SDCR\d*|SDTR\d*|SDCMR|SDRTR|SDSR)$
+    to_outer: SDRAM
+    to_block: SDRAM
+    to_inner: $1