Skip to content

Commit 90f1557

Browse files
burrbulladamgreig
burrbull
authored and
adamgreig
committed
sai
1 parent 4cbe55e commit 90f1557

38 files changed

+135
-65
lines changed

‎devices/common_patches/h7_sai.yaml

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,12 @@
11
"SAI*":
2-
ACR1:
2+
"?CR1":
33
_modify:
44
MCKDIV:
55
bitWidth: 6
6+
_delete:
7+
- NOMCK
68
_add:
79
NODIV:
810
description: No fixed divider between MCLK and FS
911
bitOffset: 19
1012
bitWidth: 1
11-
AFRCR:
12-
_modify:
13-
FSDEF:
14-
access: read-write
15-
BCR1:
16-
_modify:
17-
MCKDIV:
18-
bitWidth: 6
19-
_add:
20-
NODIV:
21-
description: No fixed divider between MCLK and FS
22-
bitOffset: 19
23-
bitWidth: 1
24-
BFRCR:
25-
_modify:
26-
FSDEF:
27-
access: read-write

‎devices/common_patches/h7_sai_mcken.yaml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
11
# Applies to H7 RM0399, RM0455, RM0468
22

33
"SAI*":
4-
ACR1:
5-
_delete:
6-
- NOMCK
7-
_add:
8-
MCKEN:
9-
description: Master clock generation enable
10-
bitOffset: 27
11-
bitWidth: 1
12-
BCR1:
13-
_delete:
14-
- NOMCK
4+
"?CR1":
155
_add:
166
MCKEN:
177
description: Master clock generation enable

‎devices/common_patches/sai/sai_v1.yaml

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,44 @@
11
"SAI,SAI?":
2+
_modify:
3+
"?SR":
4+
access: read-only
5+
resetValue: 8
6+
"?CLRFR":
7+
access: write-only
28
_cluster:
39
"CH%s":
410
"?CR1": {}
5-
"?CR2": {}
6-
"?FRCR": {}
11+
"?CR2":
12+
_modify:
13+
FTH:
14+
access: read-write
15+
FFLUS:
16+
access: write-only
17+
TRIS:
18+
access: read-write
19+
MUTE:
20+
access: read-write
21+
MUTEVAL:
22+
access: read-write
23+
MUTECN,MUTECNT:
24+
name: MUTECNT
25+
access: read-write
26+
CPL:
27+
access: read-write
28+
COMP:
29+
access: read-write
30+
"?FRCR":
31+
_modify:
32+
FRL:
33+
access: read-write
34+
FSALL:
35+
access: read-write
36+
FSDEF:
37+
access: read-only
38+
FSPOL:
39+
access: read-write
40+
FSOFF:
41+
access: read-write
742
"?SLOTR": {}
843
"?IM": {}
944
"?SR": {}

‎devices/common_patches/sai/sai_v2.yaml

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,48 @@
11
"SAI?":
22
_strip:
33
- SAI_
4+
_modify:
5+
"SAI_?CLRFR":
6+
access: write-only
7+
"SAI_?CR2":
8+
resetValue: 0
49
_cluster:
510
"CH%s":
611
"?CR1":
712
_modify:
813
SAIAEN:
914
name: SAIEN
10-
"?CR2": {}
11-
"?FRCR": {}
15+
"?CR2":
16+
_modify:
17+
FTH:
18+
access: read-write
19+
FFLUS:
20+
access: write-only
21+
TRIS:
22+
access: read-write
23+
MUTE:
24+
access: read-write
25+
MUTEVAL:
26+
access: read-write
27+
MUTECN,MUTECNT:
28+
name: MUTECNT
29+
access: read-write
30+
CPL:
31+
access: read-write
32+
COMP:
33+
access: read-write
34+
"?FRCR":
35+
_modify:
36+
FRL:
37+
access: read-write
38+
FSALL:
39+
access: read-write
40+
FSDEF:
41+
access: read-only
42+
FSPOL:
43+
access: read-write
44+
FSOFF:
45+
access: read-write
1246
"?SLOTR": {}
1347
"?IM": {}
1448
"?SR":

‎devices/common_patches/stm32l4x2_l412.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ _include:
119119
- can/can_filter_bank.yaml
120120
- ../../peripherals/can/can.yaml
121121
- sai/sai_v1.yaml
122+
- ../../peripherals/sai/sai.yaml
122123
- dfsdm/dfsdm_v2.yaml
123124
- ../../peripherals/gpio/v2/common.yaml
124125
- crc/crc_rename_init.yaml
@@ -151,7 +152,6 @@ _include:
151152
- ../../peripherals/usb/usb_array.yaml
152153
- ../../peripherals/usb/usb_with_LPM.yaml
153154
- flash/flash_boot0s.yaml
154-
- ../../peripherals/sai/sai.yaml
155155
- l4_adc.yaml
156156
- l4_adc_common.yaml
157157
- l4_adc_smpr.yaml

‎devices/stm32f405.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ _modify:
1010
# we'll prefer the more sensible (and better for sorting) ADC_Common
1111
C_ADC:
1212
name: ADC_Common
13+
SAI1:
14+
groupName: SAI
1315

1416
"SPI*":
1517
SR:

‎devices/stm32f407.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ _modify:
1010
# we'll prefer the more sensible (and better for sorting) ADC_Common
1111
C_ADC:
1212
name: ADC_Common
13+
SAI1:
14+
groupName: SAI
1315

1416
"SPI*":
1517
SR:

‎devices/stm32f413.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ _include:
181181
- common_patches/can/can_filter_bank.yaml
182182
- ../peripherals/can/can.yaml
183183
- common_patches/sai/sai_v1.yaml
184+
- ../peripherals/sai/sai.yaml
184185
- common_patches/dfsdm/dfsdm_v1.yaml
185186
- common_patches/f4_rcc_fmpi2c.yaml
186187
- common_patches/f4_fmpi2c.yaml
@@ -242,7 +243,6 @@ _include:
242243
- common_patches/usb_otg/otg_fs_remove_prefix.yaml
243244
- common_patches/dbgmcu.yaml
244245
- common_patches/fpu_interrupt.yaml
245-
- ../peripherals/sai/sai.yaml
246246
- common_patches/rtc/rtc_cr.yaml
247247
- ../peripherals/rtc/rtc_common.yaml
248248
- ../peripherals/sdio/sdio_f4.yaml

‎devices/stm32f427.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ _include:
184184
- common_patches/ltdc/f4_f7_ltdc_bccr.yaml
185185
- ../peripherals/ltdc/ltdc.yaml
186186
- common_patches/sai/sai_v1.yaml
187+
- ../peripherals/sai/sai.yaml
187188
- common_patches/rcc_rename_plli2scfgr.yaml
188189
- common_patches/rcc_add_plli2sq_sai.yaml
189190
- common_patches/rcc_add_gpiojk.yaml
@@ -250,7 +251,6 @@ _include:
250251
- common_patches/usb_otg/otg_hs_fixes_v1.yaml
251252
- common_patches/dbgmcu.yaml
252253
- common_patches/fpu_interrupt.yaml
253-
- ../peripherals/sai/sai.yaml
254254
- ../peripherals/rng/rng_v1.yaml
255255
- common_patches/f4_rtc_cr.yaml
256256
- ../peripherals/flash/flash_v1.yaml

‎devices/stm32f429.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ _include:
144144
- common_patches/ltdc/f4_f7_ltdc_bccr.yaml
145145
- ../peripherals/ltdc/ltdc.yaml
146146
- common_patches/sai/sai_v1.yaml
147+
- ../peripherals/sai/sai.yaml
147148
- ../peripherals/dac/dac_wavegen.yaml
148149
- ../peripherals/dac/dac_common_2ch.yaml
149150
- ../peripherals/dac/dac_dmaudr.yaml
@@ -208,7 +209,6 @@ _include:
208209
- ../peripherals/fsmc/fsmc_sram.yaml
209210
- ../peripherals/fsmc/fsmc_nand.yaml
210211
- ../peripherals/fsmc/fsmc_sd.yaml
211-
- ../peripherals/sai/sai.yaml
212212
- ../peripherals/rng/rng_v1.yaml
213213
- common_patches/f4_rtc_cr.yaml
214214
- common_patches/rtc/rtc_cr.yaml

‎devices/stm32f446.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -521,6 +521,7 @@ _include:
521521
- common_patches/can/can_filter_bank.yaml
522522
- ../peripherals/can/can.yaml
523523
- common_patches/sai/sai_v1.yaml
524+
- ../peripherals/sai/sai.yaml
524525
- common_patches/f4_rcc_fmpi2c.yaml
525526
- ../peripherals/dac/dac_wavegen.yaml
526527
- ../peripherals/dac/dac_common_2ch.yaml
@@ -586,7 +587,6 @@ _include:
586587
- ../peripherals/fsmc/fsmc_wfdis.yaml
587588
- ../peripherals/fsmc/fsmc_nand.yaml
588589
- ../peripherals/fsmc/fsmc_sd.yaml
589-
- ../peripherals/sai/sai.yaml
590590
- common_patches/f4_rtc_cr.yaml
591591
- common_patches/rtc/rtc_cr.yaml
592592
- ../peripherals/rtc/rtc_common.yaml

‎devices/stm32f469.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,10 @@ MPU:
104104
_strip:
105105
- "MPU_"
106106

107+
SAI:
108+
_delete:
109+
- GCR
110+
107111
_include:
108112
- common_patches/4_nvic_prio_bits.yaml
109113
- common_patches/merge_I2C_OAR1_ADDx_fields.yaml
@@ -119,6 +123,7 @@ _include:
119123
- common_patches/ltdc/f4_f7_ltdc_bccr.yaml
120124
- ../peripherals/ltdc/ltdc.yaml
121125
- common_patches/sai/sai_v1.yaml
126+
- ../peripherals/sai/sai.yaml
122127
- ../peripherals/dac/dac_wavegen.yaml
123128
- ../peripherals/dac/dac_common_2ch.yaml
124129
- ../peripherals/dac/dac_dmaudr.yaml
@@ -187,7 +192,6 @@ _include:
187192
- common_patches/usb_otg/otg_fs_remove_prefix.yaml
188193
- common_patches/dbgmcu.yaml
189194
- common_patches/fpu_interrupt.yaml
190-
- ../peripherals/sai/sai.yaml
191195
- common_patches/f4_rtc_cr.yaml
192196
- common_patches/rtc/rtc_cr.yaml
193197
- ../peripherals/rtc/rtc_common.yaml

‎devices/stm32f730.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ _include:
2727
- common_patches/can/can_filter_bank.yaml
2828
- ../peripherals/can/can.yaml
2929
- common_patches/sai/sai_v1.yaml
30+
- ../peripherals/sai/sai.yaml
3031
- common_patches/f7_rcc_lsedrv.yaml
3132
- common_patches/f7_rcc_dckcfgr.yaml
3233
- common_patches/f7x23_rcc_dckcfgr.yaml
@@ -77,7 +78,6 @@ _include:
7778
- common_patches/rtc/alarm.yaml
7879
- common_patches/rtc/rtc_bkpr.yaml
7980
- common_patches/dbgmcu.yaml
80-
- ../peripherals/sai/sai.yaml
8181
- common_patches/rtc/rtc_cr.yaml
8282
- ../peripherals/rtc/rtc_common.yaml
8383
- common_patches/adc_common_group_name.yaml

‎devices/stm32f745.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ _include:
123123
- common_patches/ltdc/f4_f7_ltdc_bccr.yaml
124124
- ../peripherals/ltdc/ltdc.yaml
125125
- common_patches/sai/sai_v1.yaml
126+
- ../peripherals/sai/sai.yaml
126127
- common_patches/rcc_add_plli2sp.yaml
127128
- common_patches/f7_rcc_apbenr.yaml
128129
- common_patches/f7_rcc_lsedrv.yaml
@@ -190,7 +191,6 @@ _include:
190191
- ../peripherals/fsmc/fsmc_wfdis.yaml
191192
- ../peripherals/fsmc/fsmc_nand.yaml
192193
- ../peripherals/fsmc/fsmc_sd.yaml
193-
- ../peripherals/sai/sai.yaml
194194
- ../peripherals/dma/dma2d_v1.yaml
195195
- common_patches/rtc/rtc_cr.yaml
196196
- ../peripherals/rtc/rtc_common.yaml

‎devices/stm32f765.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ _include:
138138
- common_patches/ltdc/f4_f7_ltdc_bccr.yaml
139139
- ../peripherals/ltdc/ltdc.yaml
140140
- common_patches/sai/sai_v1.yaml
141+
- ../peripherals/sai/sai.yaml
141142
- common_patches/rcc_add_plli2sp.yaml
142143
- common_patches/f7_rcc_apbenr.yaml
143144
- common_patches/f7_rcc_lsedrv.yaml
@@ -213,7 +214,6 @@ _include:
213214
- ../peripherals/fsmc/fsmc_wfdis.yaml
214215
- ../peripherals/fsmc/fsmc_nand.yaml
215216
- ../peripherals/fsmc/fsmc_sd.yaml
216-
- ../peripherals/sai/sai.yaml
217217
- ../peripherals/dma/dma2d_v1.yaml
218218
- common_patches/rtc/rtc_cr.yaml
219219
- ../peripherals/rtc/rtc_common.yaml

‎devices/stm32f7x2.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ _include:
2828
- common_patches/can/can_filter_bank.yaml
2929
- ../peripherals/can/can.yaml
3030
- common_patches/sai/sai_v1.yaml
31+
- ../peripherals/sai/sai.yaml
3132
- common_patches/f7_rcc_lsedrv.yaml
3233
- common_patches/f7_rcc_dckcfgr.yaml
3334
- common_patches/f7x23_rcc_dckcfgr.yaml
@@ -78,7 +79,6 @@ _include:
7879
- common_patches/rtc/alarm.yaml
7980
- common_patches/rtc/rtc_bkpr.yaml
8081
- common_patches/dbgmcu.yaml
81-
- ../peripherals/sai/sai.yaml
8282
- common_patches/rtc/rtc_cr.yaml
8383
- ../peripherals/rtc/rtc_common.yaml
8484
- common_patches/adc_common_group_name.yaml

‎devices/stm32f7x3.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ _include:
3838
- common_patches/can/can_filter_bank.yaml
3939
- ../peripherals/can/can.yaml
4040
- common_patches/sai/sai_v1.yaml
41+
- ../peripherals/sai/sai.yaml
4142
- common_patches/f7_rcc_lsedrv.yaml
4243
- common_patches/f7_rcc_dckcfgr.yaml
4344
- common_patches/f7x23_rcc_dckcfgr.yaml
@@ -88,7 +89,6 @@ _include:
8889
- common_patches/rtc/alarm.yaml
8990
- common_patches/rtc/rtc_bkpr.yaml
9091
- common_patches/dbgmcu.yaml
91-
- ../peripherals/sai/sai.yaml
9292
- common_patches/rtc/rtc_cr.yaml
9393
- ../peripherals/rtc/rtc_common.yaml
9494
- common_patches/adc_common_group_name.yaml

‎devices/stm32f7x6.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ _include:
108108
- common_patches/ltdc/f4_f7_ltdc_bccr.yaml
109109
- ../peripherals/ltdc/ltdc.yaml
110110
- common_patches/sai/sai_v1.yaml
111+
- ../peripherals/sai/sai.yaml
111112
- common_patches/rcc_add_plli2sp.yaml
112113
- common_patches/f7_rcc_apbenr.yaml
113114
- common_patches/f7_rcc_lsedrv.yaml
@@ -176,7 +177,6 @@ _include:
176177
- ../peripherals/fsmc/fsmc_wfdis.yaml
177178
- ../peripherals/fsmc/fsmc_nand.yaml
178179
- ../peripherals/fsmc/fsmc_sd.yaml
179-
- ../peripherals/sai/sai.yaml
180180
- ../peripherals/dma/dma2d_v1.yaml
181181
- common_patches/rtc/rtc_cr.yaml
182182
- ../peripherals/rtc/rtc_common.yaml

‎devices/stm32f7x7.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,7 @@ _include:
274274
- common_patches/ltdc/f4_f7_ltdc_bccr.yaml
275275
- ../peripherals/ltdc/ltdc.yaml
276276
- common_patches/sai/sai_v1.yaml
277+
- ../peripherals/sai/sai.yaml
277278
- common_patches/rcc_add_plli2sp.yaml
278279
- common_patches/f7_rcc_apbenr.yaml
279280
- common_patches/f7_rcc_lsedrv.yaml
@@ -349,7 +350,6 @@ _include:
349350
- ../peripherals/fsmc/fsmc_wfdis.yaml
350351
- ../peripherals/fsmc/fsmc_nand.yaml
351352
- ../peripherals/fsmc/fsmc_sd.yaml
352-
- ../peripherals/sai/sai.yaml
353353
- ../peripherals/dma/dma2d_v1.yaml
354354
- common_patches/rtc/rtc_cr.yaml
355355
- ../peripherals/rtc/rtc_common.yaml

0 commit comments

Comments
 (0)