[media] c8sectpfe: Remove clk_disable_unprepare hacks

Now that CLK_PROC_STFE is defined as a critical clock in
DT, we can remove the commented clk_disable_unprepare from
the c8sectpfe driver. This means we now have balanced
clk*enable/disable calls in the driver, but on STiH407
family the clock in reality will never actually be disabled.

This is due to a HW bug where once the IP has been configured
and the SLIM core is running, disabling the clock causes a
unrecoverable bus lockup.

Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Acked-by: Patrice Chotard <patrice.chotard@st.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c b/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c
index 42b123ff2953ba5831a8e626acba1e51f88ea25d..22fd8b91809a0f5af3b066fc880c3e1a66479e18 100644 (file)
--- a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c
+++ b/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c
@@ -885,8 +885,7 @@ static int c8sectpfe_probe(struct platform_device *pdev)
        return 0;
 
 err_clk_disable:
-       /* TODO uncomment when upstream has taken a reference on this clk */
-       /*clk_disable_unprepare(fei->c8sectpfeclk);*/
+       clk_disable_unprepare(fei->c8sectpfeclk);
        return ret;
 }
 
@@ -921,11 +920,8 @@ static int c8sectpfe_remove(struct platform_device *pdev)
        if (readl(fei->io + SYS_OTHER_CLKEN))
                writel(0, fei->io + SYS_OTHER_CLKEN);
 
-       /* TODO uncomment when upstream has taken a reference on this clk */
-       /*
        if (fei->c8sectpfeclk)
                clk_disable_unprepare(fei->c8sectpfeclk);
-       */
 
        return 0;
 }