From 7dc2f2ac736e8071d2029b4d23dc910f09dccc67 Mon Sep 17 00:00:00 2001 From: Li Jie Date: Sun, 17 Apr 2022 18:46:40 +0800 Subject: [PATCH 1/2] Change the groupName of ADC_Common from ADC to ADC_Common --- devices/common_patches/adc_common_group_name.yaml | 5 +++++ devices/common_patches/l4_adc_common.yaml | 2 +- devices/common_patches/wb_adc_common.yaml | 2 +- devices/stm32f215.yaml | 1 + devices/stm32f217.yaml | 1 + devices/stm32f401.yaml | 1 + devices/stm32f405.yaml | 1 + devices/stm32f407.yaml | 1 + devices/stm32f410.yaml | 1 + devices/stm32f411.yaml | 1 + devices/stm32f412.yaml | 1 + devices/stm32f413.yaml | 1 + devices/stm32f427.yaml | 1 + devices/stm32f429.yaml | 1 + devices/stm32f446.yaml | 1 + devices/stm32f469.yaml | 1 + devices/stm32f730.yaml | 1 + devices/stm32f745.yaml | 1 + devices/stm32f750.yaml | 1 + devices/stm32f765.yaml | 1 + devices/stm32f7x2.yaml | 1 + devices/stm32f7x3.yaml | 1 + devices/stm32f7x6.yaml | 1 + devices/stm32f7x7.yaml | 2 +- devices/stm32f7x9.yaml | 2 +- devices/stm32l4r9.yaml | 2 +- devices/stm32l4x5.yaml | 1 + devices/stm32l4x6.yaml | 1 + devices/stm32l552.yaml | 1 + devices/stm32l562.yaml | 1 + 30 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 devices/common_patches/adc_common_group_name.yaml diff --git a/devices/common_patches/adc_common_group_name.yaml b/devices/common_patches/adc_common_group_name.yaml new file mode 100644 index 000000000..b32e5a206 --- /dev/null +++ b/devices/common_patches/adc_common_group_name.yaml @@ -0,0 +1,5 @@ +# Rename group name of ADC_Common from ADC to ADC_Common + +_modify: + ADC_Common: + groupName: ADC_Common diff --git a/devices/common_patches/l4_adc_common.yaml b/devices/common_patches/l4_adc_common.yaml index b2badea9d..9c81e6c24 100644 --- a/devices/common_patches/l4_adc_common.yaml +++ b/devices/common_patches/l4_adc_common.yaml @@ -4,7 +4,7 @@ _add: # from RM0394. ADC_Common: description: ADC common registers - groupName: ADC + groupName: ADC_Common baseAddress: 0x50040300 addressBlock: offset: 0 diff --git a/devices/common_patches/wb_adc_common.yaml b/devices/common_patches/wb_adc_common.yaml index ef32ac5e5..f39acbd23 100644 --- a/devices/common_patches/wb_adc_common.yaml +++ b/devices/common_patches/wb_adc_common.yaml @@ -5,7 +5,7 @@ _add: # from RM0434. ADC_Common: description: ADC common registers - groupName: ADC + groupName: ADC_Common baseAddress: 0x50040300 addressBlock: offset: 0 diff --git a/devices/stm32f215.yaml b/devices/stm32f215.yaml index 9ee7274f2..0954f68a5 100644 --- a/devices/stm32f215.yaml +++ b/devices/stm32f215.yaml @@ -96,3 +96,4 @@ _include: - common_patches/usb_otg/otg_fs_remove_prefix.yaml - common_patches/usb_otg/otg_fs_fixes_v1.yaml - common_patches/dbgmcu.yaml + - common_patches/adc_common_group_name.yaml diff --git a/devices/stm32f217.yaml b/devices/stm32f217.yaml index 3d0de503a..ad7404b88 100644 --- a/devices/stm32f217.yaml +++ b/devices/stm32f217.yaml @@ -93,3 +93,4 @@ _include: - common_patches/rtc/rtc_bkpr.yaml - common_patches/rtc/rtc_cr.yaml - common_patches/dbgmcu.yaml + - common_patches/adc_common_group_name.yaml diff --git a/devices/stm32f401.yaml b/devices/stm32f401.yaml index 16abd23a4..85facbe70 100644 --- a/devices/stm32f401.yaml +++ b/devices/stm32f401.yaml @@ -163,3 +163,4 @@ _include: - ../peripherals/sdio/sdio_f4.yaml - common_patches/i2c_v1_fltr.yaml - ../peripherals/i2c/i2c_v1_fltr.yaml + - common_patches/adc_common_group_name.yaml diff --git a/devices/stm32f405.yaml b/devices/stm32f405.yaml index cdb3872ac..2cd04c41f 100644 --- a/devices/stm32f405.yaml +++ b/devices/stm32f405.yaml @@ -133,3 +133,4 @@ _include: - common_patches/f4_rtc_cr.yaml - common_patches/rtc/rtc_cr.yaml - ../peripherals/rtc/rtc_common.yaml + - common_patches/adc_common_group_name.yaml diff --git a/devices/stm32f407.yaml b/devices/stm32f407.yaml index 7f35a3f92..24ff16b53 100644 --- a/devices/stm32f407.yaml +++ b/devices/stm32f407.yaml @@ -141,3 +141,4 @@ _include: - common_patches/rtc/rtc_cr.yaml - ../peripherals/rtc/rtc_common.yaml - ../peripherals/sdio/sdio_f4.yaml + - common_patches/adc_common_group_name.yaml diff --git a/devices/stm32f410.yaml b/devices/stm32f410.yaml index d6ac9d0e0..e9d10a098 100644 --- a/devices/stm32f410.yaml +++ b/devices/stm32f410.yaml @@ -211,3 +211,4 @@ _include: - ../peripherals/rtc/rtc_common.yaml - common_patches/i2c_v1_fltr.yaml - ../peripherals/i2c/i2c_v1_fltr.yaml + - common_patches/adc_common_group_name.yaml diff --git a/devices/stm32f411.yaml b/devices/stm32f411.yaml index 64437b58a..3022c7fdf 100644 --- a/devices/stm32f411.yaml +++ b/devices/stm32f411.yaml @@ -184,3 +184,4 @@ _include: - ../peripherals/sdio/sdio_f4.yaml - common_patches/i2c_v1_fltr.yaml - ../peripherals/i2c/i2c_v1_fltr.yaml + - common_patches/adc_common_group_name.yaml diff --git a/devices/stm32f412.yaml b/devices/stm32f412.yaml index 8885a6f24..86a8441bf 100644 --- a/devices/stm32f412.yaml +++ b/devices/stm32f412.yaml @@ -459,3 +459,4 @@ _include: - ../peripherals/sdio/sdio_f4.yaml - common_patches/i2c_v1_fltr.yaml - ../peripherals/i2c/i2c_v1_fltr.yaml + - common_patches/adc_common_group_name.yaml diff --git a/devices/stm32f413.yaml b/devices/stm32f413.yaml index 83f92feef..cbbdd18a3 100644 --- a/devices/stm32f413.yaml +++ b/devices/stm32f413.yaml @@ -247,3 +247,4 @@ _include: - ../peripherals/rtc/rtc_common.yaml - ../peripherals/sdio/sdio_f4.yaml - ../peripherals/i2c/i2c_v1_fltr.yaml + - common_patches/adc_common_group_name.yaml diff --git a/devices/stm32f427.yaml b/devices/stm32f427.yaml index a82a7616c..10c00af25 100644 --- a/devices/stm32f427.yaml +++ b/devices/stm32f427.yaml @@ -259,3 +259,4 @@ _include: - ../peripherals/rtc/rtc_common.yaml - ../peripherals/sdio/sdio_f4.yaml - ../peripherals/i2c/i2c_v1_fltr.yaml + - common_patches/adc_common_group_name.yaml diff --git a/devices/stm32f429.yaml b/devices/stm32f429.yaml index 1deb10154..4e400b320 100644 --- a/devices/stm32f429.yaml +++ b/devices/stm32f429.yaml @@ -217,3 +217,4 @@ _include: - ../peripherals/flash/flash_latency16.yaml - ../peripherals/sdio/sdio_f4.yaml - ../peripherals/i2c/i2c_v1_fltr.yaml + - common_patches/adc_common_group_name.yaml diff --git a/devices/stm32f446.yaml b/devices/stm32f446.yaml index f620ebe29..1a2bd910f 100644 --- a/devices/stm32f446.yaml +++ b/devices/stm32f446.yaml @@ -597,3 +597,4 @@ _include: - ../peripherals/flash/flash_latency16.yaml - ../peripherals/rcc/rcc_v2_pllcfgr_pllr.yaml - ../peripherals/i2c/i2c_v1_fltr.yaml + - common_patches/adc_common_group_name.yaml diff --git a/devices/stm32f469.yaml b/devices/stm32f469.yaml index 8c5481f0d..01ea39a92 100644 --- a/devices/stm32f469.yaml +++ b/devices/stm32f469.yaml @@ -193,3 +193,4 @@ _include: - ../peripherals/rtc/rtc_common.yaml - ../peripherals/sdio/sdio_f4.yaml - ../peripherals/i2c/i2c_v1_fltr.yaml + - common_patches/adc_common_group_name.yaml diff --git a/devices/stm32f730.yaml b/devices/stm32f730.yaml index b03cb7caf..2aeb72314 100644 --- a/devices/stm32f730.yaml +++ b/devices/stm32f730.yaml @@ -81,3 +81,4 @@ _include: - ../peripherals/sai/sai.yaml - common_patches/rtc/rtc_cr.yaml - ../peripherals/rtc/rtc_common.yaml + - common_patches/adc_common_group_name.yaml diff --git a/devices/stm32f745.yaml b/devices/stm32f745.yaml index b68a8ca7c..024b76465 100644 --- a/devices/stm32f745.yaml +++ b/devices/stm32f745.yaml @@ -195,3 +195,4 @@ _include: - ../peripherals/dma/dma2d_v1.yaml - common_patches/rtc/rtc_cr.yaml - ../peripherals/rtc/rtc_common.yaml + - common_patches/adc_common_group_name.yaml diff --git a/devices/stm32f750.yaml b/devices/stm32f750.yaml index 3814c8714..6754c3b75 100644 --- a/devices/stm32f750.yaml +++ b/devices/stm32f750.yaml @@ -121,3 +121,4 @@ _include: - common_patches/ltdc/ltdc.yaml - common_patches/ltdc/f4_f7_ltdc_bccr.yaml - ../peripherals/ltdc/ltdc.yaml + - common_patches/adc_common_group_name.yaml diff --git a/devices/stm32f765.yaml b/devices/stm32f765.yaml index 5cd0e23af..ee059644f 100644 --- a/devices/stm32f765.yaml +++ b/devices/stm32f765.yaml @@ -218,3 +218,4 @@ _include: - ../peripherals/dma/dma2d_v1.yaml - common_patches/rtc/rtc_cr.yaml - ../peripherals/rtc/rtc_common.yaml + - common_patches/adc_common_group_name.yaml diff --git a/devices/stm32f7x2.yaml b/devices/stm32f7x2.yaml index d0ac81c03..ac1485020 100644 --- a/devices/stm32f7x2.yaml +++ b/devices/stm32f7x2.yaml @@ -82,3 +82,4 @@ _include: - ../peripherals/sai/sai.yaml - common_patches/rtc/rtc_cr.yaml - ../peripherals/rtc/rtc_common.yaml + - common_patches/adc_common_group_name.yaml diff --git a/devices/stm32f7x3.yaml b/devices/stm32f7x3.yaml index 6fb32f9c9..47dd709fe 100644 --- a/devices/stm32f7x3.yaml +++ b/devices/stm32f7x3.yaml @@ -92,3 +92,4 @@ _include: - ../peripherals/sai/sai.yaml - common_patches/rtc/rtc_cr.yaml - ../peripherals/rtc/rtc_common.yaml + - common_patches/adc_common_group_name.yaml diff --git a/devices/stm32f7x6.yaml b/devices/stm32f7x6.yaml index 858730dd0..39bd57756 100644 --- a/devices/stm32f7x6.yaml +++ b/devices/stm32f7x6.yaml @@ -181,3 +181,4 @@ _include: - ../peripherals/dma/dma2d_v1.yaml - common_patches/rtc/rtc_cr.yaml - ../peripherals/rtc/rtc_common.yaml + - common_patches/adc_common_group_name.yaml diff --git a/devices/stm32f7x7.yaml b/devices/stm32f7x7.yaml index 736b98687..925fa232c 100644 --- a/devices/stm32f7x7.yaml +++ b/devices/stm32f7x7.yaml @@ -9,7 +9,7 @@ _add: # from RM0410. ADC_Common: description: ADC common registers - groupName: ADC + groupName: ADC_Common baseAddress: 0x40012300 addressBlock: offset: 0x0 diff --git a/devices/stm32f7x9.yaml b/devices/stm32f7x9.yaml index 038ad2ed2..0dc1b0af9 100644 --- a/devices/stm32f7x9.yaml +++ b/devices/stm32f7x9.yaml @@ -9,7 +9,7 @@ _add: # from RM0410. ADC_Common: description: ADC common registers - groupName: ADC + groupName: ADC_Common baseAddress: 0x40012300 addressBlock: offset: 0x0 diff --git a/devices/stm32l4r9.yaml b/devices/stm32l4r9.yaml index bfdf05a96..4953261c2 100644 --- a/devices/stm32l4r9.yaml +++ b/devices/stm32l4r9.yaml @@ -97,4 +97,4 @@ _include: - common_patches/usb_otg/otg_fs_remove_prefix.yaml - common_patches/usb_otg/otg_fs_fixes_v1.yaml - common_patches/l4_lpuart_presc.yaml - \ No newline at end of file + - common_patches/adc_common_group_name.yaml diff --git a/devices/stm32l4x5.yaml b/devices/stm32l4x5.yaml index 2b1d7487d..1c14a9c01 100644 --- a/devices/stm32l4x5.yaml +++ b/devices/stm32l4x5.yaml @@ -198,3 +198,4 @@ _include: - ./common_patches/l4_dbg_apb_fzr_rename.yaml - ../peripherals/spi/spi_l4.yaml - ./common_patches/l4_tim15_ch2.yaml + - common_patches/adc_common_group_name.yaml diff --git a/devices/stm32l4x6.yaml b/devices/stm32l4x6.yaml index ea306eae3..abc8e2fa8 100644 --- a/devices/stm32l4x6.yaml +++ b/devices/stm32l4x6.yaml @@ -92,3 +92,4 @@ _include: - ../peripherals/spi/spi_l4.yaml - ./common_patches/l4_dbg_apb_fzr_rename.yaml - ./common_patches/l4_lcd_segment.yaml + - common_patches/adc_common_group_name.yaml diff --git a/devices/stm32l552.yaml b/devices/stm32l552.yaml index 639644315..47ab7f88d 100644 --- a/devices/stm32l552.yaml +++ b/devices/stm32l552.yaml @@ -47,3 +47,4 @@ _include: - ./common_patches/sai/sai_v1.yaml - common_patches/tim/v2/l5.yaml - ../peripherals/tim/v2/ccm.yaml + - common_patches/adc_common_group_name.yaml diff --git a/devices/stm32l562.yaml b/devices/stm32l562.yaml index 29752f69e..4b613268f 100644 --- a/devices/stm32l562.yaml +++ b/devices/stm32l562.yaml @@ -221,3 +221,4 @@ _include: - ../peripherals/tim/v2/ccm.yaml - common_patches/rtc/alarm.yaml - common_patches/rtc/tamp_bkpr.yaml + - common_patches/adc_common_group_name.yaml From 1306b6302230bfc79f2eb259926cd680f5666e15 Mon Sep 17 00:00:00 2001 From: Adam Greig Date: Sun, 3 Jul 2022 22:08:27 +0100 Subject: [PATCH 2/2] L4R9: Fix indentation of YAML --- devices/stm32l4r9.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devices/stm32l4r9.yaml b/devices/stm32l4r9.yaml index 4953261c2..3ce96cbec 100644 --- a/devices/stm32l4r9.yaml +++ b/devices/stm32l4r9.yaml @@ -97,4 +97,4 @@ _include: - common_patches/usb_otg/otg_fs_remove_prefix.yaml - common_patches/usb_otg/otg_fs_fixes_v1.yaml - common_patches/l4_lpuart_presc.yaml - - common_patches/adc_common_group_name.yaml + - common_patches/adc_common_group_name.yaml