| From e4829ec6f2ecae63102355e3e599ee298aa9a126 Mon Sep 17 00:00:00 2001 |
| From: Geert Uytterhoeven <geert+renesas@glider.be> |
| Date: Wed, 21 Sep 2016 16:31:41 +0200 |
| Subject: [PATCH 163/299] clk: renesas: cpg-mssr: Always use readl()/writel() |
| |
| The Renesas CPG/MSSR driver core uses a mix of clk_readl()/clk_writel() |
| and readl()/writel() to access the clock registers. Settle on the |
| generic readl()/writel(). |
| |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| Acked-by: Stephen Boyd <sboyd@codeaurora.org> |
| (cherry picked from commit c1b5371b72644907a9b81a7cd8eabb32f04466d1) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/clk/renesas/renesas-cpg-mssr.c | 9 ++++----- |
| 1 file changed, 4 insertions(+), 5 deletions(-) |
| |
| --- a/drivers/clk/renesas/renesas-cpg-mssr.c |
| +++ b/drivers/clk/renesas/renesas-cpg-mssr.c |
| @@ -146,12 +146,12 @@ static int cpg_mstp_clock_endisable(stru |
| enable ? "ON" : "OFF"); |
| spin_lock_irqsave(&priv->mstp_lock, flags); |
| |
| - value = clk_readl(priv->base + SMSTPCR(reg)); |
| + value = readl(priv->base + SMSTPCR(reg)); |
| if (enable) |
| value &= ~bitmask; |
| else |
| value |= bitmask; |
| - clk_writel(value, priv->base + SMSTPCR(reg)); |
| + writel(value, priv->base + SMSTPCR(reg)); |
| |
| spin_unlock_irqrestore(&priv->mstp_lock, flags); |
| |
| @@ -159,8 +159,7 @@ static int cpg_mstp_clock_endisable(stru |
| return 0; |
| |
| for (i = 1000; i > 0; --i) { |
| - if (!(clk_readl(priv->base + MSTPSR(reg)) & |
| - bitmask)) |
| + if (!(readl(priv->base + MSTPSR(reg)) & bitmask)) |
| break; |
| cpu_relax(); |
| } |
| @@ -190,7 +189,7 @@ static int cpg_mstp_clock_is_enabled(str |
| struct cpg_mssr_priv *priv = clock->priv; |
| u32 value; |
| |
| - value = clk_readl(priv->base + MSTPSR(clock->index / 32)); |
| + value = readl(priv->base + MSTPSR(clock->index / 32)); |
| |
| return !(value & BIT(clock->index % 32)); |
| } |