[PATCHv10 31/41] ARM: OMAP2+: clock: add support for regmap
From: Tero Kristo <hidden>
Date: 2013-11-26 08:06:12
Also in:
linux-arm-kernel, linux-omap
Subsystem:
arm port, omap clock framework support, omap2+ support, the rest · Maintainers:
Russell King, Paul Walmsley, Aaro Koskinen, Andreas Kemnade, Kevin Hilman, Roger Quadros, Tony Lindgren, Linus Torvalds
Using regmap is required for isolating the actual memory access from the clock code. Now, the driver providing the support for the clock IP block can provide a regmap for this purpose. Signed-off-by: Tero Kristo <redacted> --- arch/arm/mach-omap2/clock.c | 27 ++++++++++++++++++++++++++- arch/arm/mach-omap2/clock.h | 3 +++ 2 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
index 238be3f..1ef6df8 100644
--- a/arch/arm/mach-omap2/clock.c
+++ b/arch/arm/mach-omap2/clock.c@@ -25,7 +25,7 @@ #include <linux/bitops.h> #include <linux/clk-private.h> #include <asm/cpu.h> - +#include <linux/regmap.h> #include <trace/events/power.h>
@@ -56,6 +56,31 @@ u16 cpu_mask; static bool clkdm_control = true; static LIST_HEAD(clk_hw_omap_clocks); +struct regmap *clk_regmaps[CLK_MAX_REGMAPS]; + +void omap2_clk_writel(u32 val, struct clk_hw_omap *clk, void __iomem *reg) +{ + if (clk->flags & REGMAP_ADDRESSING) { + struct clk_omap_reg *r = (struct clk_omap_reg *)® + regmap_write(clk_regmaps[r->index], r->offset, val); + } else { + __raw_writel(val, reg); + } +} + +u32 omap2_clk_readl(struct clk_hw_omap *clk, void __iomem *reg) +{ + u32 val; + + if (clk->flags & REGMAP_ADDRESSING) { + struct clk_omap_reg *r = (struct clk_omap_reg *)® + regmap_read(clk_regmaps[r->index], r->offset, &val); + } else { + val = __raw_readl(reg); + } + + return val; +} /* * Used for clocks that have the same value as the parent clock,
diff --git a/arch/arm/mach-omap2/clock.h b/arch/arm/mach-omap2/clock.h
index cbe5ff7..9595d72 100644
--- a/arch/arm/mach-omap2/clock.h
+++ b/arch/arm/mach-omap2/clock.h@@ -254,6 +254,9 @@ void omap2_clk_print_new_rates(const char *hfclkin_ck_name, const char *core_ck_name, const char *mpu_ck_name); +u32 omap2_clk_readl(struct clk_hw_omap *clk, void __iomem *reg); +void omap2_clk_writel(u32 val, struct clk_hw_omap *clk, void __iomem *reg); + extern u16 cpu_mask; extern const struct clkops clkops_omap2_dflt_wait;
--
1.7.9.5