Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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>

authored by

Peter Griffin and committed by
Mauro Carvalho Chehab
bfc303e7 8be135d0

+1 -5
+1 -5
drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c
··· 885 885 return 0; 886 886 887 887 err_clk_disable: 888 - /* TODO uncomment when upstream has taken a reference on this clk */ 889 - /*clk_disable_unprepare(fei->c8sectpfeclk);*/ 888 + clk_disable_unprepare(fei->c8sectpfeclk); 890 889 return ret; 891 890 } 892 891 ··· 920 921 if (readl(fei->io + SYS_OTHER_CLKEN)) 921 922 writel(0, fei->io + SYS_OTHER_CLKEN); 922 923 923 - /* TODO uncomment when upstream has taken a reference on this clk */ 924 - /* 925 924 if (fei->c8sectpfeclk) 926 925 clk_disable_unprepare(fei->c8sectpfeclk); 927 - */ 928 926 929 927 return 0; 930 928 }