[PATCH v17 01/12] accel/rocket: request the core clocks by name
From: Jiaxing Hu
Date: Fri Nov 13 2026 - 22:07:17 EST
From: Igor Paunovic <royalnet026@xxxxxxxxx>
rocket_core_init() never sets the .id of the clocks, so all four are
requested with a NULL name and each one resolves to the first clock in the
DT, aclk.
As a result aclk is taken and enabled four times, while hclk, pclk and the
NPU compute clock are never enabled by the driver. It only works today
because the power-domain driver enables those clocks for it.
Give the four clocks their names, in the order the binding defines: aclk,
hclk, npu and pclk.
With that, a DT that lacks any of these clock-names fails probe with
-ENOENT instead of running on the wrong clock.
Fixes: ed98261b4168 ("accel/rocket: Add a new driver for Rockchip's NPU")
Signed-off-by: Igor Paunovic <royalnet026@xxxxxxxxx>
Tested-by: Sidong Yang <sidong.yang@xxxxxxxxxx>
Tested-by: Diederik de Haas <diederik@xxxxxxxxxxxxxx> # NanoPC-T6 LTS, NanoPC-T6 Plus
Reviewed-by: Sebastian Reichel <sebastian.reichel@xxxxxxxxxxxxx>
Reviewed-by: Jiaxing Hu <gahing@xxxxxxxxxxxxx>
[Jiaxing: shortened the commit message, named the clock indices]
Signed-off-by: Jiaxing Hu <gahing@xxxxxxxxxxxxx>
Reviewed-by: Heiko Stuebner <heiko@xxxxxxxxx>
---
drivers/accel/rocket/rocket_core.c | 4 ++++
drivers/accel/rocket/rocket_core.h | 10 +++++++++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/drivers/accel/rocket/rocket_core.c b/drivers/accel/rocket/rocket_core.c
index 1b27a2c2f435..c1458423cb69 100644
--- a/drivers/accel/rocket/rocket_core.c
+++ b/drivers/accel/rocket/rocket_core.c
@@ -28,6 +28,10 @@ int rocket_core_init(struct rocket_core *core)
if (err)
return dev_err_probe(dev, err, "failed to get resets for core %d\n", core->index);
+ core->clks[ROCKET_CLK_ACLK].id = "aclk";
+ core->clks[ROCKET_CLK_HCLK].id = "hclk";
+ core->clks[ROCKET_CLK_NPU].id = "npu";
+ core->clks[ROCKET_CLK_PCLK].id = "pclk";
err = devm_clk_bulk_get(dev, ARRAY_SIZE(core->clks), core->clks);
if (err)
return dev_err_probe(dev, err, "failed to get clocks for core %d\n", core->index);
diff --git a/drivers/accel/rocket/rocket_core.h b/drivers/accel/rocket/rocket_core.h
index f6d7382854ca..01a12664566c 100644
--- a/drivers/accel/rocket/rocket_core.h
+++ b/drivers/accel/rocket/rocket_core.h
@@ -27,6 +27,14 @@
#define rocket_core_writel(core, reg, value) \
writel(value, (core)->core_iomem + (REG_CORE_##reg) - REG_CORE_S_STATUS)
+enum rocket_clk {
+ ROCKET_CLK_ACLK,
+ ROCKET_CLK_HCLK,
+ ROCKET_CLK_NPU,
+ ROCKET_CLK_PCLK,
+ ROCKET_CLK_MAX,
+};
+
struct rocket_core {
struct device *dev;
struct rocket_device *rdev;
@@ -36,7 +44,7 @@ struct rocket_core {
void __iomem *pc_iomem;
void __iomem *cna_iomem;
void __iomem *core_iomem;
- struct clk_bulk_data clks[4];
+ struct clk_bulk_data clks[ROCKET_CLK_MAX];
struct reset_control_bulk_data resets[2];
struct iommu_group *iommu_group;
--
2.43.0