Skip to content
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

clock_control: stm32: Configure MCO through devicetree instead of Kconfig #76556

Merged
merged 14 commits into from
Sep 16, 2024
Merged

clock_control: stm32: Configure MCO through devicetree instead of Kconfig #76556

merged 14 commits into from
Sep 16, 2024

Conversation

joerchan
Copy link
Contributor

@joerchan joerchan commented Jul 31, 2024 •
edited
Loading

Deprecated setting MCO source and prescalor in Kconfig in favour of setting it through devicetree.

mathieuchopstm
mathieuchopstm requested changes Aug 1, 2024
View reviewed changes
Copy link
Collaborator

@mathieuchopstm mathieuchopstm left a comment

Choose a reason for hiding this comment

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

Off with a very good start!
Some points to address or discuss:

drivers/clock_control/clock_stm32_mco.c Outdated Show resolved Hide resolved
dts/arm/st/f4/stm32f4.dtsi Outdated Show resolved Hide resolved
dts/arm/st/f7/stm32f7.dtsi Outdated Show resolved Hide resolved
dts/arm/st/h5/stm32h5.dtsi Outdated Show resolved Hide resolved
dts/arm/st/h7/stm32h7.dtsi Outdated Show resolved Hide resolved
include/zephyr/dt-bindings/clock/stm32f1_clock.h Show resolved Hide resolved
samples/boards/stm32/mco/README.rst Outdated Show resolved Hide resolved
drivers/clock_control/clock_stm32_mco.c Outdated Show resolved Hide resolved
drivers/clock_control/clock_stm32_mco.c Show resolved Hide resolved
drivers/clock_control/clock_stm32_mco.c Outdated Show resolved Hide resolved
@joerchan joerchan marked this pull request as ready for review August 1, 2024 10:10
@zephyrbot zephyrbot added platform: STM32 ST Micro STM32 area: Samples Samples area: Devicetree Binding PR modifies or adds a Device Tree binding area: Clock Control labels Aug 1, 2024
@erwango erwango mentioned this pull request Aug 1, 2024
Closed
erwango
erwango requested changes Aug 1, 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.

Thanks for the work on this long awaited piece of code.

include/zephyr/dt-bindings/clock/stm32f1_clock.h Outdated Show resolved Hide resolved
drivers/clock_control/Kconfig.stm32 Outdated Show resolved Hide resolved
drivers/clock_control/Kconfig.stm32 Show resolved Hide resolved
include/zephyr/dt-bindings/clock/stm32f1_clock.h Show resolved Hide resolved
dts/bindings/clock/st,stm32-clock-mco.yaml Outdated Show resolved Hide resolved
drivers/clock_control/clock_stm32_mco.c Show resolved Hide resolved
@decsny decsny removed their request for review August 1, 2024 13:45
joerchan
joerchan commented Aug 28, 2024
View reviewed changes
dts/arm/st/c0/stm32c0.dtsi Outdated Show resolved Hide resolved
mathieuchopstm
mathieuchopstm requested changes Aug 28, 2024
View reviewed changes
Copy link
Collaborator

@mathieuchopstm mathieuchopstm left a comment

Choose a reason for hiding this comment

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

Looks pretty solid!

A few minor points to iron out:

dts/bindings/clock/st,stm32-clock-mco.yaml Outdated Show resolved Hide resolved
include/zephyr/drivers/clock_control/stm32_clock_control.h Outdated Show resolved Hide resolved
samples/boards/stm32/mco/boards/nucleo_u5a5zj_q.overlay Outdated Show resolved Hide resolved
samples/boards/stm32/mco/boards/stm32f746g_disco.overlay Outdated Show resolved Hide resolved
samples/boards/stm32/mco/boards/stm32f746g_disco.overlay Outdated Show resolved Hide resolved
include/zephyr/dt-bindings/clock/stm32f1_clock.h Show resolved Hide resolved
drivers/clock_control/clock_stm32_mco.c Show resolved Hide resolved
drivers/clock_control/clock_stm32_mco.c Outdated Show resolved Hide resolved
drivers/clock_control/clock_stm32_mco.c Outdated Show resolved Hide resolved
@joerchan
Copy link
Contributor Author

I will rebase this PR and resolve the conflict after the review is finished, so that it is easier to see the updates that are being done.

The conflict is trivial to resolve, only adjacent context lines that have been updated.

mathieuchopstm
mathieuchopstm previously approved these changes Sep 13, 2024
View reviewed changes
Copy link
Collaborator

@mathieuchopstm mathieuchopstm left a comment

Choose a reason for hiding this comment

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

One nit from last review remaining, but non-blocking. LGTM otherwise.

erwango
erwango previously approved these changes Sep 13, 2024
View reviewed changes
@joerchan
drivers: clock_control: Expose enabled_clock for clock driver library
9219d26 
Expose the helper function enabled_clock so that it can be used in
other clock library sources.

Signed-off-by: Joakim Andersson <joerchan@gmail.com>
@joerchan
drivers: clock_control: Add clock sources to common enabled_clock check
3a1311d 
Add clock sources PLL2CLK, PLL3CLK and EXT_HSE.
Needed to check that these clocks are enabled in MCO code.

Signed-off-by: Joakim Andersson <joerchan@gmail.com>
@joerchan
dt-bindings: clock: Add clock sources for stm32f1x/10x for MCO
2fb01f1 
Add clock sources that can be output by the MCO on the stm32f1x and
stm32f10 connectivity line devices.

Signed-off-by: Joakim Andersson <joerchan@gmail.com>
@joerchan
include: dt-bindings: Add MCO select and prescaler macros for CFGR reg
563c362 
Add MCO select and prescaler macros to set bits in the RCC CFGRx
register.
The set of supported boards are chosen to replace what is currently
supported in Kconfig.

Signed-off-by: Joakim Andersson <joerchan@gmail.com>
@joerchan
dts: bindings: Add stm32 microcontroller clock output binding
b1aa6f9 
Add stm32 microcontroller clock output binding.

Signed-off-by: Joakim Andersson <joerchan@gmail.com>
@joerchan
include: Add STM32_MCO_CFGR bit encoding and decoding
0d01f41 
Add macro for encoding MCO bit values into the CFGR register
of RCC. Add macros for decoding and extracting the different fields.

Signed-off-by: Joakim Andersson <joerchan@gmail.com>
@joerchan
drivers: Add driver for STM32 MCO peripheral
745992d 
Add device driver for STM32 MCO peripheral which takes configures
the MCO clock source and prescaler, and outputs it on one of the GPIO
pins.

Signed-off-by: Joakim Andersson <joerchan@gmail.com>
@joerchan
dts: st: Add MCO node to STM32 boards
422100b 
Add MCO device nodes to the STM32 boards.
The set of supported boards are chosen to replace what is currently
supported in Kconfig.

Signed-off-by: Joakim Andersson <joerchan@gmail.com>
@joerchan
include: dt-bindings: clock: fix stm32f7 missing HSE and PLLI2S_R source
107867a 
Fix stm32f7 missing the definition for HSE and PLLI2S_R clock source.

Signed-off-by: Joakim Andersson <joerchan@gmail.com>
@joerchan
boards: Add MCO support for the stm32c0xx family
5b1f03c 
Add MCO support for the stm32c0xx family.

Signed-off-by: Joakim Andersson <joerchan@gmail.com>
@joerchan
samples: stm32: mco: Update sample to use dts instead of Kconfig
5bc24a5 
Update MCO board sample to use devicetree information instead of Kconfig
configurations.

Signed-off-by: Joakim Andersson <joerchan@gmail.com>
@joerchan
samples: stm32: mco: Add disco board which has 2 MCO instances
79f7aa9 
Add stm32f746g_disco board to MCO sample.
This board has 2 MCO instances so useful to show multiple instances
as well as checking the implementation.

Signed-off-by: Joakim Andersson <joerchan@gmail.com>
@joerchan
drivers: clock_control: Deprecate Kconfig for MCO configuration
3b9e9ef 
Deprecate support for configuring the MCO source and prescaler from
Kconfig configurations.
This is now done by devicetree and an MCO driver instead, which also
configures the pin to be used by the MCO peripheral.

Signed-off-by: Joakim Andersson <joerchan@gmail.com>
@joerchan
doc: Document deprecated stm32 MCO kconfig options for MCO
bddd41d 
Document deprecated stm32 MCO Kconfig options in favour of
setting MCO through devicetree.

Signed-off-by: Joakim Andersson <joerchan@gmail.com>
@joerchan
Copy link
Contributor Author

One nit from last review remaining, but non-blocking. LGTM otherwise.

Addressed last nit and rebased the PR to fix the conflicts.

@joerchan
Copy link
Contributor Author

Re-running documentation build, failed because of server issues.

erwango
erwango approved these changes Sep 16, 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.

Once again a great thanks!

@carlescufi carlescufi merged commit f5e047e into zephyrproject-rtos:main Sep 16, 2024
23 checks passed
@joerchan joerchan deleted the stm32-mco-dts branch September 16, 2024 20:39
@erwango erwango mentioned this pull request Sep 24, 2024
Merged
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

@FRASTM FRASTM Awaiting requested review from FRASTM

@galak galak Awaiting requested review from galak

@GeorgeCGV GeorgeCGV Awaiting requested review from GeorgeCGV

@kartben kartben Awaiting requested review from kartben

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

@nashif nashif Awaiting requested review from nashif

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

@dkalowsk dkalowsk Awaiting requested review from dkalowsk

@mmahadevan108 mmahadevan108 Awaiting requested review from mmahadevan108

@mathieuchopstm mathieuchopstm Awaiting requested review from mathieuchopstm

Assignees

@erwango erwango

Labels
area: Clock Control area: Devicetree Binding PR modifies or adds a Device Tree binding 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.
7 participants
@joerchan @erwango @gautierg-st @mathieuchopstm @carlescufi @nordic-krch @zephyrbot