From: Janusz Krzysztofik jmkrzyszt@gmail.com
The driver, OMAP1 specific, now omits clk_prepare/unprepare() steps, not supported by OMAP1 custom implementation of clock API. However, non-CCF stubs of those functions exist for use on such platforms until converted to CCF.
Update the driver to be compatible with CCF implementation of clock API.
v2: use clk_prepare_enable/clk_disable_unprepare() (Peter)
Signed-off-by: Janusz Krzysztofik jmkrzyszt@gmail.com Signed-off-by: Arnd Bergmann arnd@arndb.de --- sound/soc/ti/osk5912.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/ti/osk5912.c b/sound/soc/ti/osk5912.c index 40e29dda7e7a..2790c8915f55 100644 --- a/sound/soc/ti/osk5912.c +++ b/sound/soc/ti/osk5912.c @@ -27,12 +27,12 @@ static struct clk *tlv320aic23_mclk;
static int osk_startup(struct snd_pcm_substream *substream) { - return clk_enable(tlv320aic23_mclk); + return clk_prepare_enable(tlv320aic23_mclk); }
static void osk_shutdown(struct snd_pcm_substream *substream) { - clk_disable(tlv320aic23_mclk); + clk_disable_unprepare(tlv320aic23_mclk); }
static int osk_hw_params(struct snd_pcm_substream *substream,