aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCristian Marussi <[email protected]>2024-04-15 17:36:46 +0100
committerStephen Boyd <[email protected]>2024-04-22 17:17:05 -0700
commita1b8faf8784c434444432008b57274c8935cca5c (patch)
tree2fead1eeedf1bda3814492b0468de23d949e6459
parent2641ee13c449ef76b0c369ae94dd8dd5dc8c2008 (diff)
clk: scmi: Add support for state control restricted clocks
Some exposed SCMI Clocks could be marked as non-supporting state changes. Configure a clk_ops descriptor which does not provide the state change callbacks for such clocks when registering with CLK framework. CC: Michael Turquette <[email protected]> CC: Stephen Boyd <[email protected]> CC: [email protected] Signed-off-by: Cristian Marussi <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Sudeep Holla <[email protected]> Signed-off-by: Stephen Boyd <[email protected]>
-rw-r--r--drivers/clk/clk-scmi.c22
1 files changed, 15 insertions, 7 deletions
diff --git a/drivers/clk/clk-scmi.c b/drivers/clk/clk-scmi.c
index 4b6c43d7f5f3..e70708573965 100644
--- a/drivers/clk/clk-scmi.c
+++ b/drivers/clk/clk-scmi.c
@@ -19,6 +19,7 @@
enum scmi_clk_feats {
SCMI_CLK_ATOMIC_SUPPORTED,
+ SCMI_CLK_STATE_CTRL_SUPPORTED,
SCMI_CLK_FEATS_COUNT
};
@@ -230,15 +231,19 @@ scmi_clk_ops_alloc(struct device *dev, unsigned long feats_key)
* only the prepare/unprepare API, as allowed by the clock framework
* when atomic calls are not available.
*/
- if (feats_key & BIT(SCMI_CLK_ATOMIC_SUPPORTED)) {
- ops->enable = scmi_clk_atomic_enable;
- ops->disable = scmi_clk_atomic_disable;
- ops->is_enabled = scmi_clk_atomic_is_enabled;
- } else {
- ops->prepare = scmi_clk_enable;
- ops->unprepare = scmi_clk_disable;
+ if (feats_key & BIT(SCMI_CLK_STATE_CTRL_SUPPORTED)) {
+ if (feats_key & BIT(SCMI_CLK_ATOMIC_SUPPORTED)) {
+ ops->enable = scmi_clk_atomic_enable;
+ ops->disable = scmi_clk_atomic_disable;
+ } else {
+ ops->prepare = scmi_clk_enable;
+ ops->unprepare = scmi_clk_disable;
+ }
}
+ if (feats_key & BIT(SCMI_CLK_ATOMIC_SUPPORTED))
+ ops->is_enabled = scmi_clk_atomic_is_enabled;
+
/* Rate ops */
ops->recalc_rate = scmi_clk_recalc_rate;
ops->round_rate = scmi_clk_round_rate;
@@ -294,6 +299,9 @@ scmi_clk_ops_select(struct scmi_clk *sclk, bool atomic_capable,
if (atomic_capable && ci->enable_latency <= atomic_threshold_us)
feats_key |= BIT(SCMI_CLK_ATOMIC_SUPPORTED);
+ if (!ci->state_ctrl_forbidden)
+ feats_key |= BIT(SCMI_CLK_STATE_CTRL_SUPPORTED);
+
if (WARN_ON(feats_key >= db_size))
return NULL;