ARM: nomadik: remove mtu initalization from .init_time (4db76343) · Commits · 戴 / test

Nomadik clock initialization is properly done in clk-nomadik since patch "clk: nomadik: set all timers to use 2.4 MHz TIMCLK". Therefore, this patch removes now redundant mtu initialization from .init_time callback. Signed-off-by:

Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Acked-by:

Linus Walleij <linus.walleij@linaro.org>

arch/arm/mach-nomadik/cpu-8815.c

+0 −26

Original line number	Diff line number	Diff line
		@@ -113,36 +113,10 @@ static void cpu8815_restart(enum reboot_mode mode, const char *cmd)
		writel(1, srcbase + 0x18);
		}

		/* Initial value for SRC control register: all timers use MXTAL/8 source */
		#define SRC_CR_INIT_MASK 0x00007fff
		#define SRC_CR_INIT_VAL 0x2aaa8000

		static void __init cpu8815_timer_init_of(void)
		{
		struct device_node *mtu;
		void __iomem *base;
		int irq;
		u32 src_cr;

		/* We need this to be up now */
		nomadik_clk_init();

		mtu = of_find_node_by_path("/mtu@101e2000");
		if (!mtu)
		return;
		base = of_iomap(mtu, 0);
		if (WARN_ON(!base))
		return;
		irq = irq_of_parse_and_map(mtu, 0);

		pr_info("Remapped MTU @ %p, irq: %d\n", base, irq);

		/* Configure timer sources in "system reset controller" ctrl reg */
		src_cr = readl(base);
		src_cr &= SRC_CR_INIT_MASK;
		src_cr \|= SRC_CR_INIT_VAL;
		writel(src_cr, base);

		clocksource_of_init();
		}

Admin message