iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clk: qcom: clk-rpm: Fix clk_hw references

Browse Source 
Fix the clk_hw references to the actual clocks and add a xlate function
to return the hw pointers from the already existing static array.

Reported-by: Michael Scott <michael.scott@linaro.org>
Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
This commit is contained in:
Georgi Djakov 2016-11-23 16:52:49 +02:00 committed by Stephen Boyd
parent 81b7667aac
commit c260524aba
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/clk/qcom/clk-rpm.c
View File

@ -127,8 +127,8 @@ struct clk_rpm {
struct rpm_cc { struct rpm_cc {
struct qcom_rpm *rpm; struct qcom_rpm *rpm;
struct clk_hw_onecell_data data; struct clk_rpm **clks;
struct clk_hw *hws[]; size_t num_clks;
}; };
struct rpm_clk_desc { struct rpm_clk_desc {
@ -391,11 +391,23 @@ static const struct of_device_id rpm_clk_match_table[] = {
}; };
MODULE_DEVICE_TABLE(of, rpm_clk_match_table); MODULE_DEVICE_TABLE(of, rpm_clk_match_table);
static struct clk_hw *qcom_rpm_clk_hw_get(struct of_phandle_args *clkspec,
void *data)
{
struct rpm_cc *rcc = data;
unsigned int idx = clkspec->args[0];
if (idx >= rcc->num_clks) {
pr_err("%s: invalid index %u\n", __func__, idx);
return ERR_PTR(-EINVAL);
}
return rcc->clks[idx] ? &rcc->clks[idx]->hw : ERR_PTR(-ENOENT);
}
static int rpm_clk_probe(struct platform_device *pdev) static int rpm_clk_probe(struct platform_device *pdev)
{ {
struct clk_hw **hws;
struct rpm_cc *rcc; struct rpm_cc *rcc;
struct clk_hw_onecell_data *data;
int ret; int ret;
size_t num_clks, i; size_t num_clks, i;
struct qcom_rpm *rpm; struct qcom_rpm *rpm;
@ -415,14 +427,12 @@ static int rpm_clk_probe(struct platform_device *pdev)
rpm_clks = desc->clks; rpm_clks = desc->clks;
num_clks = desc->num_clks; num_clks = desc->num_clks;
rcc = devm_kzalloc(&pdev->dev, sizeof(*rcc) + sizeof(*hws) * num_clks, rcc = devm_kzalloc(&pdev->dev, sizeof(*rcc), GFP_KERNEL);
GFP_KERNEL);
if (!rcc) if (!rcc)
return -ENOMEM; return -ENOMEM;
hws = rcc->hws; rcc->clks = rpm_clks;
data = &rcc->data; rcc->num_clks = num_clks;
data->num = num_clks;
for (i = 0; i < num_clks; i++) { for (i = 0; i < num_clks; i++) {
if (!rpm_clks[i]) if (!rpm_clks[i])
@ -436,18 +446,16 @@ static int rpm_clk_probe(struct platform_device *pdev)
} }
for (i = 0; i < num_clks; i++) { for (i = 0; i < num_clks; i++) {
if (!rpm_clks[i]) { if (!rpm_clks[i])
data->hws[i] = ERR_PTR(-ENOENT);
continue; continue;
}
ret = devm_clk_hw_register(&pdev->dev, &rpm_clks[i]->hw); ret = devm_clk_hw_register(&pdev->dev, &rpm_clks[i]->hw);
if (ret) if (ret)
goto err; goto err;
} }
ret = of_clk_add_hw_provider(pdev->dev.of_node, of_clk_hw_onecell_get, ret = of_clk_add_hw_provider(pdev->dev.of_node, qcom_rpm_clk_hw_get,
data); rcc);
if (ret) if (ret)
goto err; goto err;