Skip to content

Commit 5218ade

Browse files
adamgreigadamgreig
authored
Merge pull request #689 from stm32-rs/fix-eth-mmctimr-tgfm
F2/F4/F7 Ethernet: Fix MMCTIMR TGFM bit position
2 parents 77c9b1c + 09b10c8 commit 5218ade

14 files changed

+25
-0
lines changed

‎CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,15 @@ Family-specific:
1313
* H7:
1414
* h7b3: clear all enumeratedValues
1515

16+
* F2:
17+
* Fix incorrect bit position for Ethernet MMCTIMR TGFM (#689)
18+
19+
* F4:
20+
* Fix incorrect bit position for Ethernet MMCTIMR TGFM (#689)
21+
1622
* F7:
1723
* Add SDMMC2EN and SDMMC2RST to F765, F7x7, F7x9 (#662)
24+
* Fix incorrect bit position for Ethernet MMCTIMR TGFM (#689)
1825

1926
## [v0.14.0] 2021-10-02
2027

‎devices/common_patches/ethernet_mmc.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Ethernet_MMC:
2+
MMCTIMR:
3+
_modify:
4+
TGFM:
5+
# SVDs for F2, F4, and F7 have TGFM in position 16 instead of 21.
6+
bitOffset: 21

‎devices/stm32f215.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ _include:
5555
- ../peripherals/fsmc/fsmc_sram.yaml
5656
- ../peripherals/fsmc/fsmc_nand.yaml
5757
- common_patches/f2_f4_ethernet.yaml
58+
- common_patches/ethernet_mmc.yaml
5859
- ../peripherals/dac/dac_wavegen.yaml
5960
- ../peripherals/dac/dac_common_2ch.yaml
6061
- ../peripherals/dac/dac_dmaudr.yaml

‎devices/stm32f217.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ _include:
5454
- ../peripherals/fsmc/fsmc_sram.yaml
5555
- ../peripherals/fsmc/fsmc_nand.yaml
5656
- common_patches/f2_f4_ethernet.yaml
57+
- common_patches/ethernet_mmc.yaml
5758
- ../peripherals/dac/dac_wavegen.yaml
5859
- ../peripherals/dac/dac_common_2ch.yaml
5960
- ../peripherals/dac/dac_dmaudr.yaml

‎devices/stm32f407.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ _include:
6666
- common_patches/merge_I2C_OAR1_ADDx_fields.yaml
6767
- common_patches/dma_fcr_wo.yaml
6868
- common_patches/ethernet_mac_regs.yaml
69+
- common_patches/ethernet_mmc.yaml
6970
- common_patches/f2_f4_ethernet.yaml
7071
- common_patches/can/can.yaml
7172
- common_patches/can/can_filter_bank.yaml

‎devices/stm32f427.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ _include:
172172
- common_patches/merge_I2C_OAR1_ADDx_fields.yaml
173173
- common_patches/dma_fcr_wo.yaml
174174
- common_patches/ethernet_mac_regs.yaml
175+
- common_patches/ethernet_mmc.yaml
175176
- common_patches/f2_f4_ethernet.yaml
176177
- common_patches/rcc_sai.yaml
177178
- common_patches/rcc_dma2d_ltdc.yaml

‎devices/stm32f429.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ _include:
129129
- common_patches/merge_I2C_OAR1_ADDx_fields.yaml
130130
- common_patches/dma_fcr_wo.yaml
131131
- common_patches/ethernet_mac_regs.yaml
132+
- common_patches/ethernet_mmc.yaml
132133
- common_patches/f2_f4_ethernet.yaml
133134
- common_patches/rcc_sai.yaml
134135
- common_patches/rcc_dma2d_ltdc.yaml

‎devices/stm32f469.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ _include:
109109
- common_patches/merge_I2C_OAR1_ADDx_fields.yaml
110110
- common_patches/dma_fcr_wo.yaml
111111
- common_patches/ethernet_mac_regs.yaml
112+
- common_patches/ethernet_mmc.yaml
112113
- common_patches/f2_f4_ethernet.yaml
113114
- common_patches/can/can.yaml
114115
- common_patches/can/can_filter_bank.yaml

‎devices/stm32f745.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ _include:
108108
- common_patches/pllsai.yaml
109109
- common_patches/dma_fcr_wo.yaml
110110
- common_patches/ethernet_mac_regs.yaml
111+
- common_patches/ethernet_mmc.yaml
111112
- common_patches/merge_USART_CR1_DEATx_fields.yaml
112113
- common_patches/merge_USART_CR1_DEDTx_fields.yaml
113114
- common_patches/merge_USART_CR2_ABRMODx_fields.yaml

‎devices/stm32f750.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ _include:
7171
- ../peripherals/dma/dma_v2.yaml
7272
- ../peripherals/dma/dma2d_v1.yaml
7373
- common_patches/ethernet_mac_regs.yaml
74+
- common_patches/ethernet_mmc.yaml
7475
- common_patches/f2_f4_ethernet.yaml
7576
- ../peripherals/eth/eth_dma_common.yaml
7677
- ../peripherals/eth/eth_dma_mb_edfe_dmarswtr.yaml

‎devices/stm32f765.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ _include:
123123
- common_patches/pllsai.yaml
124124
- common_patches/dma_fcr_wo.yaml
125125
- common_patches/ethernet_mac_regs.yaml
126+
- common_patches/ethernet_mmc.yaml
126127
- common_patches/merge_USART_CR1_DEATx_fields.yaml
127128
- common_patches/merge_USART_CR1_DEDTx_fields.yaml
128129
- common_patches/merge_USART_CR2_ABRMODx_fields.yaml

‎devices/stm32f7x6.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ _include:
9393
- common_patches/pllsai.yaml
9494
- common_patches/dma_fcr_wo.yaml
9595
- common_patches/ethernet_mac_regs.yaml
96+
- common_patches/ethernet_mmc.yaml
9697
- common_patches/merge_USART_CR1_DEATx_fields.yaml
9798
- common_patches/merge_USART_CR1_DEDTx_fields.yaml
9899
- common_patches/merge_USART_CR2_ABRMODx_fields.yaml

‎devices/stm32f7x7.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,7 @@ _include:
259259
- common_patches/pllsai.yaml
260260
- common_patches/dma_fcr_wo.yaml
261261
- common_patches/ethernet_mac_regs.yaml
262+
- common_patches/ethernet_mmc.yaml
262263
- common_patches/merge_USART_CR1_DEATx_fields.yaml
263264
- common_patches/merge_USART_CR1_DEDTx_fields.yaml
264265
- common_patches/merge_USART_CR2_ABRMODx_fields.yaml

‎devices/stm32f7x9.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,7 @@ _include:
267267
- common_patches/pllsai.yaml
268268
- common_patches/dma_fcr_wo.yaml
269269
- common_patches/ethernet_mac_regs.yaml
270+
- common_patches/ethernet_mmc.yaml
270271
- common_patches/merge_USART_CR1_DEATx_fields.yaml
271272
- common_patches/merge_USART_CR1_DEDTx_fields.yaml
272273
- common_patches/merge_USART_CR2_ABRMODx_fields.yaml

0 commit comments

Comments
 (0)