Skip to content

Commit 12dc719

Browse files
lumagGeorgi Djakov
authored andcommitted
clk: qcom: cbf-msm8996: scale CBF clock according to the CPUfreq
Turn CBF into the interconnect provider. Scale CBF frequency (bandwidth) according to CPU frequencies. Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> Tested-by: Yassine Oudjana <y.oudjana@protonmail.com> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Acked-by: Bjorn Andersson <andersson@kernel.org> Link: https://lore.kernel.org/r/20230512001334.2983048-4-dmitry.baryshkov@linaro.org Signed-off-by: Georgi Djakov <djakov@kernel.org>
1 parent 0ac2a08 commit 12dc719

2 files changed

Lines changed: 60 additions & 1 deletion

File tree

drivers/clk/qcom/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ config QCOM_CLK_APCS_MSM8916
4848
config QCOM_CLK_APCC_MSM8996
4949
tristate "MSM8996 CPU Clock Controller"
5050
select QCOM_KRYO_L2_ACCESSORS
51+
select INTERCONNECT_CLK if INTERCONNECT
5152
depends on ARM64
5253
help
5354
Support for the CPU clock controller on msm8996 devices.

drivers/clk/qcom/clk-cbf-8996.c

Lines changed: 59 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,15 @@
55
#include <linux/bitfield.h>
66
#include <linux/clk.h>
77
#include <linux/clk-provider.h>
8+
#include <linux/interconnect-clk.h>
9+
#include <linux/interconnect-provider.h>
810
#include <linux/of.h>
911
#include <linux/module.h>
1012
#include <linux/platform_device.h>
1113
#include <linux/regmap.h>
1214

15+
#include <dt-bindings/interconnect/qcom,msm8996-cbf.h>
16+
1317
#include "clk-alpha-pll.h"
1418
#include "clk-regmap.h"
1519

@@ -223,6 +227,49 @@ static const struct regmap_config cbf_msm8996_regmap_config = {
223227
.val_format_endian = REGMAP_ENDIAN_LITTLE,
224228
};
225229

230+
#ifdef CONFIG_INTERCONNECT
231+
232+
/* Random ID that doesn't clash with main qnoc and OSM */
233+
#define CBF_MASTER_NODE 2000
234+
235+
static int qcom_msm8996_cbf_icc_register(struct platform_device *pdev, struct clk_hw *cbf_hw)
236+
{
237+
struct device *dev = &pdev->dev;
238+
struct clk *clk = devm_clk_hw_get_clk(dev, cbf_hw, "cbf");
239+
const struct icc_clk_data data[] = {
240+
{ .clk = clk, .name = "cbf", },
241+
};
242+
struct icc_provider *provider;
243+
244+
provider = icc_clk_register(dev, CBF_MASTER_NODE, ARRAY_SIZE(data), data);
245+
if (IS_ERR(provider))
246+
return PTR_ERR(provider);
247+
248+
platform_set_drvdata(pdev, provider);
249+
250+
return 0;
251+
}
252+
253+
static int qcom_msm8996_cbf_icc_remove(struct platform_device *pdev)
254+
{
255+
struct icc_provider *provider = platform_get_drvdata(pdev);
256+
257+
icc_clk_unregister(provider);
258+
259+
return 0;
260+
}
261+
#define qcom_msm8996_cbf_icc_sync_state icc_sync_state
262+
#else
263+
static int qcom_msm8996_cbf_icc_register(struct platform_device *pdev, struct clk_hw *cbf_hw)
264+
{
265+
dev_warn(&pdev->dev, "CONFIG_INTERCONNECT is disabled, CBF clock is fixed\n");
266+
267+
return 0;
268+
}
269+
#define qcom_msm8996_cbf_icc_remove(pdev) (0)
270+
#define qcom_msm8996_cbf_icc_sync_state NULL
271+
#endif
272+
226273
static int qcom_msm8996_cbf_probe(struct platform_device *pdev)
227274
{
228275
void __iomem *base;
@@ -281,7 +328,16 @@ static int qcom_msm8996_cbf_probe(struct platform_device *pdev)
281328
if (ret)
282329
return ret;
283330

284-
return devm_of_clk_add_hw_provider(dev, of_clk_hw_simple_get, &cbf_mux.clkr.hw);
331+
ret = devm_of_clk_add_hw_provider(dev, of_clk_hw_simple_get, &cbf_mux.clkr.hw);
332+
if (ret)
333+
return ret;
334+
335+
return qcom_msm8996_cbf_icc_register(pdev, &cbf_mux.clkr.hw);
336+
}
337+
338+
static int qcom_msm8996_cbf_remove(struct platform_device *pdev)
339+
{
340+
return qcom_msm8996_cbf_icc_remove(pdev);
285341
}
286342

287343
static const struct of_device_id qcom_msm8996_cbf_match_table[] = {
@@ -292,9 +348,11 @@ MODULE_DEVICE_TABLE(of, qcom_msm8996_cbf_match_table);
292348

293349
static struct platform_driver qcom_msm8996_cbf_driver = {
294350
.probe = qcom_msm8996_cbf_probe,
351+
.remove = qcom_msm8996_cbf_remove,
295352
.driver = {
296353
.name = "qcom-msm8996-cbf",
297354
.of_match_table = qcom_msm8996_cbf_match_table,
355+
.sync_state = qcom_msm8996_cbf_icc_sync_state,
298356
},
299357
};
300358

0 commit comments

Comments
 (0)