summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile/board-bockw-reference.c
diff options
context:
space:
mode:
authorUlrich Hecht2015-02-16 17:58:49 +0100
committerSimon Horman2015-02-23 22:40:46 +0100
commit43cbec8577cfd66713416c3ad33a9856edcaffb9 (patch)
tree7e3e0c76b8449c7ffd2f8039c5516c68cfb7a27b /arch/arm/mach-shmobile/board-bockw-reference.c
parentARM: shmobile: r8a7778: Common clock framework DT description (diff)
downloadkernel-qcow2-linux-43cbec8577cfd66713416c3ad33a9856edcaffb9.tar.gz
kernel-qcow2-linux-43cbec8577cfd66713416c3ad33a9856edcaffb9.tar.xz
kernel-qcow2-linux-43cbec8577cfd66713416c3ad33a9856edcaffb9.zip
ARM: shmobile: r8a7778: implement SoC and board CCF support
Disables the legacy clock framework and passes the mode bits to the CPG driver if CCF is enabled. Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/mach-shmobile/board-bockw-reference.c')
-rw-r--r--arch/arm/mach-shmobile/board-bockw-reference.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/board-bockw-reference.c b/arch/arm/mach-shmobile/board-bockw-reference.c
index d649ade4a202..9a74efda3d18 100644
--- a/arch/arm/mach-shmobile/board-bockw-reference.c
+++ b/arch/arm/mach-shmobile/board-bockw-reference.c
@@ -36,7 +36,9 @@ static void __init bockw_init(void)
void __iomem *fpga;
void __iomem *pfc;
+#ifndef CONFIG_COMMON_CLK
r8a7778_clock_init();
+#endif
r8a7778_init_irq_extpin_dt(1);
r8a7778_add_dt_devices();