Commit b86b493e authored by Geert Uytterhoeven's avatar Geert Uytterhoeven

clk: renesas: r8a73a4: Always use readl()/writel()

On arm32, there is no reason to use the (soon deprecated)
clk_readl()/clk_writel().  Hence use the generic readl()/writel()
instead.
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 80275198
...@@ -71,7 +71,7 @@ r8a73a4_cpg_register_clock(struct device_node *np, struct r8a73a4_cpg *cpg, ...@@ -71,7 +71,7 @@ r8a73a4_cpg_register_clock(struct device_node *np, struct r8a73a4_cpg *cpg,
if (!strcmp(name, "main")) { if (!strcmp(name, "main")) {
u32 ckscr = clk_readl(cpg->reg + CPG_CKSCR); u32 ckscr = readl(cpg->reg + CPG_CKSCR);
switch ((ckscr >> 28) & 3) { switch ((ckscr >> 28) & 3) {
case 0: /* extal1 */ case 0: /* extal1 */
...@@ -95,14 +95,14 @@ r8a73a4_cpg_register_clock(struct device_node *np, struct r8a73a4_cpg *cpg, ...@@ -95,14 +95,14 @@ r8a73a4_cpg_register_clock(struct device_node *np, struct r8a73a4_cpg *cpg,
* clock implementation and we currently have no need to change * clock implementation and we currently have no need to change
* the multiplier value. * the multiplier value.
*/ */
u32 value = clk_readl(cpg->reg + CPG_PLL0CR); u32 value = readl(cpg->reg + CPG_PLL0CR);
parent_name = "main"; parent_name = "main";
mult = ((value >> 24) & 0x7f) + 1; mult = ((value >> 24) & 0x7f) + 1;
if (value & BIT(20)) if (value & BIT(20))
div = 2; div = 2;
} else if (!strcmp(name, "pll1")) { } else if (!strcmp(name, "pll1")) {
u32 value = clk_readl(cpg->reg + CPG_PLL1CR); u32 value = readl(cpg->reg + CPG_PLL1CR);
parent_name = "main"; parent_name = "main";
/* XXX: enable bit? */ /* XXX: enable bit? */
...@@ -125,7 +125,7 @@ r8a73a4_cpg_register_clock(struct device_node *np, struct r8a73a4_cpg *cpg, ...@@ -125,7 +125,7 @@ r8a73a4_cpg_register_clock(struct device_node *np, struct r8a73a4_cpg *cpg,
default: default:
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
} }
value = clk_readl(cpg->reg + cr); value = readl(cpg->reg + cr);
switch ((value >> 5) & 7) { switch ((value >> 5) & 7) {
case 0: case 0:
parent_name = "main"; parent_name = "main";
...@@ -161,8 +161,7 @@ r8a73a4_cpg_register_clock(struct device_node *np, struct r8a73a4_cpg *cpg, ...@@ -161,8 +161,7 @@ r8a73a4_cpg_register_clock(struct device_node *np, struct r8a73a4_cpg *cpg,
shift = 0; shift = 0;
} }
div *= 32; div *= 32;
mult = 0x20 - ((clk_readl(cpg->reg + CPG_FRQCRC) >> shift) mult = 0x20 - ((readl(cpg->reg + CPG_FRQCRC) >> shift) & 0x1f);
& 0x1f);
} else { } else {
struct div4_clk *c; struct div4_clk *c;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment