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

Commit 49fc825f authored by Stephen Boyd's avatar Stephen Boyd Committed by Mike Turquette
Browse files

clk: qcom: Consolidate common probe code 



Most of the probe code is the same between all the different
clock controllers. Consolidate the code into a common.c file.
This makes changes to the common probe parts easier and reduces
chances for bugs.

Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarMike Turquette <mturquette@linaro.org>
parent 63589e92

drivers/clk/qcom/Makefile

+1 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_COMMON_CLK_QCOM) += clk-qcom.o



clk-qcom-y += common.o

clk-qcom-y += clk-regmap.o

clk-qcom-y += clk-pll.o

clk-qcom-y += clk-rcg.o

drivers/clk/qcom/common.c

0 → 100644
+99 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.

 *

 * This software is licensed under the terms of the GNU General Public

 * License version 2, as published by the Free Software Foundation, and

 * may be copied, distributed, and modified under those terms.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#include <linux/export.h>

#include <linux/regmap.h>

#include <linux/platform_device.h>

#include <linux/clk-provider.h>

#include <linux/reset-controller.h>



#include "common.h"

#include "clk-regmap.h"

#include "reset.h"



struct qcom_cc {

	struct qcom_reset_controller reset;

	struct clk_onecell_data data;

	struct clk *clks[];

};



int qcom_cc_probe(struct platform_device *pdev, const struct qcom_cc_desc *desc)

{

	void __iomem *base;

	struct resource *res;

	int i, ret;

	struct device *dev = &pdev->dev;

	struct clk *clk;

	struct clk_onecell_data *data;

	struct clk **clks;

	struct regmap *regmap;

	struct qcom_reset_controller *reset;

	struct qcom_cc *cc;

	size_t num_clks = desc->num_clks;

	struct clk_regmap **rclks = desc->clks;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	base = devm_ioremap_resource(dev, res);

	if (IS_ERR(base))

		return PTR_ERR(base);



	regmap = devm_regmap_init_mmio(dev, base, desc->config);

	if (IS_ERR(regmap))

		return PTR_ERR(regmap);



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

			  GFP_KERNEL);

	if (!cc)

		return -ENOMEM;



	clks = cc->clks;

	data = &cc->data;

	data->clks = clks;

	data->clk_num = num_clks;



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

		if (!rclks[i])

			continue;

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

		if (IS_ERR(clk))

			return PTR_ERR(clk);

		clks[i] = clk;

	}



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

	if (ret)

		return ret;



	reset = &cc->reset;

	reset->rcdev.of_node = dev->of_node;

	reset->rcdev.ops = &qcom_reset_ops;

	reset->rcdev.owner = dev->driver->owner;

	reset->rcdev.nr_resets = desc->num_resets;

	reset->regmap = regmap;

	reset->reset_map = desc->resets;

	platform_set_drvdata(pdev, &reset->rcdev);



	ret = reset_controller_register(&reset->rcdev);

	if (ret)

		of_clk_del_provider(dev->of_node);



	return ret;

}

EXPORT_SYMBOL_GPL(qcom_cc_probe);



void qcom_cc_remove(struct platform_device *pdev)

{

	of_clk_del_provider(pdev->dev.of_node);

	reset_controller_unregister(platform_get_drvdata(pdev));

}

EXPORT_SYMBOL_GPL(qcom_cc_remove);

drivers/clk/qcom/common.h

0 → 100644
+34 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2014, The Linux Foundation. All rights reserved.

 *

 * This software is licensed under the terms of the GNU General Public

 * License version 2, as published by the Free Software Foundation, and

 * may be copied, distributed, and modified under those terms.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */

#ifndef __QCOM_CLK_COMMON_H__

#define __QCOM_CLK_COMMON_H__



struct platform_device;

struct regmap_config;

struct clk_regmap;

struct qcom_reset_map;



struct qcom_cc_desc {

	const struct regmap_config *config;

	struct clk_regmap **clks;

	size_t num_clks;

	const struct qcom_reset_map *resets;

	size_t num_resets;

};



extern int qcom_cc_probe(struct platform_device *pdev,

			 const struct qcom_cc_desc *desc);



extern void qcom_cc_remove(struct platform_device *pdev);



#endif

drivers/clk/qcom/gcc-msm8660.c

+11 −76
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <dt-bindings/clock/qcom,gcc-msm8660.h>

#include <dt-bindings/reset/qcom,gcc-msm8660.h>



#include "common.h"

#include "clk-regmap.h"

#include "clk-pll.h"

#include "clk-rcg.h"
@@ -2701,94 +2702,28 @@ static const struct regmap_config gcc_msm8660_regmap_config = { 
	.fast_io	= true,

};



static const struct qcom_cc_desc gcc_msm8660_desc = {

	.config = &gcc_msm8660_regmap_config,

	.clks = gcc_msm8660_clks,

	.num_clks = ARRAY_SIZE(gcc_msm8660_clks),

	.resets = gcc_msm8660_resets,

	.num_resets = ARRAY_SIZE(gcc_msm8660_resets),

};



static const struct of_device_id gcc_msm8660_match_table[] = {

	{ .compatible = "qcom,gcc-msm8660" },

	{ }

};

MODULE_DEVICE_TABLE(of, gcc_msm8660_match_table);



struct qcom_cc {

	struct qcom_reset_controller reset;

	struct clk_onecell_data data;

	struct clk *clks[];

};



static int gcc_msm8660_probe(struct platform_device *pdev)

{

	void __iomem *base;

	struct resource *res;

	int i, ret;

	struct device *dev = &pdev->dev;

	struct clk *clk;

	struct clk_onecell_data *data;

	struct clk **clks;

	struct regmap *regmap;

	size_t num_clks;

	struct qcom_reset_controller *reset;

	struct qcom_cc *cc;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	base = devm_ioremap_resource(dev, res);

	if (IS_ERR(base))

		return PTR_ERR(base);



	regmap = devm_regmap_init_mmio(dev, base, &gcc_msm8660_regmap_config);

	if (IS_ERR(regmap))

		return PTR_ERR(regmap);



	num_clks = ARRAY_SIZE(gcc_msm8660_clks);

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

			  GFP_KERNEL);

	if (!cc)

		return -ENOMEM;



	clks = cc->clks;

	data = &cc->data;

	data->clks = clks;

	data->clk_num = num_clks;



	/* Temporary until RPM clocks supported */

	clk = clk_register_fixed_rate(dev, "cxo", NULL, CLK_IS_ROOT, 19200000);

	if (IS_ERR(clk))

		return PTR_ERR(clk);



	clk = clk_register_fixed_rate(dev, "pxo", NULL, CLK_IS_ROOT, 27000000);

	if (IS_ERR(clk))

		return PTR_ERR(clk);



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

		if (!gcc_msm8660_clks[i])

			continue;

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

		if (IS_ERR(clk))

			return PTR_ERR(clk);

		clks[i] = clk;

	}



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

	if (ret)

		return ret;



	reset = &cc->reset;

	reset->rcdev.of_node = dev->of_node;

	reset->rcdev.ops = &qcom_reset_ops,

	reset->rcdev.owner = THIS_MODULE,

	reset->rcdev.nr_resets = ARRAY_SIZE(gcc_msm8660_resets),

	reset->regmap = regmap;

	reset->reset_map = gcc_msm8660_resets,

	platform_set_drvdata(pdev, &reset->rcdev);



	ret = reset_controller_register(&reset->rcdev);

	if (ret)

		of_clk_del_provider(dev->of_node);



	return ret;

	return qcom_cc_probe(pdev, &gcc_msm8660_desc);

}



static int gcc_msm8660_remove(struct platform_device *pdev)

{

	of_clk_del_provider(pdev->dev.of_node);

	reset_controller_unregister(platform_get_drvdata(pdev));

	qcom_cc_remove(pdev);

	return 0;

}

drivers/clk/qcom/gcc-msm8960.c

+12 −65
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <dt-bindings/clock/qcom,gcc-msm8960.h>

#include <dt-bindings/reset/qcom,gcc-msm8960.h>



#include "common.h"

#include "clk-regmap.h"

#include "clk-pll.h"

#include "clk-rcg.h"
@@ -2875,51 +2876,24 @@ static const struct regmap_config gcc_msm8960_regmap_config = { 
	.fast_io	= true,

};



static const struct qcom_cc_desc gcc_msm8960_desc = {

	.config = &gcc_msm8960_regmap_config,

	.clks = gcc_msm8960_clks,

	.num_clks = ARRAY_SIZE(gcc_msm8960_clks),

	.resets = gcc_msm8960_resets,

	.num_resets = ARRAY_SIZE(gcc_msm8960_resets),

};



static const struct of_device_id gcc_msm8960_match_table[] = {

	{ .compatible = "qcom,gcc-msm8960" },

	{ }

};

MODULE_DEVICE_TABLE(of, gcc_msm8960_match_table);



struct qcom_cc {

	struct qcom_reset_controller reset;

	struct clk_onecell_data data;

	struct clk *clks[];

};



static int gcc_msm8960_probe(struct platform_device *pdev)

{

	void __iomem *base;

	struct resource *res;

	int i, ret;

	struct device *dev = &pdev->dev;

	struct clk *clk;

	struct clk_onecell_data *data;

	struct clk **clks;

	struct regmap *regmap;

	size_t num_clks;

	struct qcom_reset_controller *reset;

	struct qcom_cc *cc;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	base = devm_ioremap_resource(dev, res);

	if (IS_ERR(base))

		return PTR_ERR(base);



	regmap = devm_regmap_init_mmio(dev, base, &gcc_msm8960_regmap_config);

	if (IS_ERR(regmap))

		return PTR_ERR(regmap);



	num_clks = ARRAY_SIZE(gcc_msm8960_clks);

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

			  GFP_KERNEL);

	if (!cc)

		return -ENOMEM;



	clks = cc->clks;

	data = &cc->data;

	data->clks = clks;

	data->clk_num = num_clks;

	struct device *dev = &pdev->dev;



	/* Temporary until RPM clocks supported */

	clk = clk_register_fixed_rate(dev, "cxo", NULL, CLK_IS_ROOT, 19200000);
@@ -2930,39 +2904,12 @@ static int gcc_msm8960_probe(struct platform_device *pdev) 
	if (IS_ERR(clk))

		return PTR_ERR(clk);



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

		if (!gcc_msm8960_clks[i])

			continue;

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

		if (IS_ERR(clk))

			return PTR_ERR(clk);

		clks[i] = clk;

	}



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

	if (ret)

		return ret;



	reset = &cc->reset;

	reset->rcdev.of_node = dev->of_node;

	reset->rcdev.ops = &qcom_reset_ops,

	reset->rcdev.owner = THIS_MODULE,

	reset->rcdev.nr_resets = ARRAY_SIZE(gcc_msm8960_resets),

	reset->regmap = regmap;

	reset->reset_map = gcc_msm8960_resets,

	platform_set_drvdata(pdev, &reset->rcdev);



	ret = reset_controller_register(&reset->rcdev);

	if (ret)

		of_clk_del_provider(dev->of_node);



	return ret;

	return qcom_cc_probe(pdev, &gcc_msm8960_desc);

}



static int gcc_msm8960_remove(struct platform_device *pdev)

{

	of_clk_del_provider(pdev->dev.of_node);

	reset_controller_unregister(platform_get_drvdata(pdev));

	qcom_cc_remove(pdev);

	return 0;

}