A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-13 16:16:15 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "clk: qcom: common: only register reset controllers which define resets"

Browse source
This commit is contained in:
qctecmdr 2019-09-05 16:17:11 -07:00 • committed by Gerrit - the friendly Code Review server
commit cb7871deb1
1 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

23
drivers/clk/qcom/common.c
View file

@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.
* Copyright (c) 2013-2014, 2017-2019, The Linux Foundation.
* All rights reserved.
*/
#include <linux/export.h>
@ -21,6 +22,8 @@ struct qcom_cc {
struct qcom_reset_controller reset;
struct clk_regmap **rclks;
size_t num_rclks;
struct clk_hw **clk_hws;
size_t num_clk_hws;
};
const
@ -213,6 +216,9 @@ static struct clk_hw *qcom_cc_clk_hw_get(struct of_phandle_args *clkspec,
struct qcom_cc *cc = data;
unsigned int idx = clkspec->args[0];
if (idx < cc->num_clk_hws && cc->clk_hws[idx])
return cc->clk_hws[idx];
if (idx >= cc->num_rclks) {
pr_err("%s: invalid index %u\n", __func__, idx);
return ERR_PTR(-EINVAL);
@ -246,9 +252,11 @@ int qcom_cc_really_probe(struct platform_device *pdev,
reset->regmap = regmap;
reset->reset_map = desc->resets;
ret = devm_reset_controller_register(dev, &reset->rcdev);
if (ret)
return ret;
if (desc->num_resets) {
ret = devm_reset_controller_register(dev, &reset->rcdev);
if (ret)
return ret;
}
if (desc->gdscs && desc->num_gdscs) {
scd = devm_kzalloc(dev, sizeof(*scd), GFP_KERNEL);
@ -268,10 +276,15 @@ int qcom_cc_really_probe(struct platform_device *pdev,
cc->rclks = rclks;
cc->num_rclks = num_clks;
cc->clk_hws = clk_hws;
cc->num_clk_hws = num_clk_hws;
qcom_cc_drop_protected(dev, cc);
for (i = 0; i < num_clk_hws; i++) {
if (!clk_hws[i])
continue;
ret = devm_clk_hw_register(dev, clk_hws[i]);
if (ret)
return ret;