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

Commit 9f1205d7 authored by Sebastian Hesselbarth's avatar Sebastian Hesselbarth
Browse files

ARM: bcm2835: remove custom .init_time hook 



With arch/arm calling of_clk_init(NULL) from time_init(), we can now
remove custom .init_time hooks. Also remove call to of_clk_init from
clk-bcm2835 with core fixed_clock match, as this has already been
registered now.

Signed-off-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: default avatarStephen Warren <swarren@wwwdotorg.org>
Acked-by: default avatarMike Turquette <mturquette@linaro.org>
parent 2881764d

arch/arm/mach-bcm2835/bcm2835.c

+0 −2
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#include <linux/of_address.h>

#include <linux/of_platform.h>

#include <linux/clk/bcm2835.h>

#include <linux/clocksource.h>



#include <asm/mach/arch.h>

#include <asm/mach/map.h>
@@ -134,7 +133,6 @@ DT_MACHINE_START(BCM2835, "BCM2835") 
	.init_irq = bcm2835_init_irq,

	.handle_irq = bcm2835_handle_irq,

	.init_machine = bcm2835_init,

	.init_time = clocksource_of_init,

	.restart = bcm2835_restart,

	.dt_compat = bcm2835_compat

MACHINE_END

drivers/clk/clk-bcm2835.c

+0 −8
Original line number Diff line number Diff line
@@ -20,14 +20,8 @@ 
#include <linux/clk-provider.h>

#include <linux/clkdev.h>

#include <linux/clk/bcm2835.h>

#include <linux/clk-provider.h>

#include <linux/of.h>



static const struct of_device_id clk_match[] __initconst = {

	{ .compatible = "fixed-clock", .data = of_fixed_clk_setup, },

	{ }

};



/*

 * These are fixed clocks. They're probably not all root clocks and it may

 * be possible to turn them on and off but until this is mapped out better
@@ -63,6 +57,4 @@ void __init bcm2835_init_clocks(void) 
	ret = clk_register_clkdev(clk, NULL, "20215000.uart");

	if (ret)

		pr_err("uart1_pclk alias not registered\n");



	of_clk_init(clk_match);

}