The RK3576 and the RK3588 use the same NPU block, but with different
numbers of clocks and resets.

Take the number of clocks and resets for each core from soc_data in the
match data, so the driver uses the right count on each SoC.

The RK3588 keeps four clocks and two resets.

A device without match data fails before any resource is allocated.

Signed-off-by: Jiaxing Hu <[email protected]>
---
 drivers/accel/rocket/rocket_core.c |  8 ++++----
 drivers/accel/rocket/rocket_core.h |  6 ++++++
 drivers/accel/rocket/rocket_drv.c  | 18 +++++++++++++++---
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/drivers/accel/rocket/rocket_core.c 
b/drivers/accel/rocket/rocket_core.c
index c1458423cb69..040272573a72 100644
--- a/drivers/accel/rocket/rocket_core.c
+++ b/drivers/accel/rocket/rocket_core.c
@@ -23,7 +23,7 @@ int rocket_core_init(struct rocket_core *core)
 
        core->resets[0].id = "srst_a";
        core->resets[1].id = "srst_h";
-       err = devm_reset_control_bulk_get_exclusive(&pdev->dev, 
ARRAY_SIZE(core->resets),
+       err = devm_reset_control_bulk_get_exclusive(&pdev->dev, 
core->soc->num_resets,
                                                    core->resets);
        if (err)
                return dev_err_probe(dev, err, "failed to get resets for core 
%d\n", core->index);
@@ -32,7 +32,7 @@ int rocket_core_init(struct rocket_core *core)
        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);
+       err = devm_clk_bulk_get(dev, core->soc->num_clks, core->clks);
        if (err)
                return dev_err_probe(dev, err, "failed to get clocks for core 
%d\n", core->index);
 
@@ -106,9 +106,9 @@ void rocket_core_fini(struct rocket_core *core)
 
 void rocket_core_reset(struct rocket_core *core)
 {
-       reset_control_bulk_assert(ARRAY_SIZE(core->resets), core->resets);
+       reset_control_bulk_assert(core->soc->num_resets, core->resets);
 
        udelay(10);
 
-       reset_control_bulk_deassert(ARRAY_SIZE(core->resets), core->resets);
+       reset_control_bulk_deassert(core->soc->num_resets, core->resets);
 }
diff --git a/drivers/accel/rocket/rocket_core.h 
b/drivers/accel/rocket/rocket_core.h
index 01a12664566c..05d34e538e36 100644
--- a/drivers/accel/rocket/rocket_core.h
+++ b/drivers/accel/rocket/rocket_core.h
@@ -35,9 +35,15 @@ enum rocket_clk {
        ROCKET_CLK_MAX,
 };
 
+struct rocket_soc_data {
+       unsigned int num_clks;
+       unsigned int num_resets;
+};
+
 struct rocket_core {
        struct device *dev;
        struct rocket_device *rdev;
+       const struct rocket_soc_data *soc;
        unsigned int index;
 
        int irq;
diff --git a/drivers/accel/rocket/rocket_drv.c 
b/drivers/accel/rocket/rocket_drv.c
index 5d7805c41dc3..1030d8407b78 100644
--- a/drivers/accel/rocket/rocket_drv.c
+++ b/drivers/accel/rocket/rocket_drv.c
@@ -159,8 +159,14 @@ static const struct drm_driver rocket_drm_driver = {
 
 static int rocket_probe(struct platform_device *pdev)
 {
+       const struct rocket_soc_data *soc = 
of_device_get_match_data(&pdev->dev);
        int ret;
 
+       if (!soc) {
+               dev_err(&pdev->dev, "no match data for this device\n");
+               return -ENODEV;
+       }
+
        if (rdev == NULL) {
                /* First core probing, initialize DRM device. */
                rdev = rocket_device_init(drm_dev, &rocket_drm_driver);
@@ -179,6 +185,7 @@ static int rocket_probe(struct platform_device *pdev)
 
        rdev->cores[core].rdev = rdev;
        rdev->cores[core].dev = &pdev->dev;
+       rdev->cores[core].soc = soc;
        rdev->cores[core].index = core;
 
        rdev->num_cores++;
@@ -216,8 +223,13 @@ static void rocket_remove(struct platform_device *pdev)
        }
 }
 
+static const struct rocket_soc_data rk3588_soc_data = {
+       .num_clks = 4,
+       .num_resets = 2,
+};
+
 static const struct of_device_id dt_match[] = {
-       { .compatible = "rockchip,rk3588-rknn-core" },
+       { .compatible = "rockchip,rk3588-rknn-core", .data = &rk3588_soc_data },
        {}
 };
 MODULE_DEVICE_TABLE(of, dt_match);
@@ -243,7 +255,7 @@ static int rocket_device_runtime_resume(struct device *dev)
        if (core < 0)
                return -ENODEV;
 
-       err = clk_bulk_prepare_enable(ARRAY_SIZE(rdev->cores[core].clks), 
rdev->cores[core].clks);
+       err = clk_bulk_prepare_enable(rdev->cores[core].soc->num_clks, 
rdev->cores[core].clks);
        if (err) {
                dev_err(dev, "failed to enable (%d) clocks for core %d\n", err, 
core);
                return err;
@@ -263,7 +275,7 @@ static int rocket_device_runtime_suspend(struct device *dev)
        if (!rocket_job_is_idle(&rdev->cores[core]))
                return -EBUSY;
 
-       clk_bulk_disable_unprepare(ARRAY_SIZE(rdev->cores[core].clks), 
rdev->cores[core].clks);
+       clk_bulk_disable_unprepare(rdev->cores[core].soc->num_clks, 
rdev->cores[core].clks);
 
        return 0;
 }
-- 
2.43.0

Reply via email to