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

Commit 32226916 authored by Jiancheng Xue's avatar Jiancheng Xue Committed by Stephen Boyd
Browse files

clk: hisilicon: add hisi_clk_alloc function. 



Before, there was an ordering issue that the clock provider
had been published in hisi_clk_init before it could provide
valid clocks to consumers. hisi_clk_alloc is just used to
allocate memory space for struct hisi_clock_data. It makes
it possible to publish the provider after the clocks are ready.

Signed-off-by: default avatarJiancheng Xue <xuejiancheng@hisilicon.com>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
parent 97b7129c

drivers/clk/hisilicon/clk.c

+29 −0
Original line number Diff line number Diff line
@@ -37,6 +37,35 @@ 


static DEFINE_SPINLOCK(hisi_clk_lock);



struct hisi_clock_data *hisi_clk_alloc(struct platform_device *pdev,

						int nr_clks)

{

	struct hisi_clock_data *clk_data;

	struct resource *res;

	struct clk **clk_table;



	clk_data = devm_kmalloc(&pdev->dev, sizeof(*clk_data), GFP_KERNEL);

	if (!clk_data)

		return NULL;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	clk_data->base = devm_ioremap(&pdev->dev,

				res->start, resource_size(res));

	if (!clk_data->base)

		return NULL;



	clk_table = devm_kmalloc(&pdev->dev, sizeof(struct clk *) * nr_clks,

				GFP_KERNEL);

	if (!clk_table)

		return NULL;



	clk_data->clk_data.clks = clk_table;

	clk_data->clk_data.clk_num = nr_clks;



	return clk_data;

}

EXPORT_SYMBOL_GPL(hisi_clk_alloc);



struct hisi_clock_data *hisi_clk_init(struct device_node *np,

					     int nr_clks)

{

drivers/clk/hisilicon/clk.h

+3 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ 
#include <linux/io.h>

#include <linux/spinlock.h>



struct platform_device;



struct hisi_clock_data {

	struct clk_onecell_data	clk_data;

	void __iomem		*base;
@@ -110,6 +112,7 @@ struct clk *hi6220_register_clkdiv(struct device *dev, const char *name, 
	const char *parent_name, unsigned long flags, void __iomem *reg,

	u8 shift, u8 width, u32 mask_bit, spinlock_t *lock);



struct hisi_clock_data *hisi_clk_alloc(struct platform_device *, int);

struct hisi_clock_data *hisi_clk_init(struct device_node *, int);

void hisi_clk_register_fixed_rate(const struct hisi_fixed_rate_clock *,

				int, struct hisi_clock_data *);