ARM: at91: soc: Add init_time callback (d2992e51) · Commits · 戴 / test

Introduce an init_time callback to the at91_init_soc structure to be able to tweak the init_time machine callback on a per-soc basis, instead of having to rely on a global one. Signed-off-by:

Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by:

Boris BREZILLON <boris.brezillon@free-electrons.com> Acked-by:

Alexandre Belloni <alexandre.belloni@free-electrons.com> Acked-by:

Daniel Lezcano <daniel.lezcano@linaro.org> Signed-off-by:

Nicolas Ferre <nicolas.ferre@atmel.com> Conflicts: arch/arm/mach-at91/setup.c

arch/arm/mach-at91/generic.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -44,6 +44,7 @@ extern void __init at91_sysirq_mask_rtt(u32 rtt_base);
		extern void __init at91_register_devices(void);

		/* Timer */
		extern void __init at91_init_time(void);
		extern void at91rm9200_ioremap_st(u32 addr);
		extern void at91rm9200_timer_init(void);
		extern void at91sam926x_ioremap_pit(u32 addr);

arch/arm/mach-at91/setup.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -416,3 +416,8 @@ void __init at91_register_devices(void)
		{
		at91_boot_soc.register_devices();
		}

		void __init at91_init_time(void)
		{
		at91_boot_soc.init_time();
		}

arch/arm/mach-at91/soc.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -13,6 +13,7 @@ struct at91_init_soc {
		void (*register_clocks)(void);
		void (*register_devices)(void);
		void (*init)(void);
		void (*init_time)(void);
		};

		extern struct at91_init_soc at91_boot_soc;

Admin message