Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

Pull clk updates from Stephen Boyd:
 "The core framework has a handful of patches this time around, mostly
  due to the clk rate protection support added by Jerome Brunet.

  This feature will allow consumers to lock in a certain rate on the
  output of a clk so that things like audio playback don't hear pops
  when the clk frequency changes due to shared parent clks changing
  rates. Currently the clk API doesn't guarantee the rate of a clk stays
  at the rate you request after clk_set_rate() is called, so this new
  API will allow drivers to express that requirement.

  Beyond this, the core got some debugfs pretty printing patches and a
  couple minor non-critical fixes.

  Looking outside of the core framework diff we have some new driver
  additions and the removal of a legacy TI clk driver. Both of these hit
  high in the dirstat. Also, the removal of the asm-generic/clkdev.h
  file causes small one-liners in all the architecture Kbuild files.

  Overall, the driver diff seems to be the normal stuff that comes all
  the time to fix little problems here and there and to support new
  hardware.

  Summary:

  Core:
   - Clk rate protection
   - Symbolic clk flags in debugfs output
   - Clk registration enabled clks while doing bookkeeping updates

  New Drivers:
   - Spreadtrum SC9860
   - HiSilicon hi3660 stub
   - Qualcomm A53 PLL, SPMI clkdiv, and MSM8916 APCS
   - Amlogic Meson-AXG
   - ASPEED BMC

  Removed Drivers:
   - TI OMAP 3xxx legacy clk (non-DT) support
   - asm*/clkdev.h got removed (not really a driver)

  Updates:
   - Renesas FDP1-0 module clock on R-Car M3-W
   - Renesas LVDS module clock on R-Car V3M
   - Misc fixes to pr_err() prints
   - Qualcomm MSM8916 audio fixes
   - Qualcomm IPQ8074 rounded out support for more peripherals
   - Qualcomm Alpha PLL variants
   - Divider code was using container_of() on bad pointers
   - Allwinner DE2 clks on H3
   - Amlogic minor data fixes and dropping of CLK_IGNORE_UNUSED
   - Mediatek clk driver compile test support
   - AT91 PMC clk suspend/resume restoration support
   - PLL issues fixed on si5351
   - Broadcom IProc PLL calculation updates
   - DVFS support for Armada mvebu CPU clks
   - Allwinner fixed post-divider support
   - TI clkctrl fixes and support for newer SoCs"

* tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: (125 commits)
  clk: aspeed: Handle inverse polarity of USB port 1 clock gate
  clk: aspeed: Fix return value check in aspeed_cc_init()
  clk: aspeed: Add reset controller
  clk: aspeed: Register gated clocks
  clk: aspeed: Add platform driver and register PLLs
  clk: aspeed: Register core clocks
  clk: Add clock driver for ASPEED BMC SoCs
  clk: mediatek: adjust dependency of reset.c to avoid unexpectedly being built
  clk: fix reentrancy of clk_enable() on UP systems
  clk: meson-axg: fix potential NULL dereference in axg_clkc_probe()
  clk: Simplify debugfs registration
  clk: Fix debugfs_create_*() usage
  clk: Show symbolic clock flags in debugfs
  clk: renesas: r8a7796: Add FDP clock
  clk: Move __clk_{get,put}() into private clk.h API
  clk: sunxi: Use CLK_IS_CRITICAL flag for critical clks
  clk: Improve flags doc for of_clk_detect_critical()
  arch: Remove clkdev.h asm-generic from Kbuild
  clk: sunxi-ng: a83t: Add M divider to TCON1 clock
  clk: Prepare to remove asm-generic/clkdev.h
  ...

diff --cc arch/cris/include/asm/Kbuild
Simple merge

diff --cc arch/h8300/include/asm/Kbuild
Simple merge

diff --cc arch/m32r/include/asm/Kbuild
index ca83fda8177b9736f5884aa0ba911e3e5d2b28a8,f1b50129150bf034a6e48e5dc2af6d7c0347030f..985ef1d9f556d7759cd21902915b3071343c6234
--- 1/arch/m32r/include/asm/Kbuild
--- 2/arch/m32r/include/asm/Kbuild
+++ b/arch/m32r/include/asm/Kbuild
@@@ -1,6 -1,4 +1,5 @@@
- generic-y += clkdev.h
  generic-y += current.h
 +generic-y += dma-mapping.h
  generic-y += exec.h
  generic-y += extable.h
  generic-y += irq_work.h

diff --cc arch/mips/include/asm/Kbuild
Simple merge

diff --cc arch/riscv/include/asm/Kbuild
Simple merge

diff --cc arch/s390/include/asm/Kbuild
index f6c2ba93b21c0a3e0773aad7b7a8afb6d1f2f6c5,d0abf0bac21b8eb5cf7fe20bdb6c2a6a36b5a35d..e3239772887aa2cb5a1080d6b2f567dfa1049bed
--- 1/arch/s390/include/asm/Kbuild
--- 2/arch/s390/include/asm/Kbuild
+++ b/arch/s390/include/asm/Kbuild
@@@ -1,15 -1,7 +1,14 @@@
 +# SPDX-License-Identifier: GPL-2.0
 +generated-y += dis-defs.h
 +generated-y += facility-defs.h
 +generated-y += syscall_table.h
 +generated-y += unistd_nr.h
 +
  generic-y += asm-offsets.h
  generic-y += cacheflush.h
- generic-y += clkdev.h
  generic-y += device.h
  generic-y += dma-contiguous.h
 +generic-y += dma-mapping.h
  generic-y += div64.h
  generic-y += emergency-restart.h
  generic-y += export.h

diff --cc arch/um/include/asm/Kbuild
index 73c57f614c9e0600a5b4df7b28a7fa55f4abe471,ca536a38486f5e75e5edf134c5675f83432b88ff..bb5a196c3061f278e55a6cf7ffed970891a9cc98
--- 1/arch/um/include/asm/Kbuild
--- 2/arch/um/include/asm/Kbuild
+++ b/arch/um/include/asm/Kbuild
@@@ -1,7 -1,5 +1,6 @@@
  generic-y += barrier.h
 +generic-y += bpf_perf_event.h
  generic-y += bug.h
- generic-y += clkdev.h
  generic-y += current.h
  generic-y += delay.h
  generic-y += device.h

diff --cc drivers/clk/clk.c
Simple merge