mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
d989a3256a
Refreshed patches for qualcommb/ipq95xx by running make target/linux/refresh after creating a .config containing: CONFIG_TARGET_qualcommbe=y CONFIG_TARGET_qualcommbe_ipq95xx=y CONFIG_TARGET_qualcommbe_ipq95xx_DEVICE_qcom_rdp433=y Signed-off-by: John Audia <therealgraysky@proton.me> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
77 lines
2.5 KiB
Diff
77 lines
2.5 KiB
Diff
From f45b94ffc5f1204b35b5c695ed265b1385951616 Mon Sep 17 00:00:00 2001
|
|
From: Varadarajan Narayanan <quic_varada@quicinc.com>
|
|
Date: Tue, 30 Apr 2024 12:12:09 +0530
|
|
Subject: [PATCH] interconnect: icc-clk: Specify master/slave ids
|
|
|
|
Presently, icc-clk driver autogenerates the master and slave ids.
|
|
However, devices with multiple nodes on the interconnect could
|
|
have other constraints and may not match with the auto generated
|
|
node ids.
|
|
|
|
Hence, modify the driver to use the master/slave ids provided by
|
|
the caller instead of auto generating.
|
|
|
|
Also, update clk-cbf-8996 accordingly.
|
|
|
|
Acked-by: Georgi Djakov <djakov@kernel.org>
|
|
Signed-off-by: Varadarajan Narayanan <quic_varada@quicinc.com>
|
|
Link: https://lore.kernel.org/r/20240430064214.2030013-2-quic_varada@quicinc.com
|
|
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
|
|
---
|
|
drivers/clk/qcom/clk-cbf-8996.c | 7 ++++++-
|
|
drivers/interconnect/icc-clk.c | 6 +++---
|
|
include/linux/interconnect-clk.h | 2 ++
|
|
3 files changed, 11 insertions(+), 4 deletions(-)
|
|
|
|
--- a/drivers/clk/qcom/clk-cbf-8996.c
|
|
+++ b/drivers/clk/qcom/clk-cbf-8996.c
|
|
@@ -237,7 +237,12 @@ static int qcom_msm8996_cbf_icc_register
|
|
struct device *dev = &pdev->dev;
|
|
struct clk *clk = devm_clk_hw_get_clk(dev, cbf_hw, "cbf");
|
|
const struct icc_clk_data data[] = {
|
|
- { .clk = clk, .name = "cbf", },
|
|
+ {
|
|
+ .clk = clk,
|
|
+ .name = "cbf",
|
|
+ .master_id = MASTER_CBF_M4M,
|
|
+ .slave_id = SLAVE_CBF_M4M,
|
|
+ },
|
|
};
|
|
struct icc_provider *provider;
|
|
|
|
--- a/drivers/interconnect/icc-clk.c
|
|
+++ b/drivers/interconnect/icc-clk.c
|
|
@@ -109,7 +109,7 @@ struct icc_provider *icc_clk_register(st
|
|
for (i = 0, j = 0; i < num_clocks; i++) {
|
|
qp->clocks[i].clk = data[i].clk;
|
|
|
|
- node = icc_node_create(first_id + j);
|
|
+ node = icc_node_create(first_id + data[i].master_id);
|
|
if (IS_ERR(node)) {
|
|
ret = PTR_ERR(node);
|
|
goto err;
|
|
@@ -119,10 +119,10 @@ struct icc_provider *icc_clk_register(st
|
|
node->data = &qp->clocks[i];
|
|
icc_node_add(node, provider);
|
|
/* link to the next node, slave */
|
|
- icc_link_create(node, first_id + j + 1);
|
|
+ icc_link_create(node, first_id + data[i].slave_id);
|
|
onecell->nodes[j++] = node;
|
|
|
|
- node = icc_node_create(first_id + j);
|
|
+ node = icc_node_create(first_id + data[i].slave_id);
|
|
if (IS_ERR(node)) {
|
|
ret = PTR_ERR(node);
|
|
goto err;
|
|
--- a/include/linux/interconnect-clk.h
|
|
+++ b/include/linux/interconnect-clk.h
|
|
@@ -11,6 +11,8 @@ struct device;
|
|
struct icc_clk_data {
|
|
struct clk *clk;
|
|
const char *name;
|
|
+ unsigned int master_id;
|
|
+ unsigned int slave_id;
|
|
};
|
|
|
|
struct icc_provider *icc_clk_register(struct device *dev,
|