Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 7 May 2023 17:31:45 +0000 (10:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 7 May 2023 17:31:45 +0000 (10:31 -0700)
commitd6b8a8c49ad6afce23c2c65a3cda0a0ccd3eaf61
treede71fdbd760ec85f9c2ee5fe2c5492cdace19364
parent1c1094e47ef10be267a982fb1c69dbb80aa4f257
parent31c6ed4e89187beef8fe2f979c8881ca94839427
Merge tag 'clk-for-linus' of git://git./linux/kernel/git/clk/linux

Pull clk fixes from Stephen Boyd:
 "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"

* tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
  clk: starfive: Fix RESET_STARFIVE_JH7110 can't be selected in a specified case
  clk: sp7021: Adjust width of _m in HWM_FIELD_PREP()
  Revert "clk: imx: composite-8m: Add support to determine_rate"