RE: [PATCH v8 10/26] PM / devfreq: rockchip-dfi: Add RK3568 support
From: "Chanwoo Choi" <cw00.choi@samsung.com>
Date: 2023-10-19 11:46:26
Also in:
linux-devicetree, linux-pm, linux-rockchip, lkml
quoted hunk ↗ jump to hunk
-----Original Message----- From: Sascha Hauer <s.hauer@pengutronix.de> Sent: Wednesday, October 18, 2023 3:17 PM 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 [off-list ref]; Chanwoo Choi [off-list ref]; Kyungmin Park [off-list ref]; MyungJoo Ham [off-list ref]; Will Deacon [off-list ref]; Mark Rutland [off-list ref]; kernel@pengutronix.de; Michael Riesch [off-list ref]; Robin Murphy [off-list ref]; Vincent Legoll [off-list ref]; Rob Herring [off-list ref]; Krzysztof Kozlowski [off-list ref]; Conor Dooley [off-list ref]; devicetree@vger.kernel.org; Sebastian Reichel [off-list ref]; Sascha Hauer [off-list ref] Subject: [PATCH v8 10/26] PM / devfreq: rockchip-dfi: Add RK3568 support 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> --- Notes: Changes since v7: - Add comment to explain << 3 drivers/devfreq/event/rockchip-dfi.c | 27 +++++++++++++++++++++++++++ include/soc/rockchip/rk3568_grf.h | 12 ++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 include/soc/rockchip/rk3568_grf.hdiff --git a/drivers/devfreq/event/rockchip-dfi.cb/drivers/devfreq/event/rockchip-dfi.c index 12f9096879235..571d72d1abd1c 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@@ -211,10 +212,36 @@ 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); + + /* lower 3 bits of the DDR type */ + dfi->ddr_type = FIELD_GET(RK3568_PMUGRF_OS_REG2_DRAMTYPE_INFO,reg2); + + /* + * For version three and higher the upper two bits of the DDR type are + * in RK3568_PMUGRF_OS_REG3 + */ + 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 = BIT(0); + dfi->max_channels = 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
Applied it. Thanks Best Regards, Chanwoo Choi _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel