| Message ID | 20220407191202.46206-1-jmkrzyszt@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] ASoC: ti: osk5912: Make it CCF clk API compatible | expand |
On 07/04/2022 22:12, Janusz Krzysztofik wrote: > 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) Does the changelogn needs to be in the commit message? I almost missed the V2 as it came as a reply to a thread ;) Other than the nitpick with the changlog placement: Looks good but I can not test it, Acked-by: Peter Ujfalusi <peter.ujfalusi@gmail.com> > > Signed-off-by: Janusz Krzysztofik <jmkrzyszt@gmail.com> > --- > 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,
On Thu, 7 Apr 2022 21:12:02 +0200, Janusz Krzysztofik wrote: > 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. > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: ti: osk5912: Make it CCF clk API compatible commit: 90b76a3cb9bf208286851560cfc70830c91c1d3f All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
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,
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> --- sound/soc/ti/osk5912.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)