evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: omap-thermal: update clock prepare count

Browse source 
This patch changes the clock management code to also update
the clock prepare counter, this way we won't skip the enable/disable
operation due to prepare dependencies.

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Eduardo Valentin 2013-02-26 18:53:38 -04:00 • committed by Greg Kroah-Hartman
parent 687ad31ca3
commit f1d07f3332
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/staging/omap-thermal/omap-bandgap.c
View file

@ -943,7 +943,7 @@ int omap_bandgap_probe(struct platform_device *pdev)
bg_ptr->clk_rate = clk_rate; bg_ptr->clk_rate = clk_rate;
if (OMAP_BANDGAP_HAS(bg_ptr, CLK_CTRL)) if (OMAP_BANDGAP_HAS(bg_ptr, CLK_CTRL))
clk_enable(bg_ptr->fclock); clk_prepare_enable(bg_ptr->fclock);
mutex_init(&bg_ptr->bg_mutex); mutex_init(&bg_ptr->bg_mutex);
@ -1013,7 +1013,7 @@ int omap_bandgap_probe(struct platform_device *pdev)
disable_clk: disable_clk:
if (OMAP_BANDGAP_HAS(bg_ptr, CLK_CTRL)) if (OMAP_BANDGAP_HAS(bg_ptr, CLK_CTRL))
clk_disable(bg_ptr->fclock); clk_disable_unprepare(bg_ptr->fclock);
put_clks: put_clks:
clk_put(bg_ptr->fclock); clk_put(bg_ptr->fclock);
clk_put(bg_ptr->div_clk); clk_put(bg_ptr->div_clk);
@ -1044,7 +1044,7 @@ int omap_bandgap_remove(struct platform_device *pdev)
omap_bandgap_power(bg_ptr, false); omap_bandgap_power(bg_ptr, false);
if (OMAP_BANDGAP_HAS(bg_ptr, CLK_CTRL)) if (OMAP_BANDGAP_HAS(bg_ptr, CLK_CTRL))
clk_disable(bg_ptr->fclock); clk_disable_unprepare(bg_ptr->fclock);
clk_put(bg_ptr->fclock); clk_put(bg_ptr->fclock);
clk_put(bg_ptr->div_clk); clk_put(bg_ptr->div_clk);
@ -1143,7 +1143,7 @@ static int omap_bandgap_suspend(struct device *dev)
omap_bandgap_power(bg_ptr, false); omap_bandgap_power(bg_ptr, false);
if (OMAP_BANDGAP_HAS(bg_ptr, CLK_CTRL)) if (OMAP_BANDGAP_HAS(bg_ptr, CLK_CTRL))
clk_disable(bg_ptr->fclock); clk_disable_unprepare(bg_ptr->fclock);
return err; return err;
} }
@ -1153,7 +1153,7 @@ static int omap_bandgap_resume(struct device *dev)
struct omap_bandgap *bg_ptr = dev_get_drvdata(dev); struct omap_bandgap *bg_ptr = dev_get_drvdata(dev);
if (OMAP_BANDGAP_HAS(bg_ptr, CLK_CTRL)) if (OMAP_BANDGAP_HAS(bg_ptr, CLK_CTRL))
clk_enable(bg_ptr->fclock); clk_prepare_enable(bg_ptr->fclock);
omap_bandgap_power(bg_ptr, true); omap_bandgap_power(bg_ptr, true);