Skip to content

Commit 29ca297

Browse files
bardliaobardliao
authored
Merge pull request #5216 from bardliao/merge/sound-upstream-20241024
Merge/sound upstream 20241024
2 parents 0691969 + 598db6c commit 29ca297

110 files changed

Lines changed: 675 additions & 687 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Documentation/devicetree/bindings/sound/everest,es8328.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ properties:
5050
HPVDD-supply:
5151
description: Regulator providing analog output voltage 3.3V
5252

53+
port:
54+
$ref: audio-graph-port.yaml#
55+
unevaluatedProperties: false
56+
5357
required:
5458
- compatible
5559
- clocks

‎Documentation/devicetree/bindings/sound/qcom,lpass-rx-macro.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ properties:
2121
- items:
2222
- enum:
2323
- qcom,sm8650-lpass-rx-macro
24+
- qcom,sm8750-lpass-rx-macro
2425
- qcom,x1e80100-lpass-rx-macro
2526
- const: qcom,sm8550-lpass-rx-macro
2627

‎Documentation/devicetree/bindings/sound/qcom,lpass-tx-macro.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ properties:
2222
- items:
2323
- enum:
2424
- qcom,sm8650-lpass-tx-macro
25+
- qcom,sm8750-lpass-tx-macro
2526
- qcom,x1e80100-lpass-tx-macro
2627
- const: qcom,sm8550-lpass-tx-macro
2728

‎Documentation/devicetree/bindings/sound/qcom,lpass-va-macro.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ properties:
2121
- items:
2222
- enum:
2323
- qcom,sm8650-lpass-va-macro
24+
- qcom,sm8750-lpass-va-macro
2425
- qcom,x1e80100-lpass-va-macro
2526
- const: qcom,sm8550-lpass-va-macro
2627

‎Documentation/devicetree/bindings/sound/qcom,lpass-wsa-macro.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ properties:
2121
- items:
2222
- enum:
2323
- qcom,sm8650-lpass-wsa-macro
24+
- qcom,sm8750-lpass-wsa-macro
2425
- qcom,x1e80100-lpass-wsa-macro
2526
- const: qcom,sm8550-lpass-wsa-macro
2627

‎Documentation/sound/soc/dpcm.rst‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -157,15 +157,13 @@ FE DAI links are defined as follows :-
157157
.codec_dai_name = "snd-soc-dummy-dai",
158158
.dynamic = 1,
159159
.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
160-
.dpcm_playback = 1,
161160
},
162161
.....< other FE and BE DAI links here >
163162
};
164163

165164
This FE DAI link is pretty similar to a regular DAI link except that we also
166-
set the DAI link to a DPCM FE with the ``dynamic = 1``. The supported FE stream
167-
directions should also be set with the ``dpcm_playback`` and ``dpcm_capture``
168-
flags. There is also an option to specify the ordering of the trigger call for
165+
set the DAI link to a DPCM FE with the ``dynamic = 1``.
166+
There is also an option to specify the ordering of the trigger call for
169167
each FE. This allows the ASoC core to trigger the DSP before or after the other
170168
components (as some DSPs have strong requirements for the ordering DAI/DSP
171169
start and stop sequences).
@@ -189,15 +187,12 @@ The BE DAIs are configured as follows :-
189187
.ignore_pmdown_time = 1,
190188
.be_hw_params_fixup = hswult_ssp0_fixup,
191189
.ops = &haswell_ops,
192-
.dpcm_playback = 1,
193-
.dpcm_capture = 1,
194190
},
195191
.....< other BE DAI links here >
196192
};
197193

198194
This BE DAI link connects DAI0 to the codec (in this case RT5460 AIF1). It sets
199-
the ``no_pcm`` flag to mark it has a BE and sets flags for supported stream
200-
directions using ``dpcm_playback`` and ``dpcm_capture`` above.
195+
the ``no_pcm`` flag to mark it has a BE.
201196

202197
The BE has also flags set for ignoring suspend and PM down time. This allows
203198
the BE to work in a hostless mode where the host CPU is not transferring data

‎MAINTAINERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23290,7 +23290,7 @@ F: Documentation/devicetree/bindings/iio/adc/ti,lmp92064.yaml
2329023290
F: drivers/iio/adc/ti-lmp92064.c
2329123291

2329223292
TI PCM3060 ASoC CODEC DRIVER
23293-
M: Kirill Marinushkin <kmarinushkin@birdec.com>
23293+
M: Kirill Marinushkin <k.marinushkin@gmail.com>
2329423294
L: linux-sound@vger.kernel.org
2329523295
S: Maintained
2329623296
F: Documentation/devicetree/bindings/sound/pcm3060.txt

‎include/sound/soc.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -541,8 +541,13 @@ int snd_soc_tdm_params_to_bclk(const struct snd_pcm_hw_params *params,
541541
int tdm_width, int tdm_slots, int slot_multiple);
542542

543543
/* set runtime hw params */
544-
int snd_soc_set_runtime_hwparams(struct snd_pcm_substream *substream,
545-
const struct snd_pcm_hardware *hw);
544+
static inline int snd_soc_set_runtime_hwparams(struct snd_pcm_substream *substream,
545+
const struct snd_pcm_hardware *hw)
546+
{
547+
substream->runtime->hw = *hw;
548+
549+
return 0;
550+
}
546551

547552
struct snd_ac97 *snd_soc_alloc_ac97_component(struct snd_soc_component *component);
548553
struct snd_ac97 *snd_soc_new_ac97_component(struct snd_soc_component *component,
@@ -815,11 +820,6 @@ struct snd_soc_dai_link {
815820
/* This DAI link can route to other DAI links at runtime (Frontend)*/
816821
unsigned int dynamic:1;
817822

818-
/* REMOVE ME */
819-
/* DPCM capture and Playback support */
820-
unsigned int dpcm_capture:1;
821-
unsigned int dpcm_playback:1;
822-
823823
/* DPCM used FE & BE merged format */
824824
unsigned int dpcm_merged_format:1;
825825
/* DPCM used FE & BE merged channel */

‎sound/soc/amd/acp-da7219-max98357a.c‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = {
542542
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
543543
| SND_SOC_DAIFMT_CBP_CFP,
544544
.init = cz_da7219_init,
545-
.dpcm_playback = 1,
545+
.playback_only = 1,
546546
.trigger_stop = SND_SOC_TRIGGER_ORDER_LDC,
547547
.ops = &cz_da7219_play_ops,
548548
SND_SOC_DAILINK_REG(designware1, dlgs, platform),
@@ -552,7 +552,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = {
552552
.stream_name = "Capture",
553553
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
554554
| SND_SOC_DAIFMT_CBP_CFP,
555-
.dpcm_capture = 1,
555+
.capture_only = 1,
556556
.trigger_stop = SND_SOC_TRIGGER_ORDER_LDC,
557557
.ops = &cz_da7219_cap_ops,
558558
SND_SOC_DAILINK_REG(designware2, dlgs, platform),
@@ -562,7 +562,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = {
562562
.stream_name = "HiFi Playback",
563563
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
564564
| SND_SOC_DAIFMT_CBP_CFP,
565-
.dpcm_playback = 1,
565+
.playback_only = 1,
566566
.trigger_stop = SND_SOC_TRIGGER_ORDER_LDC,
567567
.ops = &cz_max_play_ops,
568568
SND_SOC_DAILINK_REG(designware3, mx, platform),
@@ -573,7 +573,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = {
573573
.stream_name = "DMIC0 Capture",
574574
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
575575
| SND_SOC_DAIFMT_CBP_CFP,
576-
.dpcm_capture = 1,
576+
.capture_only = 1,
577577
.trigger_stop = SND_SOC_TRIGGER_ORDER_LDC,
578578
.ops = &cz_dmic0_cap_ops,
579579
SND_SOC_DAILINK_REG(designware3, adau, platform),
@@ -584,7 +584,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = {
584584
.stream_name = "DMIC1 Capture",
585585
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
586586
| SND_SOC_DAIFMT_CBP_CFP,
587-
.dpcm_capture = 1,
587+
.capture_only = 1,
588588
.trigger_stop = SND_SOC_TRIGGER_ORDER_LDC,
589589
.ops = &cz_dmic1_cap_ops,
590590
SND_SOC_DAILINK_REG(designware2, adau, platform),
@@ -598,7 +598,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = {
598598
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
599599
| SND_SOC_DAIFMT_CBP_CFP,
600600
.init = cz_rt5682_init,
601-
.dpcm_playback = 1,
601+
.playback_only = 1,
602602
.trigger_stop = SND_SOC_TRIGGER_ORDER_LDC,
603603
.ops = &cz_rt5682_play_ops,
604604
SND_SOC_DAILINK_REG(designware1, rt5682, platform),
@@ -608,7 +608,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = {
608608
.stream_name = "Capture",
609609
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
610610
| SND_SOC_DAIFMT_CBP_CFP,
611-
.dpcm_capture = 1,
611+
.capture_only = 1,
612612
.trigger_stop = SND_SOC_TRIGGER_ORDER_LDC,
613613
.ops = &cz_rt5682_cap_ops,
614614
SND_SOC_DAILINK_REG(designware2, rt5682, platform),
@@ -618,7 +618,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = {
618618
.stream_name = "HiFi Playback",
619619
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
620620
| SND_SOC_DAIFMT_CBP_CFP,
621-
.dpcm_playback = 1,
621+
.playback_only = 1,
622622
.trigger_stop = SND_SOC_TRIGGER_ORDER_LDC,
623623
.ops = &cz_rt5682_max_play_ops,
624624
SND_SOC_DAILINK_REG(designware3, mx, platform),
@@ -629,7 +629,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = {
629629
.stream_name = "DMIC0 Capture",
630630
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
631631
| SND_SOC_DAIFMT_CBP_CFP,
632-
.dpcm_capture = 1,
632+
.capture_only = 1,
633633
.trigger_stop = SND_SOC_TRIGGER_ORDER_LDC,
634634
.ops = &cz_rt5682_dmic0_cap_ops,
635635
SND_SOC_DAILINK_REG(designware3, adau, platform),
@@ -640,7 +640,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = {
640640
.stream_name = "DMIC1 Capture",
641641
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
642642
| SND_SOC_DAIFMT_CBP_CFP,
643-
.dpcm_capture = 1,
643+
.capture_only = 1,
644644
.trigger_stop = SND_SOC_TRIGGER_ORDER_LDC,
645645
.ops = &cz_rt5682_dmic1_cap_ops,
646646
SND_SOC_DAILINK_REG(designware2, adau, platform),

‎sound/soc/amd/acp-es8336.c‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,6 @@ static struct snd_soc_dai_link st_dai_es8336[] = {
150150
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
151151
| SND_SOC_DAIFMT_CBP_CFP,
152152
.trigger_stop = SND_SOC_TRIGGER_ORDER_LDC,
153-
.dpcm_capture = 1,
154-
.dpcm_playback = 1,
155153
.init = st_es8336_init,
156154
.ops = &st_es8336_ops,
157155
SND_SOC_DAILINK_REG(designware1, codec, platform),

0 commit comments

Comments
 (0)