Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: shmobile: sh73a0: disable legacy clock initialization

Disables sh73a0_clock_init() if CCF is enabled.

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

authored by

Ulrich Hecht and committed by
Simon Horman
09bd745b f73e1e28

+4 -1
+4 -1
arch/arm/mach-shmobile/setup-sh73a0.c
··· 763 763 void __init sh73a0_earlytimer_init(void) 764 764 { 765 765 shmobile_init_delay(); 766 + #ifndef CONFIG_COMMON_CLK 766 767 sh73a0_clock_init(); 768 + #endif 767 769 shmobile_earlytimer_init(); 768 770 sh73a0_register_twd(); 769 771 } ··· 784 782 void __init sh73a0_add_standard_devices_dt(void) 785 783 { 786 784 /* clocks are setup late during boot in the case of DT */ 785 + #ifndef CONFIG_COMMON_CLK 787 786 sh73a0_clock_init(); 788 - 787 + #endif 789 788 of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); 790 789 } 791 790