diff options
author | Ulrich Hecht <ulrich.hecht+renesas@gmail.com> | 2015-02-16 17:58:49 +0100 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2015-02-24 06:40:46 +0900 |
commit | 43cbec8577cfd66713416c3ad33a9856edcaffb9 (patch) | |
tree | 7e3e0c76b8449c7ffd2f8039c5516c68cfb7a27b /arch/arm/mach-shmobile/setup-r8a7778.c | |
parent | 93aa970d2b0ce41efb7e5e6b94aaa66e8349a510 (diff) | |
download | op-kernel-dev-43cbec8577cfd66713416c3ad33a9856edcaffb9.zip op-kernel-dev-43cbec8577cfd66713416c3ad33a9856edcaffb9.tar.gz |
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/setup-r8a7778.c')
-rw-r--r-- | arch/arm/mach-shmobile/setup-r8a7778.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/setup-r8a7778.c b/arch/arm/mach-shmobile/setup-r8a7778.c index cef8895..c49aa09 100644 --- a/arch/arm/mach-shmobile/setup-r8a7778.c +++ b/arch/arm/mach-shmobile/setup-r8a7778.c @@ -15,6 +15,7 @@ * GNU General Public License for more details. */ +#include <linux/clk/shmobile.h> #include <linux/kernel.h> #include <linux/io.h> #include <linux/irqchip/arm-gic.h> @@ -41,6 +42,21 @@ #include "irqs.h" #include "r8a7778.h" +#define MODEMR 0xffcc0020 + +#ifdef CONFIG_COMMON_CLK +static void __init r8a7778_timer_init(void) +{ + u32 mode; + void __iomem *modemr = ioremap_nocache(MODEMR, 4); + + BUG_ON(!modemr); + mode = ioread32(modemr); + iounmap(modemr); + r8a7778_clocks_init(mode); +} +#endif + /* SCIF */ #define R8A7778_SCIF(index, baseaddr, irq) \ static struct plat_sci_port scif##index##_platform_data = { \ @@ -608,6 +624,9 @@ DT_MACHINE_START(R8A7778_DT, "Generic R8A7778 (Flattened Device Tree)") .init_early = shmobile_init_delay, .init_irq = r8a7778_init_irq_dt, .init_late = shmobile_init_late, +#ifdef CONFIG_COMMON_CLK + .init_time = r8a7778_timer_init, +#endif .dt_compat = r8a7778_compat_dt, MACHINE_END |