aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/clk/zynq/clkc.c
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2014-02-20 09:55:46 +0100
committerMike Turquette <mturquette@linaro.org>2014-02-25 14:08:48 -0800
commit2c97ec58420d852f3f0ede905b92fbab1df5961c (patch)
tree453bf19321ebbb5e27600a75d7add473c1f0116d /drivers/clk/zynq/clkc.c
parentclk: shmobile: div6: use proper description in kernel doc (diff)
downloadlinux-dev-2c97ec58420d852f3f0ede905b92fbab1df5961c.tar.xz
linux-dev-2c97ec58420d852f3f0ede905b92fbab1df5961c.zip
clk: zynq: Use clk_readl/clk_writel helper function
Do not use readl/writel directly because the whole clk subsystem is using clk_readl/clk_writel functions. Signed-off-by: Michal Simek <michal.simek@xilinx.com> Acked-by: Soren Brinkmann <soren.brinkmann@xilinx.com> Signed-off-by: Mike Turquette <mturquette@linaro.org>
Diffstat (limited to 'drivers/clk/zynq/clkc.c')
-rw-r--r--drivers/clk/zynq/clkc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/zynq/clkc.c b/drivers/clk/zynq/clkc.c
index 09dd0173ea0a..e726c1b11218 100644
--- a/drivers/clk/zynq/clkc.c
+++ b/drivers/clk/zynq/clkc.c
@@ -148,7 +148,7 @@ static void __init zynq_clk_register_fclk(enum zynq_clk fclk,
clks[fclk] = clk_register_gate(NULL, clk_name,
div1_name, CLK_SET_RATE_PARENT, fclk_gate_reg,
0, CLK_GATE_SET_TO_DISABLE, fclk_gate_lock);
- enable_reg = readl(fclk_gate_reg) & 1;
+ enable_reg = clk_readl(fclk_gate_reg) & 1;
if (enable && !enable_reg) {
if (clk_prepare_enable(clks[fclk]))
pr_warn("%s: FCLK%u enable failed\n", __func__,
@@ -277,7 +277,7 @@ static void __init zynq_clk_setup(struct device_node *np)
SLCR_IOPLL_CTRL, 4, 1, 0, &iopll_lock);
/* CPU clocks */
- tmp = readl(SLCR_621_TRUE) & 1;
+ tmp = clk_readl(SLCR_621_TRUE) & 1;
clk = clk_register_mux(NULL, "cpu_mux", cpu_parents, 4,
CLK_SET_RATE_NO_REPARENT, SLCR_ARM_CLK_CTRL, 4, 2, 0,
&armclk_lock);