Skip to contentSkip to conversation

clk changes for the merge window

GIT PULL Merged Stephen Boyd 2 participants 2 messages May 7, 2023 Common clk

lore
Share & tools
lore

Stephen Boyd

author maintainer
#0 lore raw

The following changes since commit a9863979fbc25838bbe7c5badf538cedfc802f60:

Merge branch 'clk-imx' into clk-next (2023-04-25 11:52:39 -0700)

are available in the Git repository at:

https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git tags/clk-for-linus

for you to fetch changes up to 31c6ed4e89187beef8fe2f979c8881ca94839427:

clk: starfive: Fix RESET_STARFIVE_JH7110 can't be selected in a specified case (2023-05-02 18:34:49 -0700)

----------------------------------------------------------------
A couple more patches that would be good to get into -rc1.

- Revert an i.MX patch that's causing video failures because division math goes sideways
- Fix a clang + W=1 build isue where FIELD_PREP() is taking a 32-bit variable instead of the usual u64 type
- Fix a Kconfig bug in the StarFive JH7110 clk config that selects a reset controller when it can't be selected

----------------------------------------------------------------
Adam Ford (1):
Revert "clk: imx: composite-8m: Add support to determine_rate"

Hal Feng (1):
clk: starfive: Fix RESET_STARFIVE_JH7110 can't be selected in a specified case

Nathan Chancellor (1):
clk: sp7021: Adjust width of _m in HWM_FIELD_PREP()

 drivers/clk/clk-sp7021.c           | 2 +-
 drivers/clk/imx/clk-composite-8m.c | 7 -------
 drivers/clk/starfive/Kconfig       | 5 +----
 3 files changed, 2 insertions(+), 12 deletions(-)
Signature · 2 lines
https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git/
https://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git