clk: renesas: rcar-gen3: Restore R clock during resume

On R-Car Gen3 systems, PSCI system suspend powers down the SoC, losing
clock configuration.  Register a notifier to save/restore the RCKCR
register during system suspend/resume.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Tested-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>

diff --git a/drivers/clk/renesas/rcar-gen3-cpg.c b/drivers/clk/renesas/rcar-gen3-cpg.c
index 267b5629e3bdb173c748bd29d5940e6ed60e477c..0904886f55015a3bdf309f7bdb38add0fd08a7e3 100644 (file)
--- a/drivers/clk/renesas/rcar-gen3-cpg.c
+++ b/drivers/clk/renesas/rcar-gen3-cpg.c
@@ -373,18 +373,27 @@ struct clk * __init rcar_gen3_cpg_clk_register(struct device *dev,
 
        case CLK_TYPE_GEN3_R:
                if (cpg_quirks & RCKCR_CKSEL) {
+                       struct cpg_simple_notifier *csn;
+
+                       csn = kzalloc(sizeof(*csn), GFP_KERNEL);
+                       if (!csn)
+                               return ERR_PTR(-ENOMEM);
+
+                       csn->reg = base + CPG_RCKCR;
+
                        /*
                         * RINT is default.
                         * Only if EXTALR is populated, we switch to it.
                         */
-                       value = readl(base + CPG_RCKCR) & 0x3f;
+                       value = readl(csn->reg) & 0x3f;
 
                        if (clk_get_rate(clks[cpg_clk_extalr])) {
                                parent = clks[cpg_clk_extalr];
                                value |= BIT(15);
                        }
 
-                       writel(value, base + CPG_RCKCR);
+                       writel(value, csn->reg);
+                       cpg_simple_notifier_register(notifiers, csn);
                        break;
                }