Skip to content

Commit fd2cd56

Browse files
torvaldstorvalds
committed
Merge tag 'sound-5.13-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai: "A bit more commits than expected at this time, but likely it's the last shot before the final. Many of changes are device-specific fix-ups for various ASoC drivers, while a few usual HD-audio quirks and a FireWire fix, as well as a couple of ALSA / ASoC core fixes. All look nice and small, and nothing to scare much" * tag 'sound-5.13-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: ALSA: seq: Fix race of snd_seq_timer_open() ALSA: hda/realtek: fix mute/micmute LEDs for HP ZBook Power G8 ALSA: hda/realtek: headphone and mic don't work on an Acer laptop ASoC: qcom: lpass-cpu: Fix pop noise during audio capture begin ALSA: firewire-lib: fix the context to call snd_pcm_stop_xrun() ALSA: hda/realtek: fix mute/micmute LEDs for HP EliteBook 840 Aero G8 ALSA: hda/realtek: fix mute/micmute LEDs and speaker for HP EliteBook x360 1040 G8 ALSA: hda/realtek: fix mute/micmute LEDs and speaker for HP Elite Dragonfly G2 ASoC: rt5682: Fix the fast discharge for headset unplugging in soundwire mode ASoC: tas2562: Fix TDM_CFG0_SAMPRATE values ASoC: meson: gx-card: fix sound-dai dt schema ASoC: AMD Renoir: Remove fix for DMI entry on Lenovo 2020 platforms ASoC: AMD Renoir - add DMI entry for Lenovo 2020 AMD platforms ASoC: SOF: reset enabled_cores state at suspend ASoC: fsl-asoc-card: Set .owner attribute when registering card. ASoC: topology: Fix spelling mistake "vesion" -> "version" ASoC: rt5659: Fix the lost powers for the HDA header ASoC: core: Fix Null-point-dereference in fmt_single_name()
2 parents 4244b5d + 83e197a commit fd2cd56

File tree

13 files changed

+148
-20
lines changed

13 files changed

+148
-20
lines changed

‎Documentation/devicetree/bindings/sound/amlogic,gx-sound-card.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ patternProperties:
5757
rate
5858
5959
sound-dai:
60-
$ref: /schemas/types.yaml#/definitions/phandle
60+
$ref: /schemas/types.yaml#/definitions/phandle-array
6161
description: phandle of the CPU DAI
6262

6363
patternProperties:
@@ -71,7 +71,7 @@ patternProperties:
7171
7272
properties:
7373
sound-dai:
74-
$ref: /schemas/types.yaml#/definitions/phandle
74+
$ref: /schemas/types.yaml#/definitions/phandle-array
7575
description: phandle of the codec DAI
7676

7777
required:

‎sound/core/seq/seq_timer.c

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,8 +297,16 @@ int snd_seq_timer_open(struct snd_seq_queue *q)
297297
return err;
298298
}
299299
spin_lock_irq(&tmr->lock);
300-
tmr->timeri = t;
300+
if (tmr->timeri)
301+
err = -EBUSY;
302+
else
303+
tmr->timeri = t;
301304
spin_unlock_irq(&tmr->lock);
305+
if (err < 0) {
306+
snd_timer_close(t);
307+
snd_timer_instance_free(t);
308+
return err;
309+
}
302310
return 0;
303311
}
304312

‎sound/firewire/amdtp-stream.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -804,7 +804,7 @@ static void generate_pkt_descs(struct amdtp_stream *s, struct pkt_desc *descs,
804804
static inline void cancel_stream(struct amdtp_stream *s)
805805
{
806806
s->packet_index = -1;
807-
if (current_work() == &s->period_work)
807+
if (in_interrupt())
808808
amdtp_stream_pcm_abort(s);
809809
WRITE_ONCE(s->pcm_buffer_pointer, SNDRV_PCM_POS_XRUN);
810810
}

‎sound/pci/hda/patch_realtek.c

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6568,6 +6568,7 @@ enum {
65686568
ALC285_FIXUP_HP_SPECTRE_X360,
65696569
ALC287_FIXUP_IDEAPAD_BASS_SPK_AMP,
65706570
ALC623_FIXUP_LENOVO_THINKSTATION_P340,
6571+
ALC255_FIXUP_ACER_HEADPHONE_AND_MIC,
65716572
};
65726573

65736574
static const struct hda_fixup alc269_fixups[] = {
@@ -8146,6 +8147,15 @@ static const struct hda_fixup alc269_fixups[] = {
81468147
.chained = true,
81478148
.chain_id = ALC283_FIXUP_HEADSET_MIC,
81488149
},
8150+
[ALC255_FIXUP_ACER_HEADPHONE_AND_MIC] = {
8151+
.type = HDA_FIXUP_PINS,
8152+
.v.pins = (const struct hda_pintbl[]) {
8153+
{ 0x21, 0x03211030 }, /* Change the Headphone location to Left */
8154+
{ }
8155+
},
8156+
.chained = true,
8157+
.chain_id = ALC255_FIXUP_XIAOMI_HEADSET_MIC
8158+
},
81498159
};
81508160

81518161
static const struct snd_pci_quirk alc269_fixup_tbl[] = {
@@ -8182,6 +8192,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
81828192
SND_PCI_QUIRK(0x1025, 0x132a, "Acer TravelMate B114-21", ALC233_FIXUP_ACER_HEADSET_MIC),
81838193
SND_PCI_QUIRK(0x1025, 0x1330, "Acer TravelMate X514-51T", ALC255_FIXUP_ACER_HEADSET_MIC),
81848194
SND_PCI_QUIRK(0x1025, 0x1430, "Acer TravelMate B311R-31", ALC256_FIXUP_ACER_MIC_NO_PRESENCE),
8195+
SND_PCI_QUIRK(0x1025, 0x1466, "Acer Aspire A515-56", ALC255_FIXUP_ACER_HEADPHONE_AND_MIC),
81858196
SND_PCI_QUIRK(0x1028, 0x0470, "Dell M101z", ALC269_FIXUP_DELL_M101Z),
81868197
SND_PCI_QUIRK(0x1028, 0x054b, "Dell XPS one 2710", ALC275_FIXUP_DELL_XPS),
81878198
SND_PCI_QUIRK(0x1028, 0x05bd, "Dell Latitude E6440", ALC292_FIXUP_DELL_E7X),
@@ -8310,6 +8321,8 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
83108321
SND_PCI_QUIRK(0x103c, 0x8519, "HP Spectre x360 15-df0xxx", ALC285_FIXUP_HP_SPECTRE_X360),
83118322
SND_PCI_QUIRK(0x103c, 0x869d, "HP", ALC236_FIXUP_HP_MUTE_LED),
83128323
SND_PCI_QUIRK(0x103c, 0x86c7, "HP Envy AiO 32", ALC274_FIXUP_HP_ENVY_GPIO),
8324+
SND_PCI_QUIRK(0x103c, 0x8716, "HP Elite Dragonfly G2 Notebook PC", ALC285_FIXUP_HP_GPIO_AMP_INIT),
8325+
SND_PCI_QUIRK(0x103c, 0x8720, "HP EliteBook x360 1040 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_AMP_INIT),
83138326
SND_PCI_QUIRK(0x103c, 0x8724, "HP EliteBook 850 G7", ALC285_FIXUP_HP_GPIO_LED),
83148327
SND_PCI_QUIRK(0x103c, 0x8729, "HP", ALC285_FIXUP_HP_GPIO_LED),
83158328
SND_PCI_QUIRK(0x103c, 0x8730, "HP ProBook 445 G7", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),
@@ -8328,10 +8341,12 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
83288341
SND_PCI_QUIRK(0x103c, 0x87f5, "HP", ALC287_FIXUP_HP_GPIO_LED),
83298342
SND_PCI_QUIRK(0x103c, 0x87f7, "HP Spectre x360 14", ALC245_FIXUP_HP_X360_AMP),
83308343
SND_PCI_QUIRK(0x103c, 0x8846, "HP EliteBook 850 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED),
8344+
SND_PCI_QUIRK(0x103c, 0x884b, "HP EliteBook 840 Aero G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED),
83318345
SND_PCI_QUIRK(0x103c, 0x884c, "HP EliteBook 840 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED),
83328346
SND_PCI_QUIRK(0x103c, 0x886d, "HP ZBook Fury 17.3 Inch G8 Mobile Workstation PC", ALC285_FIXUP_HP_GPIO_AMP_INIT),
83338347
SND_PCI_QUIRK(0x103c, 0x8870, "HP ZBook Fury 15.6 Inch G8 Mobile Workstation PC", ALC285_FIXUP_HP_GPIO_AMP_INIT),
83348348
SND_PCI_QUIRK(0x103c, 0x8873, "HP ZBook Studio 15.6 Inch G8 Mobile Workstation PC", ALC285_FIXUP_HP_GPIO_AMP_INIT),
8349+
SND_PCI_QUIRK(0x103c, 0x888d, "HP ZBook Power 15.6 inch G8 Mobile Workstation PC", ALC236_FIXUP_HP_GPIO_LED),
83358350
SND_PCI_QUIRK(0x103c, 0x8896, "HP EliteBook 855 G8 Notebook PC", ALC285_FIXUP_HP_MUTE_LED),
83368351
SND_PCI_QUIRK(0x103c, 0x8898, "HP EliteBook 845 G8 Notebook PC", ALC285_FIXUP_HP_LIMIT_INT_MIC_BOOST),
83378352
SND_PCI_QUIRK(0x1043, 0x103e, "ASUS X540SA", ALC256_FIXUP_ASUS_MIC),
@@ -8737,6 +8752,7 @@ static const struct hda_model_fixup alc269_fixup_models[] = {
87378752
{.id = ALC285_FIXUP_HP_SPECTRE_X360, .name = "alc285-hp-spectre-x360"},
87388753
{.id = ALC287_FIXUP_IDEAPAD_BASS_SPK_AMP, .name = "alc287-ideapad-bass-spk-amp"},
87398754
{.id = ALC623_FIXUP_LENOVO_THINKSTATION_P340, .name = "alc623-lenovo-thinkstation-p340"},
8755+
{.id = ALC255_FIXUP_ACER_HEADPHONE_AND_MIC, .name = "alc255-acer-headphone-and-mic"},
87408756
{}
87418757
};
87428758
#define ALC225_STANDARD_PINS \

‎sound/soc/codecs/rt5659.c

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2433,13 +2433,18 @@ static int set_dmic_power(struct snd_soc_dapm_widget *w,
24332433
return 0;
24342434
}
24352435

2436-
static const struct snd_soc_dapm_widget rt5659_dapm_widgets[] = {
2436+
static const struct snd_soc_dapm_widget rt5659_particular_dapm_widgets[] = {
24372437
SND_SOC_DAPM_SUPPLY("LDO2", RT5659_PWR_ANLG_3, RT5659_PWR_LDO2_BIT, 0,
24382438
NULL, 0),
2439-
SND_SOC_DAPM_SUPPLY("PLL", RT5659_PWR_ANLG_3, RT5659_PWR_PLL_BIT, 0,
2440-
NULL, 0),
2439+
SND_SOC_DAPM_SUPPLY("MICBIAS1", RT5659_PWR_ANLG_2, RT5659_PWR_MB1_BIT,
2440+
0, NULL, 0),
24412441
SND_SOC_DAPM_SUPPLY("Mic Det Power", RT5659_PWR_VOL,
24422442
RT5659_PWR_MIC_DET_BIT, 0, NULL, 0),
2443+
};
2444+
2445+
static const struct snd_soc_dapm_widget rt5659_dapm_widgets[] = {
2446+
SND_SOC_DAPM_SUPPLY("PLL", RT5659_PWR_ANLG_3, RT5659_PWR_PLL_BIT, 0,
2447+
NULL, 0),
24432448
SND_SOC_DAPM_SUPPLY("Mono Vref", RT5659_PWR_ANLG_1,
24442449
RT5659_PWR_VREF3_BIT, 0, NULL, 0),
24452450

@@ -2464,8 +2469,6 @@ static const struct snd_soc_dapm_widget rt5659_dapm_widgets[] = {
24642469
RT5659_ADC_MONO_R_ASRC_SFT, 0, NULL, 0),
24652470

24662471
/* Input Side */
2467-
SND_SOC_DAPM_SUPPLY("MICBIAS1", RT5659_PWR_ANLG_2, RT5659_PWR_MB1_BIT,
2468-
0, NULL, 0),
24692472
SND_SOC_DAPM_SUPPLY("MICBIAS2", RT5659_PWR_ANLG_2, RT5659_PWR_MB2_BIT,
24702473
0, NULL, 0),
24712474
SND_SOC_DAPM_SUPPLY("MICBIAS3", RT5659_PWR_ANLG_2, RT5659_PWR_MB3_BIT,
@@ -3660,10 +3663,23 @@ static int rt5659_set_bias_level(struct snd_soc_component *component,
36603663

36613664
static int rt5659_probe(struct snd_soc_component *component)
36623665
{
3666+
struct snd_soc_dapm_context *dapm =
3667+
snd_soc_component_get_dapm(component);
36633668
struct rt5659_priv *rt5659 = snd_soc_component_get_drvdata(component);
36643669

36653670
rt5659->component = component;
36663671

3672+
switch (rt5659->pdata.jd_src) {
3673+
case RT5659_JD_HDA_HEADER:
3674+
break;
3675+
3676+
default:
3677+
snd_soc_dapm_new_controls(dapm,
3678+
rt5659_particular_dapm_widgets,
3679+
ARRAY_SIZE(rt5659_particular_dapm_widgets));
3680+
break;
3681+
}
3682+
36673683
return 0;
36683684
}
36693685

‎sound/soc/codecs/rt5682-sdw.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,8 @@ static int rt5682_io_init(struct device *dev, struct sdw_slave *slave)
462462

463463
regmap_update_bits(rt5682->regmap, RT5682_CBJ_CTRL_2,
464464
RT5682_EXT_JD_SRC, RT5682_EXT_JD_SRC_MANUAL);
465-
regmap_write(rt5682->regmap, RT5682_CBJ_CTRL_1, 0xd042);
465+
regmap_write(rt5682->regmap, RT5682_CBJ_CTRL_1, 0xd142);
466+
regmap_update_bits(rt5682->regmap, RT5682_CBJ_CTRL_5, 0x0700, 0x0600);
466467
regmap_update_bits(rt5682->regmap, RT5682_CBJ_CTRL_3,
467468
RT5682_CBJ_IN_BUF_EN, RT5682_CBJ_IN_BUF_EN);
468469
regmap_update_bits(rt5682->regmap, RT5682_SAR_IL_CMD_1,

‎sound/soc/codecs/tas2562.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,13 @@
5757
#define TAS2562_TDM_CFG0_RAMPRATE_MASK BIT(5)
5858
#define TAS2562_TDM_CFG0_RAMPRATE_44_1 BIT(5)
5959
#define TAS2562_TDM_CFG0_SAMPRATE_MASK GENMASK(3, 1)
60-
#define TAS2562_TDM_CFG0_SAMPRATE_7305_8KHZ 0x0
61-
#define TAS2562_TDM_CFG0_SAMPRATE_14_7_16KHZ 0x1
62-
#define TAS2562_TDM_CFG0_SAMPRATE_22_05_24KHZ 0x2
63-
#define TAS2562_TDM_CFG0_SAMPRATE_29_4_32KHZ 0x3
64-
#define TAS2562_TDM_CFG0_SAMPRATE_44_1_48KHZ 0x4
65-
#define TAS2562_TDM_CFG0_SAMPRATE_88_2_96KHZ 0x5
66-
#define TAS2562_TDM_CFG0_SAMPRATE_176_4_192KHZ 0x6
60+
#define TAS2562_TDM_CFG0_SAMPRATE_7305_8KHZ (0x0 << 1)
61+
#define TAS2562_TDM_CFG0_SAMPRATE_14_7_16KHZ (0x1 << 1)
62+
#define TAS2562_TDM_CFG0_SAMPRATE_22_05_24KHZ (0x2 << 1)
63+
#define TAS2562_TDM_CFG0_SAMPRATE_29_4_32KHZ (0x3 << 1)
64+
#define TAS2562_TDM_CFG0_SAMPRATE_44_1_48KHZ (0x4 << 1)
65+
#define TAS2562_TDM_CFG0_SAMPRATE_88_2_96KHZ (0x5 << 1)
66+
#define TAS2562_TDM_CFG0_SAMPRATE_176_4_192KHZ (0x6 << 1)
6767

6868
#define TAS2562_TDM_CFG2_RIGHT_JUSTIFY BIT(6)
6969

‎sound/soc/fsl/fsl-asoc-card.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -744,6 +744,7 @@ static int fsl_asoc_card_probe(struct platform_device *pdev)
744744
/* Initialize sound card */
745745
priv->pdev = pdev;
746746
priv->card.dev = &pdev->dev;
747+
priv->card.owner = THIS_MODULE;
747748
ret = snd_soc_of_parse_card_name(&priv->card, "model");
748749
if (ret) {
749750
snprintf(priv->name, sizeof(priv->name), "%s-audio",

‎sound/soc/qcom/lpass-cpu.c

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,30 @@ static void lpass_cpu_daiops_shutdown(struct snd_pcm_substream *substream,
9393
struct snd_soc_dai *dai)
9494
{
9595
struct lpass_data *drvdata = snd_soc_dai_get_drvdata(dai);
96+
struct lpaif_i2sctl *i2sctl = drvdata->i2sctl;
97+
unsigned int id = dai->driver->id;
9698

9799
clk_disable_unprepare(drvdata->mi2s_osr_clk[dai->driver->id]);
100+
/*
101+
* Ensure LRCLK is disabled even in device node validation.
102+
* Will not impact if disabled in lpass_cpu_daiops_trigger()
103+
* suspend.
104+
*/
105+
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
106+
regmap_fields_write(i2sctl->spken, id, LPAIF_I2SCTL_SPKEN_DISABLE);
107+
else
108+
regmap_fields_write(i2sctl->micen, id, LPAIF_I2SCTL_MICEN_DISABLE);
109+
110+
/*
111+
* BCLK may not be enabled if lpass_cpu_daiops_prepare is called before
112+
* lpass_cpu_daiops_shutdown. It's paired with the clk_enable in
113+
* lpass_cpu_daiops_prepare.
114+
*/
115+
if (drvdata->mi2s_was_prepared[dai->driver->id]) {
116+
drvdata->mi2s_was_prepared[dai->driver->id] = false;
117+
clk_disable(drvdata->mi2s_bit_clk[dai->driver->id]);
118+
}
119+
98120
clk_unprepare(drvdata->mi2s_bit_clk[dai->driver->id]);
99121
}
100122

@@ -275,6 +297,18 @@ static int lpass_cpu_daiops_trigger(struct snd_pcm_substream *substream,
275297
case SNDRV_PCM_TRIGGER_START:
276298
case SNDRV_PCM_TRIGGER_RESUME:
277299
case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
300+
/*
301+
* Ensure lpass BCLK/LRCLK is enabled during
302+
* device resume as lpass_cpu_daiops_prepare() is not called
303+
* after the device resumes. We don't check mi2s_was_prepared before
304+
* enable/disable BCLK in trigger events because:
305+
* 1. These trigger events are paired, so the BCLK
306+
* enable_count is balanced.
307+
* 2. the BCLK can be shared (ex: headset and headset mic),
308+
* we need to increase the enable_count so that we don't
309+
* turn off the shared BCLK while other devices are using
310+
* it.
311+
*/
278312
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
279313
ret = regmap_fields_write(i2sctl->spken, id,
280314
LPAIF_I2SCTL_SPKEN_ENABLE);
@@ -296,6 +330,10 @@ static int lpass_cpu_daiops_trigger(struct snd_pcm_substream *substream,
296330
case SNDRV_PCM_TRIGGER_STOP:
297331
case SNDRV_PCM_TRIGGER_SUSPEND:
298332
case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
333+
/*
334+
* To ensure lpass BCLK/LRCLK is disabled during
335+
* device suspend.
336+
*/
299337
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
300338
ret = regmap_fields_write(i2sctl->spken, id,
301339
LPAIF_I2SCTL_SPKEN_DISABLE);
@@ -315,12 +353,53 @@ static int lpass_cpu_daiops_trigger(struct snd_pcm_substream *substream,
315353
return ret;
316354
}
317355

356+
static int lpass_cpu_daiops_prepare(struct snd_pcm_substream *substream,
357+
struct snd_soc_dai *dai)
358+
{
359+
struct lpass_data *drvdata = snd_soc_dai_get_drvdata(dai);
360+
struct lpaif_i2sctl *i2sctl = drvdata->i2sctl;
361+
unsigned int id = dai->driver->id;
362+
int ret;
363+
364+
/*
365+
* Ensure lpass BCLK/LRCLK is enabled bit before playback/capture
366+
* data flow starts. This allows other codec to have some delay before
367+
* the data flow.
368+
* (ex: to drop start up pop noise before capture starts).
369+
*/
370+
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
371+
ret = regmap_fields_write(i2sctl->spken, id, LPAIF_I2SCTL_SPKEN_ENABLE);
372+
else
373+
ret = regmap_fields_write(i2sctl->micen, id, LPAIF_I2SCTL_MICEN_ENABLE);
374+
375+
if (ret) {
376+
dev_err(dai->dev, "error writing to i2sctl reg: %d\n", ret);
377+
return ret;
378+
}
379+
380+
/*
381+
* Check mi2s_was_prepared before enabling BCLK as lpass_cpu_daiops_prepare can
382+
* be called multiple times. It's paired with the clk_disable in
383+
* lpass_cpu_daiops_shutdown.
384+
*/
385+
if (!drvdata->mi2s_was_prepared[dai->driver->id]) {
386+
ret = clk_enable(drvdata->mi2s_bit_clk[id]);
387+
if (ret) {
388+
dev_err(dai->dev, "error in enabling mi2s bit clk: %d\n", ret);
389+
return ret;
390+
}
391+
drvdata->mi2s_was_prepared[dai->driver->id] = true;
392+
}
393+
return 0;
394+
}
395+
318396
const struct snd_soc_dai_ops asoc_qcom_lpass_cpu_dai_ops = {
319397
.set_sysclk = lpass_cpu_daiops_set_sysclk,
320398
.startup = lpass_cpu_daiops_startup,
321399
.shutdown = lpass_cpu_daiops_shutdown,
322400
.hw_params = lpass_cpu_daiops_hw_params,
323401
.trigger = lpass_cpu_daiops_trigger,
402+
.prepare = lpass_cpu_daiops_prepare,
324403
};
325404
EXPORT_SYMBOL_GPL(asoc_qcom_lpass_cpu_dai_ops);
326405

‎sound/soc/qcom/lpass.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@ struct lpass_data {
6767
/* MI2S SD lines to use for playback/capture */
6868
unsigned int mi2s_playback_sd_mode[LPASS_MAX_MI2S_PORTS];
6969
unsigned int mi2s_capture_sd_mode[LPASS_MAX_MI2S_PORTS];
70+
71+
/* The state of MI2S prepare dai_ops was called */
72+
bool mi2s_was_prepared[LPASS_MAX_MI2S_PORTS];
73+
7074
int hdmi_port_enable;
7175

7276
/* low-power audio interface (LPAIF) registers */

0 commit comments

Comments
 (0)