120 lines
3.6 KiB
Diff
120 lines
3.6 KiB
Diff
From 584df97ad3faf621edd820541b131d66a5cf5e83 Mon Sep 17 00:00:00 2001
|
|
From: Sascha Hauer <s.hauer@pengutronix.de>
|
|
Date: Wed, 24 May 2023 10:31:32 +0200
|
|
Subject: [PATCH 392/414] PM / devfreq: rockchip-dfi: Add SoC specific init
|
|
function
|
|
|
|
Move the RK3399 specifics to a SoC specific init function to make
|
|
the way free for supporting other SoCs later.
|
|
|
|
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
|
|
---
|
|
drivers/devfreq/event/rockchip-dfi.c | 48 +++++++++++++++++++---------
|
|
1 file changed, 33 insertions(+), 15 deletions(-)
|
|
|
|
--- a/drivers/devfreq/event/rockchip-dfi.c
|
|
+++ b/drivers/devfreq/event/rockchip-dfi.c
|
|
@@ -17,6 +17,7 @@
|
|
#include <linux/slab.h>
|
|
#include <linux/list.h>
|
|
#include <linux/of.h>
|
|
+#include <linux/of_device.h>
|
|
|
|
#include <soc/rockchip/rk3399_grf.h>
|
|
|
|
@@ -55,27 +56,21 @@ struct rockchip_dfi {
|
|
void __iomem *regs;
|
|
struct regmap *regmap_pmu;
|
|
struct clk *clk;
|
|
+ u32 ddr_type;
|
|
};
|
|
|
|
static void rockchip_dfi_start_hardware_counter(struct devfreq_event_dev *edev)
|
|
{
|
|
struct rockchip_dfi *dfi = devfreq_event_get_drvdata(edev);
|
|
void __iomem *dfi_regs = dfi->regs;
|
|
- u32 val;
|
|
- u32 ddr_type;
|
|
-
|
|
- /* get ddr type */
|
|
- regmap_read(dfi->regmap_pmu, RK3399_PMUGRF_OS_REG2, &val);
|
|
- ddr_type = (val >> RK3399_PMUGRF_DDRTYPE_SHIFT) &
|
|
- RK3399_PMUGRF_DDRTYPE_MASK;
|
|
|
|
/* clear DDRMON_CTRL setting */
|
|
writel_relaxed(CLR_DDRMON_CTRL, dfi_regs + DDRMON_CTRL);
|
|
|
|
/* set ddr type to dfi */
|
|
- if (ddr_type == RK3399_PMUGRF_DDRTYPE_LPDDR3)
|
|
+ if (dfi->ddr_type == RK3399_PMUGRF_DDRTYPE_LPDDR3)
|
|
writel_relaxed(LPDDR3_EN, dfi_regs + DDRMON_CTRL);
|
|
- else if (ddr_type == RK3399_PMUGRF_DDRTYPE_LPDDR4)
|
|
+ else if (dfi->ddr_type == RK3399_PMUGRF_DDRTYPE_LPDDR4)
|
|
writel_relaxed(LPDDR4_EN, dfi_regs + DDRMON_CTRL);
|
|
|
|
/* enable count, use software mode */
|
|
@@ -167,8 +162,26 @@ static const struct devfreq_event_ops ro
|
|
.set_event = rockchip_dfi_set_event,
|
|
};
|
|
|
|
+static int rk3399_dfi_init(struct rockchip_dfi *dfi)
|
|
+{
|
|
+ struct regmap *regmap_pmu = dfi->regmap_pmu;
|
|
+ u32 val;
|
|
+
|
|
+ dfi->clk = devm_clk_get(dfi->dev, "pclk_ddr_mon");
|
|
+ if (IS_ERR(dfi->clk))
|
|
+ return dev_err_probe(dfi->dev, PTR_ERR(dfi->clk),
|
|
+ "Cannot get the clk pclk_ddr_mon\n");
|
|
+
|
|
+ /* get ddr type */
|
|
+ regmap_read(regmap_pmu, RK3399_PMUGRF_OS_REG2, &val);
|
|
+ dfi->ddr_type = (val >> RK3399_PMUGRF_DDRTYPE_SHIFT) &
|
|
+ RK3399_PMUGRF_DDRTYPE_MASK;
|
|
+
|
|
+ return 0;
|
|
+};
|
|
+
|
|
static const struct of_device_id rockchip_dfi_id_match[] = {
|
|
- { .compatible = "rockchip,rk3399-dfi" },
|
|
+ { .compatible = "rockchip,rk3399-dfi", .data = rk3399_dfi_init },
|
|
{ },
|
|
};
|
|
MODULE_DEVICE_TABLE(of, rockchip_dfi_id_match);
|
|
@@ -179,6 +192,12 @@ static int rockchip_dfi_probe(struct pla
|
|
struct rockchip_dfi *dfi;
|
|
struct devfreq_event_desc *desc;
|
|
struct device_node *np = pdev->dev.of_node, *node;
|
|
+ int (*soc_init)(struct rockchip_dfi *dfi);
|
|
+ int ret;
|
|
+
|
|
+ soc_init = of_device_get_match_data(&pdev->dev);
|
|
+ if (!soc_init)
|
|
+ return -EINVAL;
|
|
|
|
dfi = devm_kzalloc(dev, sizeof(*dfi), GFP_KERNEL);
|
|
if (!dfi)
|
|
@@ -188,11 +207,6 @@ static int rockchip_dfi_probe(struct pla
|
|
if (IS_ERR(dfi->regs))
|
|
return PTR_ERR(dfi->regs);
|
|
|
|
- dfi->clk = devm_clk_get(dev, "pclk_ddr_mon");
|
|
- if (IS_ERR(dfi->clk))
|
|
- return dev_err_probe(dev, PTR_ERR(dfi->clk),
|
|
- "Cannot get the clk pclk_ddr_mon\n");
|
|
-
|
|
node = of_parse_phandle(np, "rockchip,pmu", 0);
|
|
if (!node)
|
|
return dev_err_probe(&pdev->dev, -ENODEV, "Can't find pmu_grf registers\n");
|
|
@@ -209,6 +223,10 @@ static int rockchip_dfi_probe(struct pla
|
|
desc->driver_data = dfi;
|
|
desc->name = np->name;
|
|
|
|
+ ret = soc_init(dfi);
|
|
+ if (ret)
|
|
+ return ret;
|
|
+
|
|
dfi->edev = devm_devfreq_event_add_edev(&pdev->dev, desc);
|
|
if (IS_ERR(dfi->edev)) {
|
|
dev_err(&pdev->dev,
|