From: Stephen Boyd <sboyd@kernel.org>
Date: Tue, 29 Mar 2022 17:19:36 +0000 (-0700)
Subject: Merge branches 'clk-range', 'clk-uniphier', 'clk-apple' and 'clk-qcom' into clk-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c64dd8ea8e05af69e9c793419452d19e8e89da15;p=linux.git

Merge branches 'clk-range', 'clk-uniphier', 'clk-apple' and 'clk-qcom' into clk-next

 - Make clk_set_rate_range() re-evaluate the limits each time
 - Introduce various clk_set_rate_range() tests
 - Add clk_drop_range() to drop a previously set range
 - Support for NCO blocks on Apple SoCs

* clk-range:
  clk: Drop the rate range on clk_put()
  clk: test: Test clk_set_rate_range on orphan mux
  clk: Initialize orphan req_rate
  clk: bcm: rpi: Run some clocks at the minimum rate allowed
  clk: bcm: rpi: Set a default minimum rate
  clk: bcm: rpi: Add variant structure
  clk: Add clk_drop_range
  clk: Always set the rate on clk_set_range_rate
  clk: Use clamp instead of open-coding our own
  clk: Always clamp the rounded rate
  clk: Enforce that disjoints limits are invalid
  clk: Introduce Kunit Tests for the framework
  clk: Fix clk_hw_get_clk() when dev is NULL

* clk-uniphier:
  clk: uniphier: Fix fixed-rate initialization

* clk-apple:
  clk: clk-apple-nco: Allow and fix module building
  MAINTAINERS: Add clk-apple-nco under ARM/APPLE MACHINE
  clk: clk-apple-nco: Add driver for Apple NCO
  dt-bindings: clock: Add Apple NCO

* clk-qcom: (61 commits)
  clk: qcom: gcc-msm8994: Fix gpll4 width
  dt-bindings: clock: fix dt_binding_check error for qcom,gcc-other.yaml
  clk: qcom: Add display clock controller driver for SM6125
  dt-bindings: clock: add QCOM SM6125 display clock bindings
  clk: qcom: Fix sorting of SDX_GCC_65 in Makefile and Kconfig
  clk: qcom: gcc: Add emac GDSC support for SM8150
  clk: qcom: gcc: sm8150: Fix some identation issues
  clk: qcom: gcc: Add UFS_CARD and UFS_PHY GDSCs for SM8150
  clk: qcom: gcc: Add PCIe0 and PCIe1 GDSC for SM8150
  clk: qcom: clk-rcg2: Update the frac table for pixel clock
  clk: qcom: clk-rcg2: Update logic to calculate D value for RCG
  clk: qcom: smd: Add missing MSM8998 RPM clocks
  clk: qcom: smd: Add missing RPM clocks for msm8992/4
  dt-bindings: clock: qcom: rpmcc: Add RPM Modem SubSystem (MSS) clocks
  clk: qcom: gcc-ipq806x: add CryptoEngine resets
  dt-bindings: reset: add ipq8064 ce5 resets
  clk: qcom: gcc-ipq806x: add CryptoEngine clocks
  dt-bindings: clock: add ipq8064 ce5 clk define
  clk: qcom: gcc-ipq806x: add additional freq for sdc table
  clk: qcom: clk-rcg: add clk_rcg_floor_ops ops
  ...
---

c64dd8ea8e05af69e9c793419452d19e8e89da15
diff --cc drivers/clk/Kconfig
index a46a8a949ad5c,2ef6eca297ff3,ad4256d543613,65e2f8c04f32f,ad4256d543613..d8c5f30487a99
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@@@@@ -437,12 -428,19 -428,4 -437,4 -428,4 +446,19 @@@@@@ source "drivers/clk/x86/Kconfig
     source "drivers/clk/xilinx/Kconfig"
     source "drivers/clk/zynqmp/Kconfig"
     
  +++# Kunit test cases
+ +++config CLK_KUNIT_TEST
+ +++	tristate "Basic Clock Framework Kunit Tests" if !KUNIT_ALL_TESTS
+ +++	depends on KUNIT
+ +++	default KUNIT_ALL_TESTS
+ +++	help
+ +++	  Kunit tests for the common clock framework.
+ +++
  +++config CLK_GATE_KUNIT_TEST
  +++	tristate "Basic gate type Kunit test" if !KUNIT_ALL_TESTS
  +++	depends on KUNIT
  +++	default KUNIT_ALL_TESTS
  +++	help
  +++	  Kunit test for the basic clk gate type.
  +++
     endif