[PATCH] clk: ux500: Power the AB8500 ULP PLL from VintCore12
From: Linus Walleij
Date: Fri Nov 20 2026 - 04:02:50 EST
The AB8500 ULP PLL draws power from VintCore12.
Enable the supply before requesting ULPCLK and release it only after
clearing the request. This keeps the rail on for every ULPCLK consumer
without forcing it on when the PLL is idle.
The AB8505 does not have this requirement, the change only affects
the AB8500.
Fixes: 312f0f0b9a4e ("clk: ux500: abx500: Define clock tree for ab850x")
Signed-off-by: Linus Walleij <linusw@xxxxxxxxxx>
---
The corresponding bindings change hits the MFD subsystem, see:
https://lore.kernel.org/mfd/20261120-ux500-mfd-ulp-pll-supply-binding-v1-1-2740b61bd839@xxxxxxxxxx/
---
drivers/clk/ux500/abx500-clk.c | 20 +++++++++------
drivers/clk/ux500/clk-sysctrl.c | 54 ++++++++++++++++++++++++++++++++++-------
drivers/clk/ux500/clk.h | 4 ++-
3 files changed, 60 insertions(+), 18 deletions(-)
diff --git a/drivers/clk/ux500/abx500-clk.c b/drivers/clk/ux500/abx500-clk.c
index b2ddbf08fca4..1cf94d0ebcda 100644
--- a/drivers/clk/ux500/abx500-clk.c
+++ b/drivers/clk/ux500/abx500-clk.c
@@ -11,6 +11,7 @@
#include <linux/device.h>
#include <linux/of.h>
#include <linux/platform_device.h>
+#include <linux/regulator/consumer.h>
#include <linux/mfd/abx500/ab8500.h>
#include <linux/mfd/abx500/ab8500-sysctrl.h>
#include <linux/clkdev.h>
@@ -24,7 +25,7 @@ static struct clk *ab8500_clks[AB8500_NUM_CLKS];
static struct clk_onecell_data ab8500_clk_data;
/* Clock definitions for ab8500 */
-static int ab8500_reg_clks(struct device *dev)
+static int ab8500_reg_clks(struct device *dev, struct regulator *vintcore)
{
int ret;
struct clk *clk;
@@ -64,7 +65,7 @@ static int ab8500_reg_clks(struct device *dev)
clk = clk_reg_sysctrl_gate_fixed_rate(dev, "ulpclk", NULL,
AB8500_SYSULPCLKCTRL1, AB8500_SYSULPCLKCTRL1_ULPCLKREQ,
AB8500_SYSULPCLKCTRL1_ULPCLKREQ,
- 38400000, 9000, 0);
+ 38400000, 9000, 0, vintcore);
ab8500_clks[AB8500_SYSCLK_ULP] = clk;
/* ab8500_intclk */
@@ -90,16 +91,19 @@ static int ab8500_reg_clks(struct device *dev)
static int abx500_clk_probe(struct platform_device *pdev)
{
struct ab8500 *parent = dev_get_drvdata(pdev->dev.parent);
- int ret;
-
- if (is_ab8500(parent) || is_ab8505(parent)) {
- ret = ab8500_reg_clks(&pdev->dev);
- } else {
+ struct regulator *vintcore = NULL;
+
+ if (is_ab8500(parent)) {
+ vintcore = devm_regulator_get(&pdev->dev, "vintcore");
+ if (IS_ERR(vintcore))
+ return dev_err_probe(&pdev->dev, PTR_ERR(vintcore),
+ "failed to get ULP PLL supply\n");
+ } else if (!is_ab8505(parent)) {
dev_err(&pdev->dev, "non supported plf id\n");
return -ENODEV;
}
- return ret;
+ return ab8500_reg_clks(&pdev->dev, vintcore);
}
static const struct of_device_id abx500_clk_match[] = {
diff --git a/drivers/clk/ux500/clk-sysctrl.c b/drivers/clk/ux500/clk-sysctrl.c
index 2127a949e56c..aaa7278e5d38 100644
--- a/drivers/clk/ux500/clk-sysctrl.c
+++ b/drivers/clk/ux500/clk-sysctrl.c
@@ -8,6 +8,7 @@
#include <linux/clk-provider.h>
#include <linux/mfd/abx500/ab8500-sysctrl.h>
+#include <linux/regulator/consumer.h>
#include <linux/device.h>
#include <linux/slab.h>
#include <linux/delay.h>
@@ -22,6 +23,9 @@
struct clk_sysctrl {
struct clk_hw hw;
struct device *dev;
+ struct regulator *supply;
+ /* A failed unprepare can leave our regulator enable reference held. */
+ bool supply_ref_held;
u8 parent_index;
u16 reg_sel[SYSCTRL_MAX_NUM_PARENTS];
u8 reg_mask[SYSCTRL_MAX_NUM_PARENTS];
@@ -32,27 +36,56 @@ struct clk_sysctrl {
/* Sysctrl clock operations. */
+static void clk_sysctrl_disable_supply(struct clk_sysctrl *clk)
+{
+ if (!clk->supply_ref_held)
+ return;
+
+ if (regulator_disable(clk->supply))
+ dev_err(clk->dev, "failed to disable supply for %s\n",
+ clk_hw_get_name(&clk->hw));
+ else
+ clk->supply_ref_held = false;
+}
+
static int clk_sysctrl_prepare(struct clk_hw *hw)
{
- int ret;
struct clk_sysctrl *clk = to_clk_sysctrl(hw);
+ bool take_supply_ref = clk->supply && !clk->supply_ref_held;
+ int ret;
+
+ if (take_supply_ref) {
+ ret = regulator_enable(clk->supply);
+ if (ret)
+ return ret;
+ clk->supply_ref_held = true;
+ }
ret = ab8500_sysctrl_write(clk->reg_sel[0], clk->reg_mask[0],
clk->reg_bits[0]);
+ if (ret) {
+ if (take_supply_ref)
+ clk_sysctrl_disable_supply(clk);
+ return ret;
+ }
- if (!ret && clk->enable_delay_us)
+ if (clk->enable_delay_us)
usleep_range(clk->enable_delay_us, clk->enable_delay_us +
(clk->enable_delay_us >> 2));
- return ret;
+ return 0;
}
static void clk_sysctrl_unprepare(struct clk_hw *hw)
{
struct clk_sysctrl *clk = to_clk_sysctrl(hw);
- if (ab8500_sysctrl_clear(clk->reg_sel[0], clk->reg_mask[0]))
+
+ if (ab8500_sysctrl_clear(clk->reg_sel[0], clk->reg_mask[0])) {
dev_err(clk->dev, "clk_sysctrl: %s fail to clear %s.\n",
__func__, clk_hw_get_name(hw));
+ return;
+ }
+ clk_sysctrl_disable_supply(clk);
}
static unsigned long clk_sysctrl_recalc_rate(struct clk_hw *hw,
@@ -125,7 +158,8 @@ static struct clk *clk_reg_sysctrl(struct device *dev,
unsigned long rate,
unsigned long enable_delay_us,
unsigned long flags,
- const struct clk_ops *clk_sysctrl_ops)
+ const struct clk_ops *clk_sysctrl_ops,
+ struct regulator *supply)
{
struct clk_init_data clk_sysctrl_init = {};
struct clk_sysctrl *clk;
@@ -160,6 +194,7 @@ static struct clk *clk_reg_sysctrl(struct device *dev,
clk->rate = rate;
clk->enable_delay_us = enable_delay_us;
clk->dev = dev;
+ clk->supply = supply;
clk_sysctrl_init.name = name;
clk_sysctrl_init.ops = clk_sysctrl_ops;
@@ -189,7 +224,7 @@ struct clk *clk_reg_sysctrl_gate(struct device *dev,
return clk_reg_sysctrl(dev, name, parent_names, num_parents,
®_sel, ®_mask, ®_bits, 0, enable_delay_us,
- flags, &clk_sysctrl_gate_ops);
+ flags, &clk_sysctrl_gate_ops, NULL);
}
struct clk *clk_reg_sysctrl_gate_fixed_rate(struct device *dev,
@@ -200,7 +235,8 @@ struct clk *clk_reg_sysctrl_gate_fixed_rate(struct device *dev,
u8 reg_bits,
unsigned long rate,
unsigned long enable_delay_us,
- unsigned long flags)
+ unsigned long flags,
+ struct regulator *supply)
{
const char **parent_names = (parent_name ? &parent_name : NULL);
u8 num_parents = (parent_name ? 1 : 0);
@@ -208,7 +244,7 @@ struct clk *clk_reg_sysctrl_gate_fixed_rate(struct device *dev,
return clk_reg_sysctrl(dev, name, parent_names, num_parents,
®_sel, ®_mask, ®_bits,
rate, enable_delay_us, flags,
- &clk_sysctrl_gate_fixed_rate_ops);
+ &clk_sysctrl_gate_fixed_rate_ops, supply);
}
struct clk *clk_reg_sysctrl_set_parent(struct device *dev,
@@ -222,5 +258,5 @@ struct clk *clk_reg_sysctrl_set_parent(struct device *dev,
{
return clk_reg_sysctrl(dev, name, parent_names, num_parents,
reg_sel, reg_mask, reg_bits, 0, 0, flags,
- &clk_sysctrl_set_parent_ops);
+ &clk_sysctrl_set_parent_ops, NULL);
}
diff --git a/drivers/clk/ux500/clk.h b/drivers/clk/ux500/clk.h
index 91003cf8003c..08ba094322b0 100644
--- a/drivers/clk/ux500/clk.h
+++ b/drivers/clk/ux500/clk.h
@@ -14,6 +14,7 @@
struct clk;
struct clk_hw;
+struct regulator;
struct clk *clk_reg_prcc_pclk(const char *name,
const char *parent_name,
@@ -82,7 +83,8 @@ struct clk *clk_reg_sysctrl_gate_fixed_rate(struct device *dev,
u8 reg_bits,
unsigned long rate,
unsigned long enable_delay_us,
- unsigned long flags);
+ unsigned long flags,
+ struct regulator *supply);
struct clk *clk_reg_sysctrl_set_parent(struct device *dev,
const char *name,
---
base-commit: 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4
change-id: 20261120-ux500-clk-power-upll-6df1e5454aaf
Best regards,
--
Linus Walleij <linusw@xxxxxxxxxx>