diff options
| author | Ulrich Hecht <ulrich.hecht+renesas@gmail.com> | 2015-01-20 13:51:40 +0100 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2015-02-24 06:37:46 +0900 |
| commit | ccc83dce9d4ebdfc5a74045c5a00518f08884313 (patch) | |
| tree | 1dc81782ecbf43f23ef63316c3839bd16fc2d825 /arch/arm/mach-shmobile | |
| parent | a76809a329d6ebae6cdf995670cc770304e265c0 (diff) | |
| download | linux-stable-ccc83dce9d4ebdfc5a74045c5a00518f08884313.tar.gz linux-stable-ccc83dce9d4ebdfc5a74045c5a00518f08884313.tar.bz2 linux-stable-ccc83dce9d4ebdfc5a74045c5a00518f08884313.zip | |
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>
Diffstat (limited to 'arch/arm/mach-shmobile')
| -rw-r--r-- | arch/arm/mach-shmobile/board-ape6evm-reference.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/board-ape6evm-reference.c b/arch/arm/mach-shmobile/board-ape6evm-reference.c index 3b68370b03a0..dd5bc63aba42 100644 --- a/arch/arm/mach-shmobile/board-ape6evm-reference.c +++ b/arch/arm/mach-shmobile/board-ape6evm-reference.c @@ -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); } |