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

kinetis: Unify cpu.c, update clock initialization code #7379

Merged
merged 2 commits into from
Aug 1, 2017
Merged

kinetis: Unify cpu.c, update clock initialization code #7379

merged 2 commits into from
Aug 1, 2017

Conversation

jnohlgard
Copy link
Member

@jnohlgard jnohlgard commented Jul 18, 2017 •
edited
Loading

Unify cpu_init for all Kinetis CPUs to reduce code duplication. Updated the MCG driver implementation to make the configuration easier. Most clock settings are initialized by kinetis_mcg_init() called from cpu_init. Board specific external clock source initialization (FRDM-K64F, PhyNode) needs to be performed in board_init instead of in cpu_init.

The clock dividers (SIM_CLKDIV1) previously set in various places for different boards are now unified and handled directly by the MCG driver.

@jnohlgard jnohlgard added Platform: ARM Platform: This PR/issue effects ARM-based platforms Type: cleanup The issue proposes a clean-up / The PR cleans-up parts of the codebase / documentation Type: enhancement The issue suggests enhanceable parts / The PR enhances parts of the codebase / documentation labels Jul 18, 2017
@jnohlgard jnohlgard added this to the Release 2017.10 milestone Jul 18, 2017
@jnohlgard
Copy link
Member Author

jnohlgard commented Jul 18, 2017 •
edited by kYc0o
Loading

Testing status:

  • frdm-k22f
  • frdm-k64f
  • mulle
  • pba-d-01-kw2x

@haukepetersen @aabadie @kYc0o do you have access to any of the above boards for testing?

@jnohlgard jnohlgard requested a review from kYc0o July 18, 2017 07:45
@jnohlgard
Copy link
Member Author

Forgot to update the documentation. Will address.

@kYc0o
Copy link
Contributor

kYc0o commented Jul 19, 2017

Great! I'll take a look asap.

@jnohlgard
Copy link
Member Author

updated docs

@jnohlgard jnohlgard mentioned this pull request Jul 22, 2017
Merged
@jnohlgard
Copy link
Member Author

Relevant tests are tests/xtimer_drift and examples/gnrc_networking (for the Phytec board)

@kYc0o
Copy link
Contributor

kYc0o commented Jul 25, 2017

I just tested this without success. No example runs anymore either on mulle or frdm-k64f. I didn't test on pba-d-01-kw2x.

@jnohlgard jnohlgard force-pushed the pr/kinetis-clock-init branch from 0cf5e04 to 489b41e Compare July 28, 2017 19:26
@jnohlgard
Copy link
Member Author

The problem with mulle and k64f is a configuration error. I will update this PR tomorrow, or later tonight. Also found another problem which messed up the FEI mode.

@jnohlgard jnohlgard force-pushed the pr/kinetis-clock-init branch from 489b41e to ac55f13 Compare August 1, 2017 06:26
@jnohlgard
Copy link
Member Author

@kYc0o

  • Fixed the configuration error on Mulle and FRDM-K64F
  • Improved safe mode robustness
  • Fixed an issue with settings not being applied when configuring FEI mode
  • Updated all I2C timings to match the board clocks
  • Changed default Mulle core clock to 48 MHz
  • Corrected the I2C clock sources to match their respective reference manuals

@jnohlgard
Copy link
Member Author

Tested I2C on Mulle and FRDM-K22F using the tests/drivers_hih6130 and the HIH6130 sensor breakout board from Sparkfun.

@jnohlgard
Copy link
Member Author

@kYc0o do you mind testing on k64f? I don't have that board.
@OlegHahm @haukepetersen do you have a PhyTec board available for testing this PR?

kinetis: Add support for CPUs with RSIM module
aa67bdb 
Some KW series CPUs have no OSC module, but uses the oscillator found in
the built-in transceiver.
@jnohlgard jnohlgard force-pushed the pr/kinetis-clock-init branch from f6dd76f to f304334 Compare August 1, 2017 10:03
@jnohlgard jnohlgard mentioned this pull request Aug 1, 2017
Merged
@kYc0o
Copy link
Contributor

kYc0o commented Aug 1, 2017

Tested on pba-d-01-kw2x (kw22d512 model) and frdm-k64f boards. Everything works as expected.

kYc0o
kYc0o approved these changes Aug 1, 2017
View reviewed changes
Copy link
Contributor

@kYc0o kYc0o left a comment

Choose a reason for hiding this comment

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

ACK.

@kYc0o
Copy link
Contributor

kYc0o commented Aug 1, 2017

Please squash.

@jnohlgard jnohlgard force-pushed the pr/kinetis-clock-init branch from f304334 to 98bb2ce Compare August 1, 2017 14:18
@jnohlgard jnohlgard added the CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR label Aug 1, 2017
@jnohlgard
Copy link
Member Author

@kYc0o squashed, waiting for Murdock

kinetis: Unify cpu.c, update clocking initialization
742bcad 
Unify cpu_init for all Kinetis CPUs to reduce code duplication.
Updated the MCG driver implementation to make the configuration easier.
Most clock settings are initialized by kinetis_mcg_init() called from
cpu_init. Board specific external clock source initialization
(FRDM-K64F, PhyNode) needs to be performed in board_init instead of
in cpu_init.
@jnohlgard jnohlgard force-pushed the pr/kinetis-clock-init branch from 98bb2ce to 742bcad Compare August 1, 2017 14:30
@kYc0o
Copy link
Contributor

kYc0o commented Aug 1, 2017

Go!

@jnohlgard jnohlgard merged commit 10e53fe into RIOT-OS:master Aug 1, 2017
@jnohlgard jnohlgard deleted the pr/kinetis-clock-init branch August 1, 2017 14:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kYc0o kYc0o kYc0o approved these changes

Assignees

@haukepetersen haukepetersen

Labels
CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Platform: ARM Platform: This PR/issue effects ARM-based platforms Type: cleanup The issue proposes a clean-up / The PR cleans-up parts of the codebase / documentation Type: enhancement The issue suggests enhanceable parts / The PR enhances parts of the codebase / documentation
Projects
None yet
Milestone
Release 2017.10
Development

Successfully merging this pull request may close these issues.
3 participants
@jnohlgard @kYc0o @haukepetersen