From: Sascha Hauer <s.hauer@pengutronix.de>
To: linux-rockchip@lists.infradead.org
Cc: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org,
Heiko Stuebner <heiko@sntech.de>,
Kyungmin Park <kyungmin.park@samsung.com>,
MyungJoo Ham <myungjoo.ham@samsung.com>,
Will Deacon <will@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
kernel@pengutronix.de,
Michael Riesch <michael.riesch@wolfvision.net>,
Robin Murphy <robin.murphy@arm.com>,
Vincent Legoll <vincent.legoll@gmail.com>,
Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Conor Dooley <conor+dt@kernel.org>,
devicetree@vger.kernel.org, Sascha Hauer <s.hauer@pengutronix.de>
Subject: [PATCH v5 10/25] PM / devfreq: rockchip-dfi: Add RK3568 support
Date: Wed, 24 May 2023 10:31:38 +0200 [thread overview]
Message-ID: <20230524083153.2046084-11-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20230524083153.2046084-1-s.hauer@pengutronix.de>
This adds RK3568 support to the DFI driver. Only iniitialization
differs from the currently supported RK3399.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
drivers/devfreq/event/rockchip-dfi.c | 21 +++++++++++++++++++++
include/soc/rockchip/rk3568_grf.h | 12 ++++++++++++
2 files changed, 33 insertions(+)
create mode 100644 include/soc/rockchip/rk3568_grf.h
diff --git a/drivers/devfreq/event/rockchip-dfi.c b/drivers/devfreq/event/rockchip-dfi.c
index 6b3ef97b3be09..261d112580c9e 100644
--- a/drivers/devfreq/event/rockchip-dfi.c
+++ b/drivers/devfreq/event/rockchip-dfi.c
@@ -23,6 +23,7 @@
#include <soc/rockchip/rockchip_grf.h>
#include <soc/rockchip/rk3399_grf.h>
+#include <soc/rockchip/rk3568_grf.h>
#define DMC_MAX_CHANNELS 2
@@ -209,10 +210,30 @@ static int rk3399_dfi_init(struct rockchip_dfi *dfi)
return 0;
};
+static int rk3568_dfi_init(struct rockchip_dfi *dfi)
+{
+ struct regmap *regmap_pmu = dfi->regmap_pmu;
+ u32 reg2, reg3;
+
+ regmap_read(regmap_pmu, RK3568_PMUGRF_OS_REG2, ®2);
+ regmap_read(regmap_pmu, RK3568_PMUGRF_OS_REG3, ®3);
+
+ dfi->ddr_type = FIELD_GET(RK3568_PMUGRF_OS_REG2_DRAMTYPE_INFO, reg2);
+
+ if (FIELD_GET(RK3568_PMUGRF_OS_REG3_SYSREG_VERSION, reg3) >= 0x3)
+ dfi->ddr_type |= FIELD_GET(RK3568_PMUGRF_OS_REG3_DRAMTYPE_INFO_V3, reg3) << 3;
+
+ dfi->channel_mask = 1;
+
+ return 0;
+};
+
static const struct of_device_id rockchip_dfi_id_match[] = {
{ .compatible = "rockchip,rk3399-dfi", .data = rk3399_dfi_init },
+ { .compatible = "rockchip,rk3568-dfi", .data = rk3568_dfi_init },
{ },
};
+
MODULE_DEVICE_TABLE(of, rockchip_dfi_id_match);
static int rockchip_dfi_probe(struct platform_device *pdev)
diff --git a/include/soc/rockchip/rk3568_grf.h b/include/soc/rockchip/rk3568_grf.h
new file mode 100644
index 0000000000000..575584e9d8834
--- /dev/null
+++ b/include/soc/rockchip/rk3568_grf.h
@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+#ifndef __SOC_RK3568_GRF_H
+#define __SOC_RK3568_GRF_H
+
+#define RK3568_PMUGRF_OS_REG2 0x208
+#define RK3568_PMUGRF_OS_REG2_DRAMTYPE_INFO GENMASK(15, 13)
+
+#define RK3568_PMUGRF_OS_REG3 0x20c
+#define RK3568_PMUGRF_OS_REG3_DRAMTYPE_INFO_V3 GENMASK(13, 12)
+#define RK3568_PMUGRF_OS_REG3_SYSREG_VERSION GENMASK(31, 28)
+
+#endif /* __SOC_RK3568_GRF_H */
--
2.39.2
next prev parent reply other threads:[~2023-05-24 8:33 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-24 8:31 [PATCH v5 00/25] Add perf support to the rockchip-dfi driver Sascha Hauer
2023-05-24 8:31 ` [PATCH v5 01/25] PM / devfreq: rockchip-dfi: Make pmu regmap mandatory Sascha Hauer
2023-06-13 16:21 ` Sebastian Reichel
2023-05-24 8:31 ` [PATCH v5 02/25] PM / devfreq: rockchip-dfi: Embed desc into private data struct Sascha Hauer
2023-06-13 16:22 ` Sebastian Reichel
2023-05-24 8:31 ` [PATCH v5 03/25] PM / devfreq: rockchip-dfi: use consistent name for " Sascha Hauer
2023-06-13 16:23 ` Sebastian Reichel
2023-05-24 8:31 ` [PATCH v5 04/25] PM / devfreq: rockchip-dfi: Add SoC specific init function Sascha Hauer
2023-06-13 16:26 ` Sebastian Reichel
2023-05-24 8:31 ` [PATCH v5 05/25] PM / devfreq: rockchip-dfi: dfi store raw values in counter struct Sascha Hauer
2023-06-13 16:28 ` Sebastian Reichel
2023-05-24 8:31 ` [PATCH v5 06/25] PM / devfreq: rockchip-dfi: Use free running counter Sascha Hauer
2023-06-13 16:32 ` Sebastian Reichel
2023-05-24 8:31 ` [PATCH v5 07/25] PM / devfreq: rockchip-dfi: introduce channel mask Sascha Hauer
2023-06-13 16:34 ` Sebastian Reichel
2023-05-24 8:31 ` [PATCH v5 08/25] PM / devfreq: rk3399_dmc,dfi: generalize DDRTYPE defines Sascha Hauer
2023-06-13 16:39 ` Sebastian Reichel
2023-05-24 8:31 ` [PATCH v5 09/25] PM / devfreq: rockchip-dfi: Clean up DDR type register defines Sascha Hauer
2023-06-13 16:46 ` Sebastian Reichel
2023-05-24 8:31 ` Sascha Hauer [this message]
2023-05-24 8:31 ` [PATCH v5 11/25] PM / devfreq: rockchip-dfi: Handle LPDDR2 correctly Sascha Hauer
2023-06-13 16:47 ` Sebastian Reichel
2023-05-24 8:31 ` [PATCH v5 12/25] PM / devfreq: rockchip-dfi: Handle LPDDR4X Sascha Hauer
2023-06-13 16:48 ` Sebastian Reichel
2023-05-24 8:31 ` [PATCH v5 13/25] PM / devfreq: rockchip-dfi: Pass private data struct to internal functions Sascha Hauer
2023-06-13 17:08 ` Sebastian Reichel
2023-05-24 8:31 ` [PATCH v5 14/25] PM / devfreq: rockchip-dfi: Prepare for multiple users Sascha Hauer
2023-06-13 17:15 ` Sebastian Reichel
2023-05-24 8:31 ` [PATCH v5 15/25] PM / devfreq: rockchip-dfi: give variable a better name Sascha Hauer
2023-06-13 17:16 ` Sebastian Reichel
2023-05-24 8:31 ` [PATCH v5 16/25] PM / devfreq: rockchip-dfi: Add perf support Sascha Hauer
2023-06-14 13:29 ` Sebastian Reichel
2023-06-15 13:13 ` Sascha Hauer
2023-05-24 8:31 ` [PATCH v5 17/25] PM / devfreq: rockchip-dfi: make register stride SoC specific Sascha Hauer
2023-06-13 17:17 ` Sebastian Reichel
2023-05-24 8:31 ` [PATCH v5 18/25] PM / devfreq: rockchip-dfi: account for multiple DDRMON_CTRL registers Sascha Hauer
2023-06-13 17:24 ` Sebastian Reichel
2023-05-24 8:31 ` [PATCH v5 19/25] PM / devfreq: rockchip-dfi: add support for RK3588 Sascha Hauer
2023-06-13 16:16 ` Sebastian Reichel
2023-05-24 8:31 ` [PATCH v5 20/25] dt-bindings: devfreq: event: convert Rockchip DFI binding to yaml Sascha Hauer
2023-06-13 23:39 ` Sebastian Reichel
2023-05-24 8:31 ` [PATCH v5 21/25] dt-bindings: devfreq: event: rockchip,dfi: Add rk3568 support Sascha Hauer
2023-05-24 19:42 ` Conor Dooley
2023-05-24 8:31 ` [PATCH v5 22/25] dt-bindings: devfreq: event: rockchip,dfi: Add rk3588 support Sascha Hauer
2023-05-24 19:37 ` Conor Dooley
2023-06-08 20:07 ` Rob Herring
2023-05-24 8:31 ` [PATCH v5 23/25] arm64: dts: rockchip: rk3399: Enable DFI Sascha Hauer
2023-05-24 8:31 ` [PATCH v5 24/25] arm64: dts: rockchip: rk356x: Add DFI Sascha Hauer
2023-05-24 8:31 ` [PATCH v5 25/25] arm64: dts: rockchip: rk3588s: " Sascha Hauer
2023-06-13 16:19 ` Sebastian Reichel
2023-06-14 13:40 ` [PATCH v5 00/25] Add perf support to the rockchip-dfi driver Sebastian Reichel
2023-06-14 14:19 ` Vincent Legoll
2023-06-14 15:27 ` Sebastian Reichel
2023-06-14 19:51 ` Vincent Legoll
2023-06-14 22:18 ` Sebastian Reichel
2023-06-15 6:56 ` Sascha Hauer
2023-06-15 13:27 ` Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230524083153.2046084-11-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=heiko@sntech.de \
--cc=kernel@pengutronix.de \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=kyungmin.park@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=mark.rutland@arm.com \
--cc=michael.riesch@wolfvision.net \
--cc=myungjoo.ham@samsung.com \
--cc=robh+dt@kernel.org \
--cc=robin.murphy@arm.com \
--cc=vincent.legoll@gmail.com \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).