Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 120c1552 authored by Stephen Boyd's avatar Stephen Boyd Committed by Stephen Boyd
Browse files

clk: qcom: Migrate to clk_hw based registration and OF APIs 



Now that we have clk_hw based provider APIs to register clks, we
can get rid of struct clk pointers in this driver, allowing us to
move closer to a clear split of consumer and provider clk APIs.

Signed-off-by: default avatarStephen Boyd <stephen.boyd@linaro.org>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
parent cc671d13

drivers/clk/qcom/clk-regmap.c

+2 −3
Original line number Diff line number Diff line
@@ -101,14 +101,13 @@ EXPORT_SYMBOL_GPL(clk_disable_regmap); 
 * clk_regmap struct via this function so that the regmap is initialized

 * and so that the clock is registered with the common clock framework.

 */

struct clk *devm_clk_register_regmap(struct device *dev,

				     struct clk_regmap *rclk)

int devm_clk_register_regmap(struct device *dev, struct clk_regmap *rclk)

{

	if (dev && dev_get_regmap(dev, NULL))

		rclk->regmap = dev_get_regmap(dev, NULL);

	else if (dev && dev->parent)

		rclk->regmap = dev_get_regmap(dev->parent, NULL);



	return devm_clk_register(dev, &rclk->hw);

	return devm_clk_hw_register(dev, &rclk->hw);

}

EXPORT_SYMBOL_GPL(devm_clk_register_regmap);

drivers/clk/qcom/clk-regmap.h

+1 −2
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ struct clk_regmap { 
int clk_is_enabled_regmap(struct clk_hw *hw);

int clk_enable_regmap(struct clk_hw *hw);

void clk_disable_regmap(struct clk_hw *hw);

struct clk *

devm_clk_register_regmap(struct device *dev, struct clk_regmap *rclk);

int devm_clk_register_regmap(struct device *dev, struct clk_regmap *rclk);



#endif

drivers/clk/qcom/common.c

+32 −26
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ 


struct qcom_cc {

	struct qcom_reset_controller reset;

	struct clk_onecell_data data;

	struct clk *clks[];

	struct clk_regmap **rclks;

	size_t num_rclks;

};



const
@@ -102,8 +102,8 @@ static int _qcom_cc_register_board_clk(struct device *dev, const char *path, 
	struct device_node *clocks_node;

	struct clk_fixed_factor *factor;

	struct clk_fixed_rate *fixed;

	struct clk *clk;

	struct clk_init_data init_data = { };

	int ret;



	clocks_node = of_find_node_by_path("/clocks");

	if (clocks_node)
@@ -121,9 +121,9 @@ static int _qcom_cc_register_board_clk(struct device *dev, const char *path, 
		init_data.name = path;

		init_data.ops = &clk_fixed_rate_ops;



		clk = devm_clk_register(dev, &fixed->hw);

		if (IS_ERR(clk))

			return PTR_ERR(clk);

		ret = devm_clk_hw_register(dev, &fixed->hw);

		if (ret)

			return ret;

	}

	of_node_put(node);
@@ -141,9 +141,9 @@ static int _qcom_cc_register_board_clk(struct device *dev, const char *path, 
		init_data.flags = 0;

		init_data.ops = &clk_fixed_factor_ops;



		clk = devm_clk_register(dev, &factor->hw);

		if (IS_ERR(clk))

			return PTR_ERR(clk);

		ret = devm_clk_hw_register(dev, &factor->hw);

		if (ret)

			return ret;

	}



	return 0;
@@ -174,42 +174,48 @@ int qcom_cc_register_sleep_clk(struct device *dev) 
}

EXPORT_SYMBOL_GPL(qcom_cc_register_sleep_clk);



static struct clk_hw *qcom_cc_clk_hw_get(struct of_phandle_args *clkspec,

					 void *data)

{

	struct qcom_cc *cc = data;

	unsigned int idx = clkspec->args[0];



	if (idx >= cc->num_rclks) {

		pr_err("%s: invalid index %u\n", __func__, idx);

		return ERR_PTR(-EINVAL);

	}



	return cc->rclks[idx] ? &cc->rclks[idx]->hw : ERR_PTR(-ENOENT);

}



int qcom_cc_really_probe(struct platform_device *pdev,

			 const struct qcom_cc_desc *desc, struct regmap *regmap)

{

	int i, ret;

	struct device *dev = &pdev->dev;

	struct clk *clk;

	struct clk_onecell_data *data;

	struct clk **clks;

	struct qcom_reset_controller *reset;

	struct qcom_cc *cc;

	struct gdsc_desc *scd;

	size_t num_clks = desc->num_clks;

	struct clk_regmap **rclks = desc->clks;



	cc = devm_kzalloc(dev, sizeof(*cc) + sizeof(*clks) * num_clks,

			  GFP_KERNEL);

	cc = devm_kzalloc(dev, sizeof(*cc), GFP_KERNEL);

	if (!cc)

		return -ENOMEM;



	clks = cc->clks;

	data = &cc->data;

	data->clks = clks;

	data->clk_num = num_clks;

	cc->rclks = rclks;

	cc->num_rclks = num_clks;



	for (i = 0; i < num_clks; i++) {

		if (!rclks[i]) {

			clks[i] = ERR_PTR(-ENOENT);

		if (!rclks[i])

			continue;

		}

		clk = devm_clk_register_regmap(dev, rclks[i]);

		if (IS_ERR(clk))

			return PTR_ERR(clk);

		clks[i] = clk;



		ret = devm_clk_register_regmap(dev, rclks[i]);

		if (ret)

			return ret;

	}



	ret = of_clk_add_provider(dev->of_node, of_clk_src_onecell_get, data);

	ret = of_clk_add_hw_provider(dev->of_node, qcom_cc_clk_hw_get, cc);

	if (ret)

		return ret;

drivers/clk/qcom/gcc-mdm9615.c

+4 −4
Original line number Diff line number Diff line
@@ -1686,7 +1686,7 @@ static int gcc_mdm9615_probe(struct platform_device *pdev) 
{

	struct device *dev = &pdev->dev;

	struct regmap *regmap;

	struct clk *clk;

	int ret;

	int i;



	regmap = qcom_cc_map(pdev, &gcc_mdm9615_desc);
@@ -1694,9 +1694,9 @@ static int gcc_mdm9615_probe(struct platform_device *pdev) 
		return PTR_ERR(regmap);



	for (i = 0; i < ARRAY_SIZE(gcc_mdm9615_hws); i++) {

		clk = devm_clk_register(dev, gcc_mdm9615_hws[i]);

		if (IS_ERR(clk))

			return PTR_ERR(clk);

		ret = devm_clk_hw_register(dev, gcc_mdm9615_hws[i]);

		if (ret)

			return ret;

	}



	return qcom_cc_really_probe(pdev, &gcc_mdm9615_desc, regmap);

drivers/clk/qcom/gcc-msm8996.c

+4 −5
Original line number Diff line number Diff line
@@ -3447,9 +3447,8 @@ MODULE_DEVICE_TABLE(of, gcc_msm8996_match_table); 


static int gcc_msm8996_probe(struct platform_device *pdev)

{

	struct clk *clk;

	struct device *dev = &pdev->dev;

	int i;

	int i, ret;

	struct regmap *regmap;



	regmap = qcom_cc_map(pdev, &gcc_msm8996_desc);
@@ -3463,9 +3462,9 @@ static int gcc_msm8996_probe(struct platform_device *pdev) 
	regmap_update_bits(regmap, 0x52008, BIT(21), BIT(21));



	for (i = 0; i < ARRAY_SIZE(gcc_msm8996_hws); i++) {

		clk = devm_clk_register(dev, gcc_msm8996_hws[i]);

		if (IS_ERR(clk))

			return PTR_ERR(clk);

		ret = devm_clk_hw_register(dev, gcc_msm8996_hws[i]);

		if (ret)

			return ret;

	}



	return qcom_cc_really_probe(pdev, &gcc_msm8996_desc, regmap);