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

Commit ac82a8b5 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

clk: versatile: Remove CLK_IS_ROOT 



This flag is a no-op now. Remove usage of the flag.

Cc: Pawel Moll <pawel.moll@arm.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
parent 1295e36a

drivers/clk/versatile/clk-icst.c

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ static struct clk *icst_clk_setup(struct device *dev, 


	init.name = name;

	init.ops = &icst_ops;

	init.flags = CLK_IS_ROOT;

	init.flags = 0;

	init.parent_names = (parent_name ? &parent_name : NULL);

	init.num_parents = (parent_name ? 1 : 0);

	icst->map = map;

drivers/clk/versatile/clk-impd1.c

+1 −2
Original line number Diff line number Diff line
@@ -98,8 +98,7 @@ void integrator_impd1_clk_init(void __iomem *base, unsigned int id) 


	/* Register the fixed rate PCLK */

	imc->pclkname = kasprintf(GFP_KERNEL, "lm%x-pclk", id);

	pclk = clk_register_fixed_rate(NULL, imc->pclkname, NULL,

				      CLK_IS_ROOT, 0);

	pclk = clk_register_fixed_rate(NULL, imc->pclkname, NULL, 0, 0);

	imc->pclk = pclk;



	imc->vco1name = kasprintf(GFP_KERNEL, "lm%x-vco1", id);

drivers/clk/versatile/clk-realview.c

+3 −5
Original line number Diff line number Diff line
@@ -56,12 +56,11 @@ void __init realview_clk_init(void __iomem *sysbase, bool is_pb1176) 
	struct clk *clk;



	/* APB clock dummy */

	clk = clk_register_fixed_rate(NULL, "apb_pclk", NULL, CLK_IS_ROOT, 0);

	clk = clk_register_fixed_rate(NULL, "apb_pclk", NULL, 0, 0);

	clk_register_clkdev(clk, "apb_pclk", NULL);



	/* 24 MHz clock */

	clk = clk_register_fixed_rate(NULL, "clk24mhz", NULL, CLK_IS_ROOT,

				24000000);

	clk = clk_register_fixed_rate(NULL, "clk24mhz", NULL, 0, 24000000);

	clk_register_clkdev(clk, NULL, "dev:uart0");

	clk_register_clkdev(clk, NULL, "dev:uart1");

	clk_register_clkdev(clk, NULL, "dev:uart2");
@@ -81,8 +80,7 @@ void __init realview_clk_init(void __iomem *sysbase, bool is_pb1176) 




	/* 1 MHz clock */

	clk = clk_register_fixed_rate(NULL, "clk1mhz", NULL, CLK_IS_ROOT,

				      1000000);

	clk = clk_register_fixed_rate(NULL, "clk1mhz", NULL, 0, 1000000);

	clk_register_clkdev(clk, NULL, "sp804");



	/* ICST VCO clock */

drivers/clk/versatile/clk-vexpress-osc.c

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ static int vexpress_osc_probe(struct platform_device *pdev) 
		init.name = dev_name(&pdev->dev);



	init.ops = &vexpress_osc_ops;

	init.flags = CLK_IS_ROOT;

	init.flags = 0;

	init.num_parents = 0;



	osc->hw.init = &init;