android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clk: versatile: add versatile OSC support

Browse Source 
Versatile platforms share the same OSC programming model as Integrator
platforms. Add the necessary parameters and init functions for Versatile.

Renaming the file to clk-versatile.c as versatile is used as the family
name for ARM, Ltd. boards.

Signed-off-by: Rob Herring <robh@kernel.org>
Acked-by: Mike Turquette <mturquette@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Rob Herring 2014-03-01 22:05:44 -06:00
parent 2e45278592
commit a54c959d8b
2 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/clk/versatile/Makefile
View File

@ -1,6 +1,5 @@
# Makefile for Versatile-specific clocks # Makefile for Versatile-specific clocks
obj-$(CONFIG_ICST) += clk-icst.o obj-$(CONFIG_ICST) += clk-icst.o clk-versatile.o
obj-$(CONFIG_ARCH_INTEGRATOR) += clk-integrator.o
obj-$(CONFIG_INTEGRATOR_IMPD1) += clk-impd1.o obj-$(CONFIG_INTEGRATOR_IMPD1) += clk-impd1.o
obj-$(CONFIG_ARCH_REALVIEW) += clk-realview.o obj-$(CONFIG_ARCH_REALVIEW) += clk-realview.o
obj-$(CONFIG_ARCH_VEXPRESS) += clk-vexpress.o obj-$(CONFIG_ARCH_VEXPRESS) += clk-vexpress.o

38
drivers/clk/versatile/clk-integrator.c → drivers/clk/versatile/clk-versatile.c
View File

@ -1,5 +1,6 @@
/* /*
* Clock driver for the ARM Integrator/AP and Integrator/CP boards * Clock driver for the ARM Integrator/AP, Integrator/CP, Versatile AB and
* Versatile PB boards.
* Copyright (C) 2012 Linus Walleij * Copyright (C) 2012 Linus Walleij
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -17,6 +18,9 @@
#define INTEGRATOR_HDR_LOCK_OFFSET 0x14 #define INTEGRATOR_HDR_LOCK_OFFSET 0x14
#define VERSATILE_SYS_OSCCLCD_OFFSET 0x1c
#define VERSATILE_SYS_LOCK_OFFSET 0x20
/* Base offset for the core module */ /* Base offset for the core module */
static void __iomem *cm_base; static void __iomem *cm_base;
@ -37,11 +41,27 @@ static const struct clk_icst_desc __initdata cm_auxosc_desc = {
.lock_offset = INTEGRATOR_HDR_LOCK_OFFSET, .lock_offset = INTEGRATOR_HDR_LOCK_OFFSET,
}; };
static void __init of_integrator_cm_osc_setup(struct device_node *np) static const struct icst_params versatile_auxosc_params = {
.vco_max = ICST307_VCO_MAX,
.vco_min = ICST307_VCO_MIN,
.vd_min = 4 + 8,
.vd_max = 511 + 8,
.rd_min = 1 + 2,
.rd_max = 127 + 2,
.s2div = icst307_s2div,
.idx2s = icst307_idx2s,
};
static const struct clk_icst_desc versatile_auxosc_desc __initconst = {
.params = &versatile_auxosc_params,
.vco_offset = VERSATILE_SYS_OSCCLCD_OFFSET,
.lock_offset = VERSATILE_SYS_LOCK_OFFSET,
};
static void __init cm_osc_setup(struct device_node *np,
const struct clk_icst_desc *desc)
{ {
struct clk *clk = ERR_PTR(-EINVAL); struct clk *clk = ERR_PTR(-EINVAL);
const char *clk_name = np->name; const char *clk_name = np->name;
const struct clk_icst_desc *desc = &cm_auxosc_desc;
const char *parent_name; const char *parent_name;
if (!cm_base) { if (!cm_base) {
@ -65,5 +85,17 @@ static void __init of_integrator_cm_osc_setup(struct device_node *np)
if (!IS_ERR(clk)) if (!IS_ERR(clk))
of_clk_add_provider(np, of_clk_src_simple_get, clk); of_clk_add_provider(np, of_clk_src_simple_get, clk);
} }
static void __init of_integrator_cm_osc_setup(struct device_node *np)
{
cm_osc_setup(np, &cm_auxosc_desc);
}
CLK_OF_DECLARE(integrator_cm_auxosc_clk, CLK_OF_DECLARE(integrator_cm_auxosc_clk,
"arm,integrator-cm-auxosc", of_integrator_cm_osc_setup); "arm,integrator-cm-auxosc", of_integrator_cm_osc_setup);
static void __init of_versatile_cm_osc_setup(struct device_node *np)
{
cm_osc_setup(np, &versatile_auxosc_desc);
}
CLK_OF_DECLARE(versatile_cm_auxosc_clk,
"arm,versatile-cm-auxosc", of_versatile_cm_osc_setup);