ARM: nomadik: remove custom .init_time hook
With arch/arm calling of_clk_init(NULL) from time_init(), we can now remove custom .init_time hooks. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Acked-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Родитель
dd03ee9ae5
Коммит
e70ded64e6
|
@ -25,8 +25,6 @@
|
||||||
#include <linux/slab.h>
|
#include <linux/slab.h>
|
||||||
#include <linux/irq.h>
|
#include <linux/irq.h>
|
||||||
#include <linux/dma-mapping.h>
|
#include <linux/dma-mapping.h>
|
||||||
#include <linux/clk-provider.h>
|
|
||||||
#include <linux/clocksource.h>
|
|
||||||
#include <linux/of_irq.h>
|
#include <linux/of_irq.h>
|
||||||
#include <linux/of_gpio.h>
|
#include <linux/of_gpio.h>
|
||||||
#include <linux/of_address.h>
|
#include <linux/of_address.h>
|
||||||
|
@ -113,12 +111,6 @@ static void cpu8815_restart(enum reboot_mode mode, const char *cmd)
|
||||||
writel(1, srcbase + 0x18);
|
writel(1, srcbase + 0x18);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void __init cpu8815_timer_init_of(void)
|
|
||||||
{
|
|
||||||
of_clk_init(NULL);
|
|
||||||
clocksource_of_init();
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct fsmc_nand_timings cpu8815_nand_timings = {
|
static struct fsmc_nand_timings cpu8815_nand_timings = {
|
||||||
.thiz = 0,
|
.thiz = 0,
|
||||||
.thold = 0x10,
|
.thold = 0x10,
|
||||||
|
@ -232,7 +224,6 @@ static const char * cpu8815_board_compat[] = {
|
||||||
|
|
||||||
DT_MACHINE_START(NOMADIK_DT, "Nomadik STn8815")
|
DT_MACHINE_START(NOMADIK_DT, "Nomadik STn8815")
|
||||||
.map_io = cpu8815_map_io,
|
.map_io = cpu8815_map_io,
|
||||||
.init_time = cpu8815_timer_init_of,
|
|
||||||
.init_machine = cpu8815_init_of,
|
.init_machine = cpu8815_init_of,
|
||||||
.restart = cpu8815_restart,
|
.restart = cpu8815_restart,
|
||||||
.dt_compat = cpu8815_board_compat,
|
.dt_compat = cpu8815_board_compat,
|
||||||
|
|
Загрузка…
Ссылка в новой задаче