Commit e11fc795 authored by Simon Horman's avatar Simon Horman Committed by Simon Horman

ARM: shmobile: only call rcar_gen2_clocks_init() if present

The RZ/G1M (r8a7743) uses the R-Car Gen2 core, but not the R-Car Gen2 clock
driver. This is a harbinger of a transition for R-Car Gen2 SoCs. As the
process to get all the required pieces in place is somewhat complex it
seems useful to try to disentangle dependencies where possible.

The approach here is to temporarily disable calling rcar_gen2_clocks_init()
if no R-Car Gen2 SoC are configured and thus the symbol will not be
present.
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
Acked-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
parent 9255f6fd
......@@ -15,6 +15,7 @@
* GNU General Public License for more details.
*/
#include <linux/clk-provider.h>
#include <linux/clk/renesas.h>
#include <linux/clocksource.h>
#include <linux/device.h>
......@@ -130,7 +131,15 @@ void __init rcar_gen2_timer_init(void)
iounmap(base);
#endif /* CONFIG_ARM_ARCH_TIMER */
rcar_gen2_clocks_init(mode);
if (IS_ENABLED(CONFIG_ARCH_R8A7790) ||
IS_ENABLED(CONFIG_ARCH_R8A7791) ||
IS_ENABLED(CONFIG_ARCH_R8A7792) ||
IS_ENABLED(CONFIG_ARCH_R8A7793) ||
IS_ENABLED(CONFIG_ARCH_R8A7794))
rcar_gen2_clocks_init(mode);
else
of_clk_init(NULL);
clocksource_probe();
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment