summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/clock_common_data.c
diff options
context:
space:
mode:
authorRajendra Nayak <rnayak@ti.com>2012-11-06 23:41:08 +0100
committerPaul Walmsley <paul@pwsan.com>2012-11-13 03:10:20 +0100
commitcb26867ee24a7e32ab72ec28e43456c7571c059a (patch)
treeaaa2d1e32d51014b2a5b7ed32602be8f5178b490 /arch/arm/mach-omap2/clock_common_data.c
parentARM: OMAP2+: clock: add OMAP CCF convenience macros to mach-omap2/clock.h (diff)
downloadlinux-cb26867ee24a7e32ab72ec28e43456c7571c059a.tar.xz
linux-cb26867ee24a7e32ab72ec28e43456c7571c059a.zip
ARM: OMAP4: clock: Add 44xx data using common struct clk
This patch is output from updated omap hw data autogeneration scripts mostly contributed by Mike Turquette, with some later fixes from me. All data is added into a new cclock44xx_data.c file which will be switched with clock44xx_data.c file in a later patch. Signed-off-by: Rajendra Nayak <rnayak@ti.com> [paul@pwsan.com: replace omap2_init_clksel_parent() with omap2_clksel_find_parent_index(); reflowed macros; updated DEFINE_STRUCT_CLK_HW_OMAP macro to include clkdm_name; use macros for clksel mux+gate clocks; many other fixes] [mturquette@ti.com: converted DPLL outputs to HSDIVIDER macro; trace_clk_div_ck has clkdm ops] Signed-off-by: Mike Turquette <mturquette@ti.com> [paul@pwsan.com: fixed the omap-gpmc.fck alias per commit a2e5b90b; fixed several checkpatch issues; moved the dpll3xxx.c clockdomain modifications to another patch] Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/mach-omap2/clock_common_data.c')
-rw-r--r--arch/arm/mach-omap2/clock_common_data.c22
1 files changed, 22 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/clock_common_data.c b/arch/arm/mach-omap2/clock_common_data.c
index b9f3ba68148c..c0d02a97b768 100644
--- a/arch/arm/mach-omap2/clock_common_data.c
+++ b/arch/arm/mach-omap2/clock_common_data.c
@@ -52,6 +52,13 @@ const struct clksel_rate div_1_0_rates[] = {
{ .div = 0 },
};
+const struct clksel_rate div3_1to4_rates[] = {
+ { .div = 1, .val = 0, .flags = RATE_IN_4430 },
+ { .div = 2, .val = 1, .flags = RATE_IN_4430 },
+ { .div = 4, .val = 2, .flags = RATE_IN_4430 },
+ { .div = 0 },
+};
+
const struct clksel_rate div_1_1_rates[] = {
{ .div = 1, .val = 1, .flags = RATE_IN_4430 | RATE_IN_AM33XX },
{ .div = 0 },
@@ -108,6 +115,19 @@ const struct clksel_rate div31_1to31_rates[] = {
};
/* Clocks shared between various OMAP SoCs */
+#ifdef CONFIG_COMMON_CLK
+
+#include <linux/clk-private.h>
+
+static struct clk_ops dummy_ck_ops = {};
+
+struct clk dummy_ck = {
+ .name = "dummy_clk",
+ .ops = &dummy_ck_ops,
+ .flags = CLK_IS_BASIC,
+};
+
+#else
struct clk virt_19200000_ck = {
.name = "virt_19200000_ck",
@@ -120,3 +140,5 @@ struct clk virt_26000000_ck = {
.ops = &clkops_null,
.rate = 26000000,
};
+
+#endif