boards/z1: fix broken clock configuration #19705
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
maribu
added
Type: bug
github-actions
bot
added
Area: boards
1 task
|
@kaspar030 tested this PR, see https://gitea.riot-labs.de/kaspar/results/src/branch/main/pr19705 The takeaway is:
|
|
I changed my mind regarding skipping the most significant RSEL bit in the calibration when an external resistor is used in the DCO: Just doing the normal calibration anyway reduces code complexity and size and only adds a minor delay in boot up time. |
benpicco
reviewed
Jun 7, 2023
benpicco
approved these changes
Jun 7, 2023
There was a problem hiding this comment.
Code looks good and @kaspar030 confirmed it's still working
The MSP430F2xx family has on RSEL bit more than the MSP430x1xxx family. This updates the clock calibration accordingly.
df5c319 from RIOT-OS#19558 broke the clock configuration of the Z1 by relying on the incorrect documentation of what clock is actually used. Closely reading the convoluted clock initialization code revealed that no XT2 crystal is present (as also indicated by some comments in `board.c`), contradicting the `#define MSP430_HAS_EXTERNAL_CRYSTAL 1` in the `board.h`. This now should restore behavior (but with calibrated DCO than hard coded magic numbers).
maribu
force-pushed
the
boards/z1/fix_clock
branch
from
b619dde
to
971dc88
Compare
|
bors merge |
bors bot
added a commit
that referenced
this pull request
Jun 7, 2023
19705: boards/z1: fix broken clock configuration r=maribu a=maribu ### Contribution description The MSP430F2xx family has on RSEL bit more than the MSP430x1xxx family. The first commit updates the clock calibration accordingly. df5c319 from #19558 broke the clock configuration of the Z1 by relying on the incorrect documentation of what clock is actually used. Closely reading the convoluted clock initialization code revealed that no XT2 crystal is present (as also indicated by some comments in `board.c`), contradicting the `#define MSP430_HAS_EXTERNAL_CRYSTAL 1` in the `board.h`. The second commit should restore behavior (but with calibrated DCO than hard coded magic numbers). 19713: nanocoap: clean up coap_iterate_option(), make it public r=maribu a=benpicco Co-authored-by: Marian Buschsieweke <marian.buschsieweke@posteo.net> Co-authored-by: Benjamin Valentin <benjamin.valentin@ml-pa.com>
|
Build failed (retrying...): |
|
Build succeeded! The publicly hosted instance of bors-ng is deprecated and will go away soon. If you want to self-host your own instance, instructions are here. If you want to switch to GitHub's built-in merge queue, visit their help page. |
|
Thx :) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Contribution description
The MSP430F2xx family has on RSEL bit more than the MSP430x1xxx family. The first commit updates the clock calibration accordingly.
df5c319 from #19558 broke the clock configuration of the Z1 by relying on the incorrect documentation of what clock is actually used. Closely reading the convoluted clock initialization code revealed that no XT2 crystal is present (as also indicated by some comments in
board.c), contradicting the#define MSP430_HAS_EXTERNAL_CRYSTAL 1in theboard.h.The second commit should restore behavior (but with calibrated DCO than hard coded magic numbers).
Testing procedure
make BOARD=z1 -C examples/default flash termshould work again, but fail with
master.Issues/PRs references
Regression introduced in #19558