Skip to content

Commit 14c9797

Browse files
committed
Add clock_configure_mhz
Trades off accuracy (only gets to +/- 1MHz) for reduced code size as it doesn't need 64 bit division
1 parent c54475d commit 14c9797

File tree

2 files changed

+30
-0
lines changed

2 files changed

+30
-0
lines changed

src/rp2_common/hardware_clocks/clocks.c

+14
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,20 @@ bool clock_configure(clock_handle_t clock, uint32_t src, uint32_t auxsrc, uint32
109109
return true;
110110
}
111111

112+
bool clock_configure_mhz(clock_handle_t clock, uint32_t src, uint32_t auxsrc, uint16_t src_freq_mhz, uint16_t freq_mhz) {
113+
assert(src_freq_mhz >= freq_mhz);
114+
115+
if (freq_mhz > src_freq_mhz)
116+
return false;
117+
118+
uint32_t div = (uint32_t)((((uint32_t) src_freq_mhz) << CLOCKS_CLK_GPOUT0_DIV_INT_LSB) / freq_mhz);
119+
uint32_t actual_freq = (uint32_t) ((((uint32_t) src_freq_mhz) << CLOCKS_CLK_GPOUT0_DIV_INT_LSB) / div) * MHZ;
120+
121+
clock_configure_internal(clock, src, auxsrc, actual_freq, div);
122+
// Store the configured frequency
123+
return true;
124+
}
125+
112126
void clock_configure_int_divider(clock_handle_t clock, uint32_t src, uint32_t auxsrc, uint32_t src_freq, uint32_t int_divider) {
113127
clock_configure_internal(clock, src, auxsrc, src_freq / int_divider, int_divider << CLOCKS_CLK_GPOUT0_DIV_INT_LSB);
114128
}

src/rp2_common/hardware_clocks/include/hardware/clocks.h

+16
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,22 @@ typedef clock_num_t clock_handle_t;
275275
*/
276276
bool clock_configure(clock_handle_t clock, uint32_t src, uint32_t auxsrc, uint32_t src_freq, uint32_t freq);
277277

278+
/*! \brief Configure the specified clock to +/- 1MHz
279+
* \ingroup hardware_clocks
280+
*
281+
* This function differs from clock_configure in that it does not configure the clocks as accurately,
282+
* but therefore doesn't need to bring in 64-bit division functions, reducing the code size.
283+
*
284+
* See the tables in the description for details on the possible values for clock sources.
285+
*
286+
* \param clock The clock to configure
287+
* \param src The main clock source, can be 0.
288+
* \param auxsrc The auxiliary clock source, which depends on which clock is being set. Can be 0
289+
* \param src_freq_mhz Frequency of the input clock source in MHz
290+
* \param freq_mhz Requested frequency in MHz
291+
*/
292+
bool clock_configure_mhz(clock_handle_t clock, uint32_t src, uint32_t auxsrc, uint16_t src_freq_mhz, uint16_t freq_mhz);
293+
278294
/*! \brief Configure the specified clock to use the undividded input source
279295
* \ingroup hardware_clocks
280296
*

0 commit comments

Comments
 (0)