Merge pull request #130 from chemicstry/sdio_fix2

Unify SDMMC v1 and v2 register names

data/registers/sdmmc_v1.yaml

@@ -10,79 +10,67 @@ block/SDMMC:
       description: SDI clock control register
       byte_offset: 4
       fieldset: CLKCR
-    - name: ARG
+    - name: ARGR
       description: argument register
       byte_offset: 8
-      fieldset: ARG
+      fieldset: ARGR
-    - name: CMD
+    - name: CMDR
       description: command register
       byte_offset: 12
-      fieldset: CMD
+      fieldset: CMDR
-    - name: RESPCMD
+    - name: RESPCMDR
       description: command response register
       byte_offset: 16
       access: Read
-      fieldset: RESPCMD
+      fieldset: RESPCMDR
-    - name: RESP1
+    - name: RESPR
       description: response 1..4 register
+      array:
+        len: 4
+        stride: 4
       byte_offset: 20
       access: Read
-      fieldset: RESP1
+      fieldset: RESP1R
-    - name: RESP2
-      description: response 1..4 register
-      byte_offset: 24
-      access: Read
-      fieldset: RESP2
-    - name: RESP3
-      description: response 1..4 register
-      byte_offset: 28
-      access: Read
-      fieldset: RESP3
-    - name: RESP4
-      description: response 1..4 register
-      byte_offset: 32
-      access: Read
-      fieldset: RESP4
     - name: DTIMER
       description: data timer register
       byte_offset: 36
       fieldset: DTIMER
-    - name: DLEN
+    - name: DLENR
       description: data length register
       byte_offset: 40
-      fieldset: DLEN
+      fieldset: DLENR
     - name: DCTRL
       description: data control register
       byte_offset: 44
       fieldset: DCTRL
-    - name: DCOUNT
+    - name: DCNTR
       description: data counter register
       byte_offset: 48
       access: Read
-      fieldset: DCOUNT
+      fieldset: DCNTR
-    - name: STA
+    - name: STAR
       description: status register
       byte_offset: 52
       access: Read
-      fieldset: STA
+      fieldset: STAR
     - name: ICR
       description: interrupt clear register
       byte_offset: 56
       fieldset: ICR
-    - name: MASK
+    - name: MASKR
       description: mask register
       byte_offset: 60
-      fieldset: MASK
+      fieldset: MASKR
     - name: FIFOCNT
       description: FIFO counter register
       byte_offset: 72
       access: Read
       fieldset: FIFOCNT
-    - name: FIFO
+    - name: FIFOR
       description: data FIFO register
       byte_offset: 128
-      fieldset: FIFO
+      fieldset: FIFOR
-fieldset/ARG:
+fieldset/ARGR:
   description: argument register
   fields:
     - name: CMDARG
@@ -120,7 +108,7 @@ fieldset/CLKCR:
       description: HW Flow Control enable
       bit_offset: 14
       bit_size: 1
-fieldset/CMD:
+fieldset/CMDR:
   description: command register
   fields:
     - name: CMDINDEX
@@ -147,7 +135,7 @@ fieldset/CMD:
       description: SD I/O suspend command
       bit_offset: 11
       bit_size: 1
-fieldset/DCOUNT:
+fieldset/DCNTR:
   description: data counter register
   fields:
     - name: DATACOUNT
@@ -193,7 +181,7 @@ fieldset/DCTRL:
       description: SD I/O enable functions
       bit_offset: 11
       bit_size: 1
-fieldset/DLEN:
+fieldset/DLENR:
   description: data length register
   fields:
     - name: DATALENGTH
@@ -207,7 +195,7 @@ fieldset/DTIMER:
       description: Data timeout period
       bit_offset: 0
       bit_size: 32
-fieldset/FIFO:
+fieldset/FIFOR:
   description: data FIFO register
   fields:
     - name: FIFOData
@@ -268,7 +256,7 @@ fieldset/ICR:
       description: SDIOIT flag clear bit
       bit_offset: 22
       bit_size: 1
-fieldset/MASK:
+fieldset/MASKR:
   description: mask register
   fields:
     - name: CCRCFAILIE
@@ -366,54 +354,42 @@ fieldset/POWER:
       description: PWRCTRL
       bit_offset: 0
       bit_size: 2
-fieldset/RESP1:
+fieldset/RESP1R:
   description: response 1..4 register
   fields:
     - name: CARDSTATUS
       description: see Table 132
       bit_offset: 0
       bit_size: 32
-      array:
+fieldset/RESP2R:
-        len: 1
-        stride: 0
-fieldset/RESP2:
   description: response 1..4 register
   fields:
     - name: CARDSTATUS
       description: see Table 132
       bit_offset: 0
       bit_size: 32
-      array:
+fieldset/RESP3R:
-        len: 1
-        stride: 0
-fieldset/RESP3:
   description: response 1..4 register
   fields:
     - name: CARDSTATUS
       description: see Table 132
       bit_offset: 0
       bit_size: 32
-      array:
+fieldset/RESP4R:
-        len: 1
-        stride: 0
-fieldset/RESP4:
   description: response 1..4 register
   fields:
     - name: CARDSTATUS
       description: see Table 132
       bit_offset: 0
       bit_size: 32
-      array:
+fieldset/RESPCMDR:
-        len: 1
-        stride: 0
-fieldset/RESPCMD:
   description: command response register
   fields:
     - name: RESPCMD
       description: Response command index
       bit_offset: 0
       bit_size: 6
-fieldset/STA:
+fieldset/STAR:
   description: status register
   fields:
     - name: CCRCFAIL

data/registers/sdmmc_v2.yaml

@@ -505,28 +505,28 @@ fieldset/POWER:
 fieldset/RESP1R:
   description: "The SDMMC_RESP1/2/3/4R registers contain the status of a card, which is part of the received response."
   fields:
-    - name: CARDSTATUS1
+    - name: CARDSTATUS
       description: see Table 432
       bit_offset: 0
       bit_size: 32
 fieldset/RESP2R:
   description: "The SDMMC_RESP1/2/3/4R registers contain the status of a card, which is part of the received response."
   fields:
-    - name: CARDSTATUS2
+    - name: CARDSTATUS
       description: see Table404.
       bit_offset: 0
       bit_size: 32
 fieldset/RESP3R:
   description: "The SDMMC_RESP1/2/3/4R registers contain the status of a card, which is part of the received response."
   fields:
-    - name: CARDSTATUS3
+    - name: CARDSTATUS
       description: see Table404.
       bit_offset: 0
       bit_size: 32
 fieldset/RESP4R:
   description: "The SDMMC_RESP1/2/3/4R registers contain the status of a card, which is part of the received response."
   fields:
-    - name: CARDSTATUS4
+    - name: CARDSTATUS
       description: see Table404.
       bit_offset: 0
       bit_size: 32

stm32data/__main__.py

@@ -153,6 +153,7 @@ perimap = [
     ('.*:RTC:rtc2_v2_6', ('rtc', 'v2', 'RTC')),
     ('.*:RTC:rtc2_v2_WB', ('rtc', 'wb', 'RTC')),
     ('.*:SAI:sai1_v1_1', ('sai', 'v1', 'SAI')),
+    ('.*:SDIO:sdmmc_v1_2', ('sdmmc', 'v1', 'SDMMC')),
     ('.*:SDMMC:sdmmc_v1_3', ('sdmmc', 'v1', 'SDMMC')),
     ('.*:SPDIFRX:spdifrx1_v1_0', ('spdifrx', 'v1', 'SPDIFRX')),
     ('.*:USB_OTG_FS:otgfs1_v1_2', ('otgfs', 'v1', 'OTG_FS')),