Skip to content

Commit

Permalink
fixup! ASoC: apple: Add macaudio machine driver
Browse files Browse the repository at this point in the history
Fixes following warnings after commit fd69dfe ("ASoC: soc-pcm:
Indicate warning if dpcm_playback/capture were used for availability
limition").

| snd-soc-macaudio sound: both playback/capture are available, but not using playback_only flag (Secondary)
| snd-soc-macaudio sound: dpcm_playback/capture are no longer needed, please use playback/capture_only instead
| snd-soc-macaudio sound: both playback/capture are available, but not using capture_only flag (Speaker Sense)
| snd-soc-macaudio sound: dpcm_playback/capture are no longer needed, please use playback/capture_only instead

Fixes: fd69dfe ("ASoC: soc-pcm: Indicate warning if dpcm_playback/capture were used for availability limition")
Signed-off-by: Janne Grunau <[email protected]>
  • Loading branch information
jannau committed Dec 2, 2024
1 parent db70ebd commit 0bc9825
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions sound/soc/apple/macaudio.c
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,6 @@ static struct snd_soc_dai_link macaudio_fe_links[] = {
.name = "Primary",
.stream_name = "Primary",
.dynamic = 1,
.dpcm_playback = 1,
.dpcm_capture = 1,
.dpcm_merged_rate = 1,
.dpcm_merged_chan = 1,
.dpcm_merged_format = 1,
Expand All @@ -173,18 +171,18 @@ static struct snd_soc_dai_link macaudio_fe_links[] = {
.name = "Secondary",
.stream_name = "Secondary",
.dynamic = 1,
.dpcm_playback = 1,
.dpcm_merged_rate = 1,
.dpcm_merged_chan = 1,
.dpcm_merged_format = 1,
.dai_fmt = MACAUDIO_DAI_FMT,
.playback_only = 1,
SND_SOC_DAILINK_REG(secondary),
},
{
.name = "Speaker Sense",
.stream_name = "Speaker Sense",
.capture_only = 1,
.dynamic = 1,
.dpcm_capture = 1,
.dai_fmt = (SND_SOC_DAIFMT_I2S | \
SND_SOC_DAIFMT_CBP_CFP | \
SND_SOC_DAIFMT_GATED | \
Expand Down Expand Up @@ -443,8 +441,6 @@ static int macaudio_parse_of_be_dai_link(struct macaudio_snd_data *ma,
int ret, i;

link->no_pcm = 1;
link->dpcm_playback = 1;
link->dpcm_capture = 1;

link->dai_fmt = MACAUDIO_DAI_FMT;

Expand Down

0 comments on commit 0bc9825

Please sign in to comment.