Commit cb120572 authored Dec 13, 2013 by Tomasz Figa Committed by Olof Johansson Dec 13, 2013

ARM: s3c64xx: dt: Fix boot failure due to double clock initialization



Commit

4178bac4 ARM: call of_clk_init from default time_init handler

added implicit call to of_clk_init() from default time_init callback,
but it did not change platforms calling it from other callbacks, despite
of not having custom time_init callbacks. This caused double clock
initialization on such platforms, leading to boot failures. An example
of such platform is mach-s3c64xx.

This patch fixes boot failure on s3c64xx by dropping custom init_irq
callback, which had a call to of_clk_init() and moving system reset
initialization to init_machine callback. This allows us to have
clocks initialized properly without a need to have custom init_time or
init_irq callbacks.

Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com>
Signed-off-by: Olof Johansson <olof@lixom.net>

parent 6f97dc8d

arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c

+1 −10

Original line number	Diff line number	Diff line
		@@ -8,8 +8,6 @@
		* published by the Free Software Foundation.
		*/

		#include <linux/clk-provider.h>
		#include <linux/irqchip.h>
		#include <linux/of_platform.h>

		#include <asm/mach/arch.h>
		@@ -48,15 +46,9 @@ static void __init s3c64xx_dt_map_io(void)
		panic("SoC is not S3C64xx!");
		}

		static void __init s3c64xx_dt_init_irq(void)
		{
		of_clk_init(NULL);
		samsung_wdt_reset_of_init();
		irqchip_init();
		};

		static void __init s3c64xx_dt_init_machine(void)
		{
		samsung_wdt_reset_of_init();
		of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
		}

		@@ -79,7 +71,6 @@ DT_MACHINE_START(S3C6400_DT, "Samsung S3C64xx (Flattened Device Tree)")
		/* Maintainer: Tomasz Figa <tomasz.figa@gmail.com> */
		.dt_compat = s3c64xx_dt_compat,
		.map_io = s3c64xx_dt_map_io,
		.init_irq = s3c64xx_dt_init_irq,
		.init_machine = s3c64xx_dt_init_machine,
		.restart = s3c64xx_dt_restart,
		MACHINE_END