Merge branches 'clk-actions-s700', 'clk-exynos-unused', 'clk-qcom-dispcc-845', 'clk...

* clk-actions-s700:
  :  - Actions Semi Owl series S700 SoC clk driver
  clk: actions: Add S700 SoC clock support
  dt-bindings: clock: Add S700 support for Actions Semi Soc's
  clk: actions: Add missing REGMAP_MMIO dependency

* clk-exynos-unused:
  :  - Remove an unused variable from Exynos4412 ISP driver
  clk: samsung: Remove unused mout_user_aclk400_mcuisp_p4x12 variable

* clk-qcom-dispcc-845:
  :  - Qualcomm SDM845 display clock controller
  clk: qcom: Add display clock controller driver for SDM845
  dt-bindings: clock: Introduce QCOM Display clock bindings
  clk: qcom: Move frequency table macro to common file

* clk-scmi-round:
  :  - Fix a thinko bug in SCMI clk division logic
  clk: scmi: Fix the rounding of clock rate

* clk-cs2000-spdx:
  clk: cs2000-cp: convert to SPDX identifiers

diff --cc drivers/clk/qcom/Kconfig
Simple merge

diff --cc drivers/clk/qcom/Makefile
index 599ab9154480be068b8c30ec88af2e9ebcc343f7,762c01137c2fa456702baaf00550dd408954a246,762c01137c2fa456702baaf00550dd408954a246,2b041b2db30aa6db0245718683372f9b7873882a,762c01137c2fa456702baaf00550dd408954a246,762c01137c2fa456702baaf00550dd408954a246..21a45035930d04531d39f0ece1ea9df490e2a3a2
--- 1/drivers/clk/qcom/Makefile
--- 2/drivers/clk/qcom/Makefile
--- 3/drivers/clk/qcom/Makefile
--- 4/drivers/clk/qcom/Makefile
--- 5/drivers/clk/qcom/Makefile
--- 6/drivers/clk/qcom/Makefile
+++ b/drivers/clk/qcom/Makefile
@@@@@@@ -37,8 -37,7 -37,7 -37,8 -37,7 -37,7 +37,9 @@@@@@@ obj-$(CONFIG_MSM_MMCC_8996) += mmcc-msm
      obj-$(CONFIG_QCOM_A53PLL) += a53-pll.o
      obj-$(CONFIG_QCOM_CLK_APCS_MSM8916) += apcs-msm8916.o
      obj-$(CONFIG_QCOM_CLK_RPM) += clk-rpm.o
 +++++obj-$(CONFIG_QCOM_CLK_RPMH) += clk-rpmh.o
      obj-$(CONFIG_QCOM_CLK_SMD_RPM) += clk-smd-rpm.o
+++ ++obj-$(CONFIG_SDM_DISPCC_845) += dispcc-sdm845.o
      obj-$(CONFIG_SDM_GCC_845) += gcc-sdm845.o
      obj-$(CONFIG_SDM_VIDEOCC_845) += videocc-sdm845.o
      obj-$(CONFIG_SPMI_PMIC_CLKDIV) += clk-spmi-pmic-div.o

diff --cc drivers/clk/qcom/gcc-sdm845.c
Simple merge