aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2018-03-15 05:44:30 -0400
committerGeert Uytterhoeven <geert+renesas@glider.be>2018-03-21 12:34:58 -0400
commitf046d6a6bf2a1f0db5e2f61b5236efb1b6bebfde (patch)
tree6cf36c989be02dc6f225cbef7aeaa2d9cf85219b /drivers
parentfcf371b3517771589819ffefe2aa16b31f0b0a63 (diff)
clk: renesas: sh73a0: 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: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/clk/renesas/clk-sh73a0.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/clk/renesas/clk-sh73a0.c b/drivers/clk/renesas/clk-sh73a0.c
index eea38f6ea77e..6cfa6b519041 100644
--- a/drivers/clk/renesas/clk-sh73a0.c
+++ b/drivers/clk/renesas/clk-sh73a0.c
@@ -85,7 +85,7 @@ sh73a0_cpg_register_clock(struct device_node *np, struct sh73a0_cpg *cpg,
85 85
86 if (!strcmp(name, "main")) { 86 if (!strcmp(name, "main")) {
87 /* extal1, extal1_div2, extal2, extal2_div2 */ 87 /* extal1, extal1_div2, extal2, extal2_div2 */
88 u32 parent_idx = (clk_readl(cpg->reg + CPG_CKSCR) >> 28) & 3; 88 u32 parent_idx = (readl(cpg->reg + CPG_CKSCR) >> 28) & 3;
89 89
90 parent_name = of_clk_get_parent_name(np, parent_idx >> 1); 90 parent_name = of_clk_get_parent_name(np, parent_idx >> 1);
91 div = (parent_idx & 1) + 1; 91 div = (parent_idx & 1) + 1;
@@ -110,11 +110,11 @@ sh73a0_cpg_register_clock(struct device_node *np, struct sh73a0_cpg *cpg,
110 default: 110 default:
111 return ERR_PTR(-EINVAL); 111 return ERR_PTR(-EINVAL);
112 } 112 }
113 if (clk_readl(cpg->reg + CPG_PLLECR) & BIT(enable_bit)) { 113 if (readl(cpg->reg + CPG_PLLECR) & BIT(enable_bit)) {
114 mult = ((clk_readl(enable_reg) >> 24) & 0x3f) + 1; 114 mult = ((readl(enable_reg) >> 24) & 0x3f) + 1;
115 /* handle CFG bit for PLL1 and PLL2 */ 115 /* handle CFG bit for PLL1 and PLL2 */
116 if (enable_bit == 1 || enable_bit == 2) 116 if (enable_bit == 1 || enable_bit == 2)
117 if (clk_readl(enable_reg) & BIT(20)) 117 if (readl(enable_reg) & BIT(20))
118 mult *= 2; 118 mult *= 2;
119 } 119 }
120 } else if (!strcmp(name, "dsi0phy") || !strcmp(name, "dsi1phy")) { 120 } else if (!strcmp(name, "dsi0phy") || !strcmp(name, "dsi1phy")) {
@@ -193,9 +193,9 @@ static void __init sh73a0_cpg_clocks_init(struct device_node *np)
193 return; 193 return;
194 194
195 /* Set SDHI clocks to a known state */ 195 /* Set SDHI clocks to a known state */
196 clk_writel(0x108, cpg->reg + CPG_SD0CKCR); 196 writel(0x108, cpg->reg + CPG_SD0CKCR);
197 clk_writel(0x108, cpg->reg + CPG_SD1CKCR); 197 writel(0x108, cpg->reg + CPG_SD1CKCR);
198 clk_writel(0x108, cpg->reg + CPG_SD2CKCR); 198 writel(0x108, cpg->reg + CPG_SD2CKCR);
199 199
200 for (i = 0; i < num_clks; ++i) { 200 for (i = 0; i < num_clks; ++i) {
201 const char *name; 201 const char *name;