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

staging: omap-thermal: update clock prepare count

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>

authored by

Eduardo Valentin and committed by
Greg Kroah-Hartman f1d07f33 687ad31c

+5 -5
+5 -5
drivers/staging/omap-thermal/omap-bandgap.c
··· 943 943 944 944 bg_ptr->clk_rate = clk_rate; 945 945 if (OMAP_BANDGAP_HAS(bg_ptr, CLK_CTRL)) 946 - clk_enable(bg_ptr->fclock); 946 + clk_prepare_enable(bg_ptr->fclock); 947 947 948 948 949 949 mutex_init(&bg_ptr->bg_mutex); ··· 1013 1013 1014 1014 disable_clk: 1015 1015 if (OMAP_BANDGAP_HAS(bg_ptr, CLK_CTRL)) 1016 - clk_disable(bg_ptr->fclock); 1016 + clk_disable_unprepare(bg_ptr->fclock); 1017 1017 put_clks: 1018 1018 clk_put(bg_ptr->fclock); 1019 1019 clk_put(bg_ptr->div_clk); ··· 1044 1044 omap_bandgap_power(bg_ptr, false); 1045 1045 1046 1046 if (OMAP_BANDGAP_HAS(bg_ptr, CLK_CTRL)) 1047 - clk_disable(bg_ptr->fclock); 1047 + clk_disable_unprepare(bg_ptr->fclock); 1048 1048 clk_put(bg_ptr->fclock); 1049 1049 clk_put(bg_ptr->div_clk); 1050 1050 ··· 1143 1143 omap_bandgap_power(bg_ptr, false); 1144 1144 1145 1145 if (OMAP_BANDGAP_HAS(bg_ptr, CLK_CTRL)) 1146 - clk_disable(bg_ptr->fclock); 1146 + clk_disable_unprepare(bg_ptr->fclock); 1147 1147 1148 1148 return err; 1149 1149 } ··· 1153 1153 struct omap_bandgap *bg_ptr = dev_get_drvdata(dev); 1154 1154 1155 1155 if (OMAP_BANDGAP_HAS(bg_ptr, CLK_CTRL)) 1156 - clk_enable(bg_ptr->fclock); 1156 + clk_prepare_enable(bg_ptr->fclock); 1157 1157 1158 1158 omap_bandgap_power(bg_ptr, true); 1159 1159