Commit ccc83dce authored Jan 20, 2015 by Ulrich Hecht Committed by Simon Horman Feb 24, 2015

ARM: shmobile: ape6evm: Disable legacy clock initialization



Disables r8a73a4_clock_init() if CCF is enabled.

Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

parent a76809a3

arch/arm/mach-shmobile/board-ape6evm-reference.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -29,7 +29,7 @@

		static void __init ape6evm_add_standard_devices(void)
		{

		#ifndef CONFIG_COMMON_CLK
		struct clk *parent;
		struct clk *mp;

		@@ -43,6 +43,7 @@ static void __init ape6evm_add_standard_devices(void)
		clk_set_parent(mp, parent);
		clk_put(parent);
		clk_put(mp);
		#endif

		of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
		}