Skip to content

stm32: mco: Remove deprecated Kconfig configuration #81460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
nashif merged 7 commits into from
Dec 6, 2024
Merged

stm32: mco: Remove deprecated Kconfig configuration #81460

nashif merged 7 commits into from
Dec 6, 2024

Conversation

@FRASTM
Copy link
Contributor

@FRASTM FRASTM commented Nov 15, 2024 •
edited
Loading

change the configuration of the MCO 1 or 2 output for the stm32 series
Kconfig is no more used, set the configuration by the DTS as speciied by the dts/bindings/clock/st,stm32-clock-mco.yaml

See the refman of the stm32 to put the correct clock source and the prescaler value

&mco2 {
	clocks = <&rcc STM32_SRC_PLLI2S_R MCO2_SEL(1)>;
	prescaler = <MCO2_PRE(5)>; /* div by 5 --> set 0b111 in the MCO2PRE of the RCC CFGR */
	pinctrl-0 = <&rcc_mco_2_pc9>;
	pinctrl-names = "default";
	status = "okay";
};

Fixes #80885

@rruuaanng rruuaanng added the platform: STM32 ST Micro STM32 label Nov 17, 2024
@FRASTM FRASTM mentioned this pull request Nov 18, 2024
Closed
erwango
erwango requested changes Nov 18, 2024
View reviewed changes
Copy link
Member

@erwango erwango left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In commit message of "drivers: clock_control: stm32 mco driver get define from DTS", please mention that DTS configuration has been introduced and Kconfig method deprecated two releases before and can be then safely removed.
Please also update migration guide on this.

@FRASTM FRASTM force-pushed the mco branch 7 times, most recently from 4abd718 to 6863af0 Compare November 20, 2024 10:29
@FRASTM FRASTM marked this pull request as ready for review November 20, 2024 16:26
@zephyrbot zephyrbot added Release Notes To be mentioned in the release notes area: Samples Samples area: Clock Control labels Nov 20, 2024
erwango
erwango requested changes Nov 21, 2024
View reviewed changes
Copy link
Member

@erwango erwango left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd drop the clang commit entirely as most of the changes are bad from readbility/maintainability point of view.

@erwango erwango changed the title stm32 MCO configuration by the DTS stm32: mco: Remove deprecated Kconfig configuration Nov 21, 2024
erwango
erwango requested changes Nov 26, 2024
View reviewed changes
Copy link
Member

@erwango erwango left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Otherwise LGTM

@erwango erwango requested a review from gautierg-st November 26, 2024 15:44
erwango
erwango previously approved these changes Nov 27, 2024
View reviewed changes
gautierg-st
gautierg-st previously approved these changes Nov 27, 2024
View reviewed changes
@erwango
Copy link
Member

erwango commented Nov 28, 2024

@FRASTM Please rebase to fix CI issue

@FRASTM
Copy link
Contributor Author

FRASTM commented Nov 29, 2024

rebased on 065bd32

@FRASTM FRASTM dismissed stale reviews from gautierg-st and erwango via eec61c9 December 5, 2024 14:55
@FRASTM
Copy link
Contributor Author

FRASTM commented Dec 5, 2024 •
edited
Loading

rebase on c0be51d

FRASTM added 7 commits December 5, 2024 15:57
@FRASTM
include: bindings: high speed clock for the stm32F1/F4 series
8668dc4 
The stm32F4 serie has HSI and HSE clock possible clock sources
The stm32F1 also has an external HSE possible clock source

Signed-off-by: Francois Ramu <[email protected]>
@FRASTM
dts: arm: stm32f411 compatible for PLL I2S
378aca7 
The stm32f411 and stm32f412 and stm32f446 have a PLLI2S
with a div M in front of the PLLI2S input.

Signed-off-by: Francois Ramu <[email protected]>
@FRASTM
drivers: clock control: stm32 pll clock config for I2S
32d230f 
The stm32F41x have a PLLI2S M divider for their PLL I2S
but others like the stm32F401 or stm32F74x have the PLL M
divider from the main PLL : might affect the sysclock.
LL Function is the same for configuring the PLL I2S but
parameter could depends on the stm32 serie.

Signed-off-by: Francois Ramu <[email protected]>
@FRASTM
drivers: clock_control: stm32 mco driver get define from DTS
c3391c5 
Rely on the DTS to get the MCO input source clock and prescaler.
DTS configuration has been introduced and Kconfig method
deprecated two releases before and can be then safely removed.

Signed-off-by: Francois Ramu <[email protected]>
@FRASTM
include: binding defines division factor for stm32 MCO prescaler
10e2875 
Depending on the stm32 serie the MCO1/2 prescaler is a value
set in the CFGR register to divide the MCO output clock.
Use the same model based on the RefMan for other stm32 series
than stm32C0/F4/F7/H5/H7, once the MCO is in the DTS.

Signed-off-by: Francois Ramu <[email protected]>
@FRASTM
samples: boards: stm32 mco output control
dafcaff 
This sample enables and configures the MCO1/2 output
for stm32 target boards.
MCO_PRE_DIV_n is defined by the stm32XX_clock.h

Signed-off-by: Francois Ramu <[email protected]>
@FRASTM
doc: Migration guide v4.1: STM32 addition for the MCO
ee52327 
STM32 configuration for the MCO clock source and prescaler is done
by the DTS and no more by Kconfig (removed).

Signed-off-by: Francois Ramu <[email protected]>
@FRASTM FRASTM force-pushed the mco branch 3 times, most recently from 8ed5a95 to ee52327 Compare December 5, 2024 15:03
@erwango
Copy link
Member

erwango commented Dec 5, 2024

@nordic-krch PTAL

@fabiobaltieri fabiobaltieri assigned erwango and unassigned nordic-krch Dec 5, 2024
@fabiobaltieri
Copy link
Member

fabiobaltieri commented Dec 5, 2024

All changes are in ST specific file, reassigning.

@fabiobaltieri
Copy link
Member

fabiobaltieri commented Dec 5, 2024 

Area matches: {<Area STM32 Platforms>: 20, <Area Drivers: Clock control>: 8, <Area Release Notes>: 1, <Area Samples>: 0}
labels: {'area: Clock control', 'platform: STM32', 'area: Samples', 'Release Notes'}
collab: ['erwango', 'FRASTM', 'gautierg-st', 'GeorgeCGV', 'marwaiehm-st', 'mathieuchopstm', 'nordic-krch', 'fabiobaltieri', 'kartben', 'nashif']
Submitted by: FRASTM
candidate maintainers: {'erwango': 20, 'nordic-krch': 8, 'fabiobaltieri': 1, 'kartben': 1}
Picked assignees: ['nordic-krch'] (27.59% ownership)

shrugs

@nashif nashif merged commit 498138e into zephyrproject-rtos:main Dec 6, 2024
33 of 41 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@erwango erwango erwango approved these changes

@gautierg-st gautierg-st gautierg-st approved these changes

@dkalowsk dkalowsk Awaiting requested review from dkalowsk

@GeorgeCGV GeorgeCGV Awaiting requested review from GeorgeCGV

@kartben kartben Awaiting requested review from kartben

@marwaiehm-st marwaiehm-st Awaiting requested review from marwaiehm-st

@mathieuchopstm mathieuchopstm Awaiting requested review from mathieuchopstm

@mmahadevan108 mmahadevan108 Awaiting requested review from mmahadevan108

@nashif nashif Awaiting requested review from nashif

@nordic-krch nordic-krch Awaiting requested review from nordic-krch

@fabiobaltieri fabiobaltieri Awaiting requested review from fabiobaltieri

@de-nordic de-nordic Awaiting requested review from de-nordic

@rghaddab rghaddab Awaiting requested review from rghaddab

Assignees

@erwango erwango

Labels

area: Clock Control area: Flash area: Samples Samples platform: STM32 ST Micro STM32 Release Notes To be mentioned in the release notes

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

PLL-I2S clock misconfiguration on STM32F446

8 participants

@FRASTM @erwango @fabiobaltieri @gautierg-st @nashif @nordic-krch @zephyrbot @rruuaanng