Applied "ASoC: add Component level set_sysclk" to the asoc tree
Mark Brown
maintainerThe patch
ASoC: add Component level set_sysclk
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
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
Quoted 1 line
From
9cfeb53411be7c08d7dd19bc4bf0599a6d211390Mon Sep 17 00:00:00 2001
From: Kuninori Morimoto <[email protected]>
Date: Thu, 24 Aug 2017 00:57:35 +0000
Subject: [PATCH] ASoC: add Component level set_sysclk
In current ALSA SoC, Codec only has set_sysclk feature. Codec will be merged into Component in next generation ALSA SoC, thus current Codec specific feature need to be merged into it. This is glue patch for it.
--- include/sound/soc.h | 29 +++++++++++++++++++++++++++++ sound/soc/soc-core.c | 45 ++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 69 insertions(+), 5 deletions(-)
include/sound/soc.h +29 -0
@@ -799,6 +799,16 @@ struct snd_soc_component_driver {int (*pcm_new)(struct snd_soc_pcm_runtime *);void (*pcm_free)(struct snd_pcm *); +/* component wide operations */ +int (*set_sysclk)(struct snd_soc_component *component, +int clk_id,int source,unsigned int freq,int dir); +int (*set_pll)(struct snd_soc_component *component,int pll_id, +int source,unsigned int freq_in,unsigned int freq_out); + +/* component wide operations */ +int (*set_sysclk)(struct snd_soc_component *component, +int clk_id,int source,unsigned int freq,int dir); +/* DT */ int (*of_xlate_dai_name)(struct snd_soc_component *component, struct of_phandle_args *args,
@@ -871,6 +881,14 @@ struct snd_soc_component {int (*pcm_new)(struct snd_soc_pcm_runtime *);void (*pcm_free)(struct snd_pcm *); +int (*set_sysclk)(struct snd_soc_component *component, +int clk_id,int source,unsigned int freq,int dir); +int (*set_pll)(struct snd_soc_component *component,int pll_id, +int source,unsigned int freq_in,unsigned int freq_out); + +int (*set_sysclk)(struct snd_soc_component *component, +int clk_id,int source,unsigned int freq,int dir); +/* machine specific init */ int (*init)(struct snd_soc_component *component);
@@ -1465,6 +1483,17 @@ void snd_soc_component_async_complete(struct snd_soc_component *component);int snd_soc_component_test_bits (struct snd_soc_component *component,unsigned int reg,unsigned int mask,unsigned int value); +/* component wide operations */ +int snd_soc_component_set_sysclk (struct snd_soc_component *component, +int clk_id,int source,unsigned int freq,int dir); +int snd_soc_component_set_pll (struct snd_soc_component *component,int pll_id, +int source,unsigned int freq_in, +unsigned int freq_out); + +/* component wide operations */ +int snd_soc_component_set_sysclk (struct snd_soc_component *component, +int clk_id,int source,unsigned int freq,int dir); +#ifdef CONFIG_REGMAP void snd_soc_component_init_regmap(struct snd_soc_component *component,
sound/soc/soc-core.c +40 -5
75 lines not on this page · raw message
Signature · 1 line
2.14.1