ASoC: dapm: Only power up active channels from a DAI
Subsystems (5)
Charles Keepax
maintainerPATCH 1/2 ASoC: dapm: Only power up active channels from a DAI
Currently all widgets attached to a DAI link will be powered up when the DAI is active, however this may include routes that are not actually in use if there are unused channels available on the DAI.
The macros for creating AIF widgets already include an entry for slot, it is proposed to change that to channel. The effective difference here being respresenting the logical channel index rather than the physical slot index. The CODECs currently using the slot entry on the DAPM_AIF macros are using it in a manner consistent with this, the CODECs not using it just have the field set to zero.
A variable is added to snd_soc_dapm_widget to represent this channel index and then for each AIF widget attached to a DAI this is compared against the number of channels on the stream. Enabling the links for those which will be in use. This has the nice property that the CODECs which haven't used the slot/channel entry in the macro will function exactly as before due to all the AIF widgets having a channel of zero and a stream by definition having at least one channel.
--- include/sound/soc-dapm.h | 22 +++++++++----- sound/soc/soc-dapm.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++ sound/soc/soc-pcm.c | 4 +++ 3 files changed, 94 insertions(+), 8 deletions(-)
include/sound/soc-dapm.h +14 -8
@@ -214,21 +214,21 @@ struct device; .event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD}/* stream domain */ -#define SND_SOC_DAPM_AIF_IN (wname, stname, wslot, wreg, wshift, winvert) \ +#define SND_SOC_DAPM_AIF_IN (wname, stname, wchan, wreg, wshift, winvert) \ { .id = snd_soc_dapm_aif_in, .name = wname, .sname = stname, \ - SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), } -#define SND_SOC_DAPM_AIF_IN_E (wname, stname, wslot, wreg, wshift, winvert, \ + .channel = wchan, SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), } +#define SND_SOC_DAPM_AIF_IN_E (wname, stname, wchan, wreg, wshift, winvert, \ wevent, wflags) \ { .id = snd_soc_dapm_aif_in, .name = wname, .sname = stname, \ - SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \ + .channel = wchan, SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \ .event = wevent, .event_flags = wflags } -#define SND_SOC_DAPM_AIF_OUT (wname, stname, wslot, wreg, wshift, winvert) \ +#define SND_SOC_DAPM_AIF_OUT (wname, stname, wchan, wreg, wshift, winvert) \ { .id = snd_soc_dapm_aif_out, .name = wname, .sname = stname, \ - SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), } -#define SND_SOC_DAPM_AIF_OUT_E (wname, stname, wslot, wreg, wshift, winvert, \ + .channel = wchan, SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), } +#define SND_SOC_DAPM_AIF_OUT_E (wname, stname, wchan, wreg, wshift, winvert, \ wevent, wflags) \ { .id = snd_soc_dapm_aif_out, .name = wname, .sname = stname, \ - SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \ + .channel = wchan, SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \ .event = wevent, .event_flags = wflags }#define SND_SOC_DAPM_DAC (wname, stname, wreg, wshift, winvert) \ { .id = snd_soc_dapm_dac, .name = wname, .sname = stname, \
@@ -407,6 +407,10 @@ int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm,int snd_soc_dapm_link_dai_widgets (struct snd_soc_card *card);void snd_soc_dapm_connect_dai_link_widgets (struct snd_soc_card *card); +int snd_soc_dapm_update_dai (struct snd_pcm_substream *substream, +struct snd_pcm_hw_params *params, +struct snd_soc_dai *dai); +/* dapm path setup */ int snd_soc_dapm_new_widgets (struct snd_soc_card *card);void snd_soc_dapm_free (struct snd_soc_dapm_context *dapm);
@@ -627,6 +631,8 @@ struct snd_soc_dapm_widget {int endpoints[2 ];struct clk *clk; + +int channel; };struct snd_soc_dapm_update {
sound/soc/soc-dapm.c +76 -0
94 lines not on this page · raw message
sound/soc/soc-pcm.c +4 -0
@@ -969,6 +969,8 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream, codec_dai->channels =params_channels (&codec_params); codec_dai->sample_bits =snd_pcm_format_physical_width (params_format (&codec_params)); + +snd_soc_dapm_update_dai (substream, &codec_params, codec_dai); } ret =soc_dai_hw_params (substream, params, cpu_dai);
@@ -998,6 +1000,8 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream, cpu_dai->sample_bits =snd_pcm_format_physical_width (params_format (params)); +snd_soc_dapm_update_dai (substream, params, cpu_dai); + ret =soc_pcm_params_symmetry (substream, params);if (ret) goto component_err;
Signature · 1 line
2.11.0
Charles Keepax
maintainerPATCH 2/2 ASoC: arizona: Add channel numbers to AIFs
Set the channel number on each AIF widget to allow unused channels not to be powered up across AIFs.
--- sound/soc/codecs/cs47l24.c | 52 +++++++++++++++--------------- sound/soc/codecs/wm5102.c | 64 ++++++++++++++++++------------------- sound/soc/codecs/wm5110.c | 80 +++++++++++++++++++++++----------------------- sound/soc/codecs/wm8997.c | 60 +++++++++++++++++----------------- sound/soc/codecs/wm8998.c | 60 +++++++++++++++++----------------- 5 files changed, 158 insertions(+), 158 deletions(-)
sound/soc/codecs/cs47l24.c +26 -26
@@ -500,72 +500,72 @@ SND_SOC_DAPM_MUX("AEC Loopback", ARIZONA_DAC_AEC_CONTROL_1,SND_SOC_DAPM_AIF_OUT ("AIF1TX1" ,NULL ,0 ,ARIZONA_AIF1_TX_ENABLES ,ARIZONA_AIF1TX1_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_OUT ("AIF1TX2" ,NULL ,0 , +SND_SOC_DAPM_AIF_OUT ("AIF1TX2" ,NULL ,1 ,ARIZONA_AIF1_TX_ENABLES ,ARIZONA_AIF1TX2_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_OUT ("AIF1TX3" ,NULL ,0 , +SND_SOC_DAPM_AIF_OUT ("AIF1TX3" ,NULL ,2 ,ARIZONA_AIF1_TX_ENABLES ,ARIZONA_AIF1TX3_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_OUT ("AIF1TX4" ,NULL ,0 , +SND_SOC_DAPM_AIF_OUT ("AIF1TX4" ,NULL ,3 ,ARIZONA_AIF1_TX_ENABLES ,ARIZONA_AIF1TX4_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_OUT ("AIF1TX5" ,NULL ,0 , +SND_SOC_DAPM_AIF_OUT ("AIF1TX5" ,NULL ,4 ,ARIZONA_AIF1_TX_ENABLES ,ARIZONA_AIF1TX5_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_OUT ("AIF1TX6" ,NULL ,0 , +SND_SOC_DAPM_AIF_OUT ("AIF1TX6" ,NULL ,5 ,ARIZONA_AIF1_TX_ENABLES ,ARIZONA_AIF1TX6_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_OUT ("AIF1TX7" ,NULL ,0 , +SND_SOC_DAPM_AIF_OUT ("AIF1TX7" ,NULL ,6 ,ARIZONA_AIF1_TX_ENABLES ,ARIZONA_AIF1TX7_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_OUT ("AIF1TX8" ,NULL ,0 , +SND_SOC_DAPM_AIF_OUT ("AIF1TX8" ,NULL ,7 ,ARIZONA_AIF1_TX_ENABLES ,ARIZONA_AIF1TX8_ENA_SHIFT ,0 ),SND_SOC_DAPM_AIF_IN ("AIF1RX1" ,NULL ,0 ,ARIZONA_AIF1_RX_ENABLES ,ARIZONA_AIF1RX1_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_IN ("AIF1RX2" ,NULL ,0 , +SND_SOC_DAPM_AIF_IN ("AIF1RX2" ,NULL ,1 ,ARIZONA_AIF1_RX_ENABLES ,ARIZONA_AIF1RX2_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_IN ("AIF1RX3" ,NULL ,0 , +SND_SOC_DAPM_AIF_IN ("AIF1RX3" ,NULL ,2 ,ARIZONA_AIF1_RX_ENABLES ,ARIZONA_AIF1RX3_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_IN ("AIF1RX4" ,NULL ,0 , +SND_SOC_DAPM_AIF_IN ("AIF1RX4" ,NULL ,3 ,ARIZONA_AIF1_RX_ENABLES ,ARIZONA_AIF1RX4_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_IN ("AIF1RX5" ,NULL ,0 , +SND_SOC_DAPM_AIF_IN ("AIF1RX5" ,NULL ,4 ,ARIZONA_AIF1_RX_ENABLES ,ARIZONA_AIF1RX5_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_IN ("AIF1RX6" ,NULL ,0 , +SND_SOC_DAPM_AIF_IN ("AIF1RX6" ,NULL ,5 ,ARIZONA_AIF1_RX_ENABLES ,ARIZONA_AIF1RX6_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_IN ("AIF1RX7" ,NULL ,0 , +SND_SOC_DAPM_AIF_IN ("AIF1RX7" ,NULL ,6 ,ARIZONA_AIF1_RX_ENABLES ,ARIZONA_AIF1RX7_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_IN ("AIF1RX8" ,NULL ,0 , +SND_SOC_DAPM_AIF_IN ("AIF1RX8" ,NULL ,7 ,ARIZONA_AIF1_RX_ENABLES ,ARIZONA_AIF1RX8_ENA_SHIFT ,0 ),SND_SOC_DAPM_AIF_OUT ("AIF2TX1" ,NULL ,0 ,ARIZONA_AIF2_TX_ENABLES ,ARIZONA_AIF2TX1_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_OUT ("AIF2TX2" ,NULL ,0 , +SND_SOC_DAPM_AIF_OUT ("AIF2TX2" ,NULL ,1 ,ARIZONA_AIF2_TX_ENABLES ,ARIZONA_AIF2TX2_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_OUT ("AIF2TX3" ,NULL ,0 , +SND_SOC_DAPM_AIF_OUT ("AIF2TX3" ,NULL ,2 ,ARIZONA_AIF2_TX_ENABLES ,ARIZONA_AIF2TX3_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_OUT ("AIF2TX4" ,NULL ,0 , +SND_SOC_DAPM_AIF_OUT ("AIF2TX4" ,NULL ,3 ,ARIZONA_AIF2_TX_ENABLES ,ARIZONA_AIF2TX4_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_OUT ("AIF2TX5" ,NULL ,0 , +SND_SOC_DAPM_AIF_OUT ("AIF2TX5" ,NULL ,4 ,ARIZONA_AIF2_TX_ENABLES ,ARIZONA_AIF2TX5_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_OUT ("AIF2TX6" ,NULL ,0 , +SND_SOC_DAPM_AIF_OUT ("AIF2TX6" ,NULL ,5 ,ARIZONA_AIF2_TX_ENABLES ,ARIZONA_AIF2TX6_ENA_SHIFT ,0 ),SND_SOC_DAPM_AIF_IN ("AIF2RX1" ,NULL ,0 ,ARIZONA_AIF2_RX_ENABLES ,ARIZONA_AIF2RX1_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_IN ("AIF2RX2" ,NULL ,0 , +SND_SOC_DAPM_AIF_IN ("AIF2RX2" ,NULL ,1 ,ARIZONA_AIF2_RX_ENABLES ,ARIZONA_AIF2RX2_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_IN ("AIF2RX3" ,NULL ,0 , +SND_SOC_DAPM_AIF_IN ("AIF2RX3" ,NULL ,2 ,ARIZONA_AIF2_RX_ENABLES ,ARIZONA_AIF2RX3_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_IN ("AIF2RX4" ,NULL ,0 , +SND_SOC_DAPM_AIF_IN ("AIF2RX4" ,NULL ,3 ,ARIZONA_AIF2_RX_ENABLES ,ARIZONA_AIF2RX4_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_IN ("AIF2RX5" ,NULL ,0 , +SND_SOC_DAPM_AIF_IN ("AIF2RX5" ,NULL ,4 ,ARIZONA_AIF2_RX_ENABLES ,ARIZONA_AIF2RX5_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_IN ("AIF2RX6" ,NULL ,0 , +SND_SOC_DAPM_AIF_IN ("AIF2RX6" ,NULL ,5 ,ARIZONA_AIF2_RX_ENABLES ,ARIZONA_AIF2RX6_ENA_SHIFT ,0 ),SND_SOC_DAPM_AIF_OUT ("AIF3TX1" ,NULL ,0 ,ARIZONA_AIF3_TX_ENABLES ,ARIZONA_AIF3TX1_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_OUT ("AIF3TX2" ,NULL ,0 , +SND_SOC_DAPM_AIF_OUT ("AIF3TX2" ,NULL ,1 ,ARIZONA_AIF3_TX_ENABLES ,ARIZONA_AIF3TX2_ENA_SHIFT ,0 ),SND_SOC_DAPM_AIF_IN ("AIF3RX1" ,NULL ,0 ,ARIZONA_AIF3_RX_ENABLES ,ARIZONA_AIF3RX1_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_IN ("AIF3RX2" ,NULL ,0 , +SND_SOC_DAPM_AIF_IN ("AIF3RX2" ,NULL ,1 ,ARIZONA_AIF3_RX_ENABLES ,ARIZONA_AIF3RX2_ENA_SHIFT ,0 ), SND_SOC_DAPM_PGA_E("OUT1L", SND_SOC_NOPM,
sound/soc/codecs/wm5102.c +32 -32
137 lines not on this page · raw message
sound/soc/codecs/wm5110.c +40 -40
162 lines not on this page · raw message
sound/soc/codecs/wm8997.c +30 -30
125 lines not on this page · raw message
sound/soc/codecs/wm8998.c +30 -30
126 lines not on this page · raw message
Signature · 1 line
2.11.0
Mark Brown
maintainerApplied "ASoC: arizona: Add channel numbers to AIFs" to the asoc tree
The patch
ASoC: arizona: Add channel numbers to AIFs
has been applied to the asoc tree at
https://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
909d74e39fe18e145a15ba3638f764e7ac3382c1Mon Sep 17 00:00:00 2001
From: Charles Keepax <[email protected]>
Date: Thu, 31 Jan 2019 13:30:19 +0000
Subject: [PATCH] ASoC: arizona: Add channel numbers to AIFs
Set the channel number on each AIF widget to allow unused channels not to be powered up across AIFs.
--- sound/soc/codecs/cs47l24.c | 52 ++++++++++++------------- sound/soc/codecs/wm5102.c | 64 +++++++++++++++--------------- sound/soc/codecs/wm5110.c | 80 +++++++++++++++++++------------------- sound/soc/codecs/wm8997.c | 60 ++++++++++++++-------------- sound/soc/codecs/wm8998.c | 60 ++++++++++++++-------------- 5 files changed, 158 insertions(+), 158 deletions(-)
sound/soc/codecs/cs47l24.c +26 -26
@@ -500,72 +500,72 @@ SND_SOC_DAPM_MUX("AEC Loopback", ARIZONA_DAC_AEC_CONTROL_1,SND_SOC_DAPM_AIF_OUT ("AIF1TX1" ,NULL ,0 ,ARIZONA_AIF1_TX_ENABLES ,ARIZONA_AIF1TX1_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_OUT ("AIF1TX2" ,NULL ,0 , +SND_SOC_DAPM_AIF_OUT ("AIF1TX2" ,NULL ,1 ,ARIZONA_AIF1_TX_ENABLES ,ARIZONA_AIF1TX2_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_OUT ("AIF1TX3" ,NULL ,0 , +SND_SOC_DAPM_AIF_OUT ("AIF1TX3" ,NULL ,2 ,ARIZONA_AIF1_TX_ENABLES ,ARIZONA_AIF1TX3_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_OUT ("AIF1TX4" ,NULL ,0 , +SND_SOC_DAPM_AIF_OUT ("AIF1TX4" ,NULL ,3 ,ARIZONA_AIF1_TX_ENABLES ,ARIZONA_AIF1TX4_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_OUT ("AIF1TX5" ,NULL ,0 , +SND_SOC_DAPM_AIF_OUT ("AIF1TX5" ,NULL ,4 ,ARIZONA_AIF1_TX_ENABLES ,ARIZONA_AIF1TX5_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_OUT ("AIF1TX6" ,NULL ,0 , +SND_SOC_DAPM_AIF_OUT ("AIF1TX6" ,NULL ,5 ,ARIZONA_AIF1_TX_ENABLES ,ARIZONA_AIF1TX6_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_OUT ("AIF1TX7" ,NULL ,0 , +SND_SOC_DAPM_AIF_OUT ("AIF1TX7" ,NULL ,6 ,ARIZONA_AIF1_TX_ENABLES ,ARIZONA_AIF1TX7_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_OUT ("AIF1TX8" ,NULL ,0 , +SND_SOC_DAPM_AIF_OUT ("AIF1TX8" ,NULL ,7 ,ARIZONA_AIF1_TX_ENABLES ,ARIZONA_AIF1TX8_ENA_SHIFT ,0 ),SND_SOC_DAPM_AIF_IN ("AIF1RX1" ,NULL ,0 ,ARIZONA_AIF1_RX_ENABLES ,ARIZONA_AIF1RX1_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_IN ("AIF1RX2" ,NULL ,0 , +SND_SOC_DAPM_AIF_IN ("AIF1RX2" ,NULL ,1 ,ARIZONA_AIF1_RX_ENABLES ,ARIZONA_AIF1RX2_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_IN ("AIF1RX3" ,NULL ,0 , +SND_SOC_DAPM_AIF_IN ("AIF1RX3" ,NULL ,2 ,ARIZONA_AIF1_RX_ENABLES ,ARIZONA_AIF1RX3_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_IN ("AIF1RX4" ,NULL ,0 , +SND_SOC_DAPM_AIF_IN ("AIF1RX4" ,NULL ,3 ,ARIZONA_AIF1_RX_ENABLES ,ARIZONA_AIF1RX4_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_IN ("AIF1RX5" ,NULL ,0 , +SND_SOC_DAPM_AIF_IN ("AIF1RX5" ,NULL ,4 ,ARIZONA_AIF1_RX_ENABLES ,ARIZONA_AIF1RX5_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_IN ("AIF1RX6" ,NULL ,0 , +SND_SOC_DAPM_AIF_IN ("AIF1RX6" ,NULL ,5 ,ARIZONA_AIF1_RX_ENABLES ,ARIZONA_AIF1RX6_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_IN ("AIF1RX7" ,NULL ,0 , +SND_SOC_DAPM_AIF_IN ("AIF1RX7" ,NULL ,6 ,ARIZONA_AIF1_RX_ENABLES ,ARIZONA_AIF1RX7_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_IN ("AIF1RX8" ,NULL ,0 , +SND_SOC_DAPM_AIF_IN ("AIF1RX8" ,NULL ,7 ,ARIZONA_AIF1_RX_ENABLES ,ARIZONA_AIF1RX8_ENA_SHIFT ,0 ),SND_SOC_DAPM_AIF_OUT ("AIF2TX1" ,NULL ,0 ,ARIZONA_AIF2_TX_ENABLES ,ARIZONA_AIF2TX1_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_OUT ("AIF2TX2" ,NULL ,0 , +SND_SOC_DAPM_AIF_OUT ("AIF2TX2" ,NULL ,1 ,ARIZONA_AIF2_TX_ENABLES ,ARIZONA_AIF2TX2_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_OUT ("AIF2TX3" ,NULL ,0 , +SND_SOC_DAPM_AIF_OUT ("AIF2TX3" ,NULL ,2 ,ARIZONA_AIF2_TX_ENABLES ,ARIZONA_AIF2TX3_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_OUT ("AIF2TX4" ,NULL ,0 , +SND_SOC_DAPM_AIF_OUT ("AIF2TX4" ,NULL ,3 ,ARIZONA_AIF2_TX_ENABLES ,ARIZONA_AIF2TX4_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_OUT ("AIF2TX5" ,NULL ,0 , +SND_SOC_DAPM_AIF_OUT ("AIF2TX5" ,NULL ,4 ,ARIZONA_AIF2_TX_ENABLES ,ARIZONA_AIF2TX5_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_OUT ("AIF2TX6" ,NULL ,0 , +SND_SOC_DAPM_AIF_OUT ("AIF2TX6" ,NULL ,5 ,ARIZONA_AIF2_TX_ENABLES ,ARIZONA_AIF2TX6_ENA_SHIFT ,0 ),SND_SOC_DAPM_AIF_IN ("AIF2RX1" ,NULL ,0 ,ARIZONA_AIF2_RX_ENABLES ,ARIZONA_AIF2RX1_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_IN ("AIF2RX2" ,NULL ,0 , +SND_SOC_DAPM_AIF_IN ("AIF2RX2" ,NULL ,1 ,ARIZONA_AIF2_RX_ENABLES ,ARIZONA_AIF2RX2_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_IN ("AIF2RX3" ,NULL ,0 , +SND_SOC_DAPM_AIF_IN ("AIF2RX3" ,NULL ,2 ,ARIZONA_AIF2_RX_ENABLES ,ARIZONA_AIF2RX3_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_IN ("AIF2RX4" ,NULL ,0 , +SND_SOC_DAPM_AIF_IN ("AIF2RX4" ,NULL ,3 ,ARIZONA_AIF2_RX_ENABLES ,ARIZONA_AIF2RX4_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_IN ("AIF2RX5" ,NULL ,0 , +SND_SOC_DAPM_AIF_IN ("AIF2RX5" ,NULL ,4 ,ARIZONA_AIF2_RX_ENABLES ,ARIZONA_AIF2RX5_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_IN ("AIF2RX6" ,NULL ,0 , +SND_SOC_DAPM_AIF_IN ("AIF2RX6" ,NULL ,5 ,ARIZONA_AIF2_RX_ENABLES ,ARIZONA_AIF2RX6_ENA_SHIFT ,0 ),SND_SOC_DAPM_AIF_OUT ("AIF3TX1" ,NULL ,0 ,ARIZONA_AIF3_TX_ENABLES ,ARIZONA_AIF3TX1_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_OUT ("AIF3TX2" ,NULL ,0 , +SND_SOC_DAPM_AIF_OUT ("AIF3TX2" ,NULL ,1 ,ARIZONA_AIF3_TX_ENABLES ,ARIZONA_AIF3TX2_ENA_SHIFT ,0 ),SND_SOC_DAPM_AIF_IN ("AIF3RX1" ,NULL ,0 ,ARIZONA_AIF3_RX_ENABLES ,ARIZONA_AIF3RX1_ENA_SHIFT ,0 ), -SND_SOC_DAPM_AIF_IN ("AIF3RX2" ,NULL ,0 , +SND_SOC_DAPM_AIF_IN ("AIF3RX2" ,NULL ,1 ,ARIZONA_AIF3_RX_ENABLES ,ARIZONA_AIF3RX2_ENA_SHIFT ,0 ), SND_SOC_DAPM_PGA_E("OUT1L", SND_SOC_NOPM,
sound/soc/codecs/wm5102.c +32 -32
137 lines not on this page · raw message
sound/soc/codecs/wm5110.c +40 -40
162 lines not on this page · raw message
sound/soc/codecs/wm8997.c +30 -30
125 lines not on this page · raw message
sound/soc/codecs/wm8998.c +30 -30
126 lines not on this page · raw message
Signature · 1 line
2.20.1
Mark Brown
maintainerApplied "ASoC: dapm: Only power up active channels from a DAI" to the asoc tree
In reply to Charles KeepaxThe patch
ASoC: dapm: Only power up active channels from a DAI
has been applied to the asoc tree at
https://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
078a85f2806f0ffd11289009462a6a390f9adb5cMon Sep 17 00:00:00 2001
From: Charles Keepax <[email protected]>
Date: Thu, 31 Jan 2019 13:30:18 +0000
Subject: [PATCH] ASoC: dapm: Only power up active channels from a DAI
Currently all widgets attached to a DAI link will be powered up when the DAI is active, however this may include routes that are not actually in use if there are unused channels available on the DAI.
The macros for creating AIF widgets already include an entry for slot, it is proposed to change that to channel. The effective difference here being respresenting the logical channel index rather than the physical slot index. The CODECs currently using the slot entry on the DAPM_AIF macros are using it in a manner consistent with this, the CODECs not using it just have the field set to zero.
A variable is added to snd_soc_dapm_widget to represent this channel index and then for each AIF widget attached to a DAI this is compared against the number of channels on the stream. Enabling the links for those which will be in use. This has the nice property that the CODECs which haven't used the slot/channel entry in the macro will function exactly as before due to all the AIF widgets having a channel of zero and a stream by definition having at least one channel.
--- include/sound/soc-dapm.h | 22 +++++++----- sound/soc/soc-dapm.c | 76 ++++++++++++++++++++++++++++++++++++++++ sound/soc/soc-pcm.c | 4 +++ 3 files changed, 94 insertions(+), 8 deletions(-)
include/sound/soc-dapm.h +14 -8
@@ -214,21 +214,21 @@ struct device; .event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD}/* stream domain */ -#define SND_SOC_DAPM_AIF_IN (wname, stname, wslot, wreg, wshift, winvert) \ +#define SND_SOC_DAPM_AIF_IN (wname, stname, wchan, wreg, wshift, winvert) \ { .id = snd_soc_dapm_aif_in, .name = wname, .sname = stname, \ - SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), } -#define SND_SOC_DAPM_AIF_IN_E (wname, stname, wslot, wreg, wshift, winvert, \ + .channel = wchan, SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), } +#define SND_SOC_DAPM_AIF_IN_E (wname, stname, wchan, wreg, wshift, winvert, \ wevent, wflags) \ { .id = snd_soc_dapm_aif_in, .name = wname, .sname = stname, \ - SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \ + .channel = wchan, SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \ .event = wevent, .event_flags = wflags } -#define SND_SOC_DAPM_AIF_OUT (wname, stname, wslot, wreg, wshift, winvert) \ +#define SND_SOC_DAPM_AIF_OUT (wname, stname, wchan, wreg, wshift, winvert) \ { .id = snd_soc_dapm_aif_out, .name = wname, .sname = stname, \ - SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), } -#define SND_SOC_DAPM_AIF_OUT_E (wname, stname, wslot, wreg, wshift, winvert, \ + .channel = wchan, SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), } +#define SND_SOC_DAPM_AIF_OUT_E (wname, stname, wchan, wreg, wshift, winvert, \ wevent, wflags) \ { .id = snd_soc_dapm_aif_out, .name = wname, .sname = stname, \ - SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \ + .channel = wchan, SND_SOC_DAPM_INIT_REG_VAL(wreg, wshift, winvert), \ .event = wevent, .event_flags = wflags }#define SND_SOC_DAPM_DAC (wname, stname, wreg, wshift, winvert) \ { .id = snd_soc_dapm_dac, .name = wname, .sname = stname, \
@@ -407,6 +407,10 @@ int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm,int snd_soc_dapm_link_dai_widgets (struct snd_soc_card *card);void snd_soc_dapm_connect_dai_link_widgets (struct snd_soc_card *card); +int snd_soc_dapm_update_dai (struct snd_pcm_substream *substream, +struct snd_pcm_hw_params *params, +struct snd_soc_dai *dai); +/* dapm path setup */ int snd_soc_dapm_new_widgets (struct snd_soc_card *card);void snd_soc_dapm_free (struct snd_soc_dapm_context *dapm);
@@ -627,6 +631,8 @@ struct snd_soc_dapm_widget {int endpoints[2 ];struct clk *clk; + +int channel; };struct snd_soc_dapm_update {
sound/soc/soc-dapm.c +76 -0
94 lines not on this page · raw message
sound/soc/soc-pcm.c +4 -0
@@ -969,6 +969,8 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream, codec_dai->channels =params_channels (&codec_params); codec_dai->sample_bits =snd_pcm_format_physical_width (params_format (&codec_params)); + +snd_soc_dapm_update_dai (substream, &codec_params, codec_dai); } ret =soc_dai_hw_params (substream, params, cpu_dai);
@@ -998,6 +1000,8 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream, cpu_dai->sample_bits =snd_pcm_format_physical_width (params_format (params)); +snd_soc_dapm_update_dai (substream, params, cpu_dai); + ret =soc_pcm_params_symmetry (substream, params);if (ret) goto component_err;
Signature · 1 line
2.20.1