bus: ti-sysc: Handle clockactivity for enable and disable

Modules with clockactivity need it configured during enable.

Tested-by: Keerthy <j-keerthy@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c
index 46a8eb469cb2e0d905148dd06f9a35e7306d4148..31035492f1be44898ed981eecfcee93d35ff54da 100644 (file)
--- a/drivers/bus/ti-sysc.c
+++ b/drivers/bus/ti-sysc.c
@@ -859,6 +859,7 @@ static void sysc_show_registers(struct sysc *ddata)
 }
 
 #define SYSC_IDLE_MASK (SYSC_NR_IDLEMODES - 1)
+#define SYSC_CLOCACT_ICK       2
 
 /* Caller needs to manage sysc_clkdm_deny_idle() and sysc_clkdm_allow_idle() */
 static int sysc_enable_module(struct device *dev)
@@ -874,6 +875,12 @@ static int sysc_enable_module(struct device *dev)
        regbits = ddata->cap->regbits;
        reg = sysc_read(ddata, ddata->offsets[SYSC_SYSCONFIG]);
 
+       /* Set CLOCKACTIVITY, we only use it for ick */
+       if (regbits->clkact_shift >= 0 &&
+           (ddata->cfg.quirks & SYSC_QUIRK_USE_CLOCKACT ||
+            ddata->cfg.sysc_val & BIT(regbits->clkact_shift)))
+               reg |= SYSC_CLOCACT_ICK << regbits->clkact_shift;
+
        /* Set SIDLE mode */
        idlemodes = ddata->cfg.sidlemodes;
        if (!idlemodes || regbits->sidle_shift < 0)