November 2021 - Alsa-devel - mailman.alsa-project.org

Intel SOF HDA: Lenovo m920sff support (Realtek ALC 233)
by GitHub issues - edited 04 Nov '21

04 Nov '21

alsa-project/alsa-ucm-conf issue #114 was edited from perexg: More info: https://github.com/thesofproject/linux/issues/3088 ``` Simple mixer control 'Master',0 Simple mixer control 'Headphone',0 Simple mixer control 'Headphone+LO',0 Simple mixer control 'Speaker',0 Simple mixer control 'Front Mic',0 Simple mixer control 'Front Mic Boost',0 Simple mixer control 'Line Out',0 Simple mixer control 'Mic',0 Simple mixer control 'Mic Boost',0 Simple mixer control 'IEC958',0 Simple mixer control 'IEC958',1 Simple mixer control 'IEC958',2 Simple mixer control 'Capture',0 Simple mixer control 'Auto-Mute Mode',0 Simple mixer control 'Dmic0',0 Simple mixer control 'Dmic1 2nd',0 Simple mixer control 'Loopback Mixing',0 Simple mixer control 'PGA1.0 1 Master',0 Simple mixer control 'PGA2.0 2 Master',0 Simple mixer control 'PGA3.0 3 Master',0 Simple mixer control 'PGA4.0 4 Master',0 Simple mixer control 'PGA7.0 7 Master',0 Simple mixer control 'PGA8.0 8 Master',0 Simple mixer control 'PGA9.0 9 Master',0 ``` Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/114 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

Lenovo m920sff support (Realtek ALC 233)
by GitHub issues - opened 04 Nov '21

04 Nov '21

alsa-project/alsa-ucm-conf issue #114 was opened from perexg: More info: https://github.com/thesofproject/linux/issues/3088 ``` Simple mixer control 'Master',0 Simple mixer control 'Headphone',0 Simple mixer control 'Headphone+LO',0 Simple mixer control 'Speaker',0 Simple mixer control 'Front Mic',0 Simple mixer control 'Front Mic Boost',0 Simple mixer control 'Line Out',0 Simple mixer control 'Mic',0 Simple mixer control 'Mic Boost',0 Simple mixer control 'IEC958',0 Simple mixer control 'IEC958',1 Simple mixer control 'IEC958',2 Simple mixer control 'Capture',0 Simple mixer control 'Auto-Mute Mode',0 Simple mixer control 'Dmic0',0 Simple mixer control 'Dmic1 2nd',0 Simple mixer control 'Loopback Mixing',0 Simple mixer control 'PGA1.0 1 Master',0 Simple mixer control 'PGA2.0 2 Master',0 Simple mixer control 'PGA3.0 3 Master',0 Simple mixer control 'PGA4.0 4 Master',0 Simple mixer control 'PGA7.0 7 Master',0 Simple mixer control 'PGA8.0 8 Master',0 Simple mixer control 'PGA9.0 9 Master',0 ``` Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/114 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

USB audio on riscv64
by Kip Warner 04 Nov '21

04 Nov '21

Hey list, Apologies for double posting on alsa-user(a)lists.sourceforge.net as well. Someone suggested this might be more appropriate for the developer mailing list. I am doing some development on riscv64 using a SiFive Unmatched development board. It has only one PCI express slot which I intend to use for a VGA, but it has a number of USB ports. Is anyone aware of any USB audio devices that are known to work, or likely to work, with ALSA on riscv64? I would have thought any device using the generic USB audio module would have worked. But when I went to plug in a small USB speaker, I see it show up on the bus and yet `aplay -l` shows no devices. Yours truly, -- Kip Warner -- Senior Software Engineer OpenPGP signed/encrypted mail preferred https://www.thevertigo.com

1 0

[PATCH] ASoC: amd: vangogh: add SPI dependency
by Arnd Bergmann 03 Nov '21

03 Nov '21

From: Arnd Bergmann <arnd(a)arndb.de> Without CONFIG_SPI, this fails to build: WARNING: unmet direct dependencies detected for SND_SOC_CS35L41_SPI Depends on [n]: SOUND [=m] && !UML && SND [=m] && SND_SOC [=m] && SPI_MASTER [=n] Selected by [m]: - SND_SOC_AMD_VANGOGH_MACH [=m] && SOUND [=m] && !UML && SND [=m] && SND_SOC [=m] && SND_SOC_AMD_ACP5x [=m] && I2C [=y] ERROR: modpost: "spi_setup" [sound/soc/codecs/snd-soc-cs35l41-spi.ko] undefined! ERROR: modpost: "__devm_regmap_init_spi" [sound/soc/codecs/snd-soc-cs35l41-spi.ko] undefined! Fixes: 96792fdd77cd ("ASoC: amd: enable vangogh platform machine driver build") Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- sound/soc/amd/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/amd/Kconfig b/sound/soc/amd/Kconfig index d91a9399777c..edee2098c82e 100644 --- a/sound/soc/amd/Kconfig +++ b/sound/soc/amd/Kconfig @@ -68,7 +68,7 @@ config SND_SOC_AMD_VANGOGH_MACH tristate "AMD Vangogh support for NAU8821 CS35L41" select SND_SOC_NAU8821 select SND_SOC_CS35L41_SPI - depends on SND_SOC_AMD_ACP5x && I2C + depends on SND_SOC_AMD_ACP5x && I2C && SPI help This option enables machine driver for Vangogh platform using NAU8821 and CS35L41 codecs. -- 2.29.2

2 1

[PATCH -next v2] ALSA: timer: Fix use-after-free problem
by Wang Wensheng 03 Nov '21

03 Nov '21

When the timer instance was add into ack_list but was not currently in process, the user could stop it via snd_timer_stop1() without delete it from the ack_list. Then the user could free the timer instance and when it was actually processed UAF occurred. This issue could be reproduced via testcase snd_timer01 in ltp - running several instances of that testcase at the same time. What I actually met was that the ack_list of the timer broken and the kernel went into deadloop with irqoff. That could be detected by hardlockup detector on board or when we run it on qemu, we could use gdb to dump the ack_list when the console has no response. To fix this issue, we delete the timer instance from ack_list and active_list unconditionally in snd_timer_stop1(). Signed-off-by: Wang Wensheng <wangwensheng4(a)huawei.com> Suggested-by: Takashi Iwai <tiwai(a)suse.de> --- sound/core/timer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/core/timer.c b/sound/core/timer.c index 92b7008fcdb8..4f9bab931951 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c @@ -624,13 +624,13 @@ static int snd_timer_stop1(struct snd_timer_instance *timeri, bool stop) if (!timer) return -EINVAL; spin_lock_irqsave(&timer->lock, flags); + list_del_init(&timeri->ack_list); + list_del_init(&timeri->active_list); if (!(timeri->flags & (SNDRV_TIMER_IFLG_RUNNING | SNDRV_TIMER_IFLG_START))) { result = -EBUSY; goto unlock; } - list_del_init(&timeri->ack_list); - list_del_init(&timeri->active_list); if (timer->card && timer->card->shutdown) goto unlock; if (stop) { -- 2.17.1

2 2

[PATCH] ALSA: hda/realtek: Headset fixup for Clevo NH77HJQ
by Tim Crawford 03 Nov '21

03 Nov '21

From: Jeremy Soller <jeremy(a)system76.com> On Clevo NH77HJ, NH77HP, and their 15" variants, there is a headset microphone input attached to 0x19 that does not have a jack detect. In order to get it working, the pin configuration needs to be set correctly, and a new ALC256_FIXUP_HEADSET_MODE_NO_HP_MIC fixup is applied. This is similar to the existing System76 quirk for ALC293, but for ALC256. Signed-off-by: Jeremy Soller <jeremy(a)system76.com> Signed-off-by: Tim Crawford <tcrawford(a)system76.com> --- sound/pci/hda/patch_realtek.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 8a3e2fe42106..e6b266416393 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -6739,6 +6739,7 @@ enum { ALC287_FIXUP_YOGA7_14ITL_SPEAKERS, ALC287_FIXUP_13S_GEN2_SPEAKERS, ALC256_FIXUP_TONGFANG_RESET_PERSISTENT_SETTINGS, + ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE, }; static const struct hda_fixup alc269_fixups[] = { @@ -8450,6 +8451,15 @@ static const struct hda_fixup alc269_fixups[] = { .type = HDA_FIXUP_FUNC, .v.func = alc245_fixup_hp_gpio_led, }, + [ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE] = { + .type = HDA_FIXUP_PINS, + .v.pins = (const struct hda_pintbl[]) { + { 0x19, 0x03a11120 }, /* use as headset mic, without its own jack detect */ + { } + }, + .chained = true, + .chain_id = ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC, + }, }; static const struct snd_pci_quirk alc269_fixup_tbl[] = { @@ -8750,11 +8760,15 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x1558, 0x40a1, "Clevo NL40GU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1558, 0x40c1, "Clevo NL40[CZ]U", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1558, 0x40d1, "Clevo NL41DU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x1558, 0x5015, "Clevo NH5[58]H[HJK]Q", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x1558, 0x5017, "Clevo NH7[79]H[HJK]Q", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1558, 0x50a3, "Clevo NJ51GU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1558, 0x50b3, "Clevo NK50S[BEZ]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1558, 0x50b6, "Clevo NK50S5", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1558, 0x50b8, "Clevo NK50SZ", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1558, 0x50d5, "Clevo NP50D5", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x1558, 0x50e1, "Clevo NH5[58]HPQ", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x1558, 0x50e2, "Clevo NH7[79]HPQ", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1558, 0x50f0, "Clevo NH50A[CDF]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1558, 0x50f2, "Clevo NH50E[PR]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1558, 0x50f3, "Clevo NH58DPQ", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE), -- 2.31.1

2 3

[PATCH 0/4] Fix kcontrol put callback in Tegra drivers
by Sameer Pujar 03 Nov '21

03 Nov '21

This series fixes kcontrol put callback in some of the Tegra drivers which are used on platforms based on Tegra210 and later. The callback is expected to return 1 whenever the HW update is done. ADMAIF, I2S, DMIC and DSPK drivers are updated as part of it. This idea is suggested by Jaroslav. Similar suggestion came from Mark during review of series [0] and drivers under those series were taken care. This series takes care of remaining drivers. I have added 'Suggested-by" tags accordingly. [0] https://lore.kernel.org/linux-arm-kernel/20210913142307.GF4283@sirena.org.u… Sameer Pujar (4): ASoC: tegra: Fix kcontrol put callback in ADMAIF ASoC: tegra: Fix kcontrol put callback in I2S ASoC: tegra: Fix kcontrol put callback in DMIC ASoC: tegra: Fix kcontrol put callback in DSPK sound/soc/tegra/tegra186_dspk.c | 4 +++- sound/soc/tegra/tegra210_admaif.c | 4 +++- sound/soc/tegra/tegra210_dmic.c | 4 +++- sound/soc/tegra/tegra210_i2s.c | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) -- 2.7.4

2 6

[PATCH] ASoC: codecs: Fix WCD_MBHC_HPH_PA_EN usage
by Christophe JAILLET 03 Nov '21

03 Nov '21

'hphpa_on' is known to be false, so the if block at the end of the function is dead code. Turn it into a meaningful code by having 'hphpa_on' be static. Use is as a flip-flop variable. Fixes: 0e5c9e7ff899 ("ASoC: codecs: wcd: add multi button Headset detection support") Signed-off-by: Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> --- The purpose of this patch is not to be correct (!) but to draw attention on several points: - in 'wcd_mbhc_adc_hs_rem_irq()', the "if (hphpa_on)" path is dead code because 'hphpa_on' is known to be false - What is this magic number '3'? All 'wcd_mbhc_read_field()' look for 0 or non-0 - a 'mutex_[un]lock()' in an IRQ handler looks spurious to me Instead of this (likely broken) patch, it is likely that something is missing elsewhere. Maybe in 'wcd_mbhc_adc_hs_ins_irq()'. I also guess that 'hphpa_on' should be read for somewhere else. --- sound/soc/codecs/wcd-mbhc-v2.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/wcd-mbhc-v2.c b/sound/soc/codecs/wcd-mbhc-v2.c index 405128ccb4b0..783d8c35bc1b 100644 --- a/sound/soc/codecs/wcd-mbhc-v2.c +++ b/sound/soc/codecs/wcd-mbhc-v2.c @@ -1176,7 +1176,7 @@ static irqreturn_t wcd_mbhc_adc_hs_rem_irq(int irq, void *data) struct wcd_mbhc *mbhc = data; unsigned long timeout; int adc_threshold, output_mv, retry = 0; - bool hphpa_on = false; + static bool hphpa_on = false; mutex_lock(&mbhc->lock); timeout = jiffies + msecs_to_jiffies(WCD_FAKE_REMOVAL_MIN_PERIOD_MS); @@ -1212,6 +1212,9 @@ static irqreturn_t wcd_mbhc_adc_hs_rem_irq(int irq, void *data) if (hphpa_on) { hphpa_on = false; + wcd_mbhc_write_field(mbhc, WCD_MBHC_HPH_PA_EN, 0); + } else { + hphpa_on = true; wcd_mbhc_write_field(mbhc, WCD_MBHC_HPH_PA_EN, 3); } exit: -- 2.30.2

3 3

[PATCH] ALSA: seq: Fix RCU stall in snd_seq_write()
by Zqiang 03 Nov '21

03 Nov '21

If we have a lot of cell object, this cycle may take a long time, and trigger RCU stall. insert a conditional reschedule point to fix it. rcu: INFO: rcu_preempt self-detected stall on CPU rcu: 1-....: (1 GPs behind) idle=9f5/1/0x4000000000000000 softirq=16474/16475 fqs=4916 (t=10500 jiffies g=19249 q=192515) NMI backtrace for cpu 1 ...... asm_sysvec_apic_timer_interrupt RIP: 0010:_raw_spin_unlock_irqrestore+0x38/0x70 spin_unlock_irqrestore snd_seq_prioq_cell_out+0x1dc/0x360 snd_seq_check_queue+0x1a6/0x3f0 snd_seq_enqueue_event+0x1ed/0x3e0 snd_seq_client_enqueue_event.constprop.0+0x19a/0x3c0 snd_seq_write+0x2db/0x510 vfs_write+0x1c4/0x900 ksys_write+0x171/0x1d0 do_syscall_64+0x35/0xb0 Reported-by: syzbot+bb950e68b400ab4f65f8(a)syzkaller.appspotmail.com Signed-off-by: Zqiang <qiang.zhang1211(a)gmail.com> --- sound/core/seq/seq_queue.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/core/seq/seq_queue.c b/sound/core/seq/seq_queue.c index d6c02dea976c..f5b1e4562a64 100644 --- a/sound/core/seq/seq_queue.c +++ b/sound/core/seq/seq_queue.c @@ -263,6 +263,7 @@ void snd_seq_check_queue(struct snd_seq_queue *q, int atomic, int hop) if (!cell) break; snd_seq_dispatch_event(cell, atomic, hop); + cond_resched(); } /* Process time queue... */ @@ -272,6 +273,7 @@ void snd_seq_check_queue(struct snd_seq_queue *q, int atomic, int hop) if (!cell) break; snd_seq_dispatch_event(cell, atomic, hop); + cond_resched(); } /* free lock */ -- 2.17.1

2 6

[PATCH] ASoC: tegra: Add master volume/mute control support
by Sameer Pujar 03 Nov '21

03 Nov '21

The MVC module has a per channel control bit, based on which it decides to apply channel specific volume/mute settings. When per channel control bit is enabled (which is the default HW configuration), all MVC channel volume/mute can be independently controlled. If the control is disabled, channel-0 volume/mute setting is applied by HW to all remaining channels. Thus add support to leverage this HW feature by exposing master controls for volume/mute. With this, now there are per channel and master volume/mute controls. Users need to just use controls which are suitable for their applications. The per channel control enable/disable is mananged in driver and hidden from users, so that they need to just worry about respective volume/mute controls. Signed-off-by: Sameer Pujar <spujar(a)nvidia.com> --- sound/soc/tegra/tegra210_mvc.c | 95 +++++++++++++++++++++++++++++++++++++----- sound/soc/tegra/tegra210_mvc.h | 2 + 2 files changed, 87 insertions(+), 10 deletions(-) diff --git a/sound/soc/tegra/tegra210_mvc.c b/sound/soc/tegra/tegra210_mvc.c index 7b9c700..40cd21a 100644 --- a/sound/soc/tegra/tegra210_mvc.c +++ b/sound/soc/tegra/tegra210_mvc.c @@ -123,7 +123,42 @@ static int tegra210_mvc_get_mute(struct snd_kcontrol *kcontrol, mute_mask = (val >> TEGRA210_MVC_MUTE_SHIFT) & TEGRA210_MUTE_MASK_EN; - ucontrol->value.integer.value[0] = mute_mask; + if (strstr(kcontrol->id.name, "Per Chan Mute Mask")) { + /* + * If per channel control is enabled, then return + * exact mute/unmute setting of all channels. + * + * Else report setting based on CH0 bit to reflect + * the correct HW state. + */ + if (val & TEGRA210_MVC_PER_CHAN_CTRL_EN) { + ucontrol->value.integer.value[0] = mute_mask; + } else { + if (mute_mask & TEGRA210_MVC_CH0_MUTE_EN) + ucontrol->value.integer.value[0] = + TEGRA210_MUTE_MASK_EN; + else + ucontrol->value.integer.value[0] = 0; + } + } else { + /* + * If per channel control is disabled, then return + * master mute/unmute setting based on CH0 bit. + * + * Else report settings based on state of all + * channels. + */ + if (!(val & TEGRA210_MVC_PER_CHAN_CTRL_EN)) { + ucontrol->value.integer.value[0] = + mute_mask & TEGRA210_MVC_CH0_MUTE_EN; + } else { + if (mute_mask == TEGRA210_MUTE_MASK_EN) + ucontrol->value.integer.value[0] = + TEGRA210_MVC_CH0_MUTE_EN; + else + ucontrol->value.integer.value[0] = 0; + } + } return 0; } @@ -136,6 +171,7 @@ static int tegra210_mvc_put_mute(struct snd_kcontrol *kcontrol, struct snd_soc_component *cmpnt = snd_soc_kcontrol_component(kcontrol); struct tegra210_mvc *mvc = snd_soc_component_get_drvdata(cmpnt); unsigned int value; + u32 reg_mask; u8 mute_mask; int err; @@ -150,11 +186,22 @@ static int tegra210_mvc_put_mute(struct snd_kcontrol *kcontrol, mute_mask = ucontrol->value.integer.value[0]; - err = regmap_update_bits(mvc->regmap, mc->reg, - TEGRA210_MVC_MUTE_MASK, - mute_mask << TEGRA210_MVC_MUTE_SHIFT); - if (err < 0) - goto end; + if (strstr(kcontrol->id.name, "Per Chan Mute Mask")) { + regmap_update_bits(mvc->regmap, TEGRA210_MVC_CTRL, + TEGRA210_MVC_PER_CHAN_CTRL_EN_MASK, + TEGRA210_MVC_PER_CHAN_CTRL_EN); + + reg_mask = TEGRA210_MVC_MUTE_MASK; + } else { + regmap_update_bits(mvc->regmap, TEGRA210_MVC_CTRL, + TEGRA210_MVC_PER_CHAN_CTRL_EN_MASK, + 0); + + reg_mask = TEGRA210_MVC_CH0_MUTE_MASK; + } + + regmap_update_bits(mvc->regmap, mc->reg, reg_mask, + mute_mask << TEGRA210_MVC_MUTE_SHIFT); return 1; @@ -212,11 +259,31 @@ static int tegra210_mvc_put_vol(struct snd_kcontrol *kcontrol, ucontrol->value.integer.value[0]); /* Configure init volume same as target volume */ - regmap_write(mvc->regmap, - TEGRA210_MVC_REG_OFFSET(TEGRA210_MVC_INIT_VOL, chan), - mvc->volume[chan]); + if (strstr(kcontrol->id.name, "Channel")) { + regmap_update_bits(mvc->regmap, TEGRA210_MVC_CTRL, + TEGRA210_MVC_PER_CHAN_CTRL_EN_MASK, + TEGRA210_MVC_PER_CHAN_CTRL_EN); + + regmap_write(mvc->regmap, + TEGRA210_MVC_REG_OFFSET(TEGRA210_MVC_INIT_VOL, chan), + mvc->volume[chan]); + + regmap_write(mvc->regmap, reg, mvc->volume[chan]); + } else { + int i; + + regmap_update_bits(mvc->regmap, TEGRA210_MVC_CTRL, + TEGRA210_MVC_PER_CHAN_CTRL_EN_MASK, + 0); + + for (i = 1; i < TEGRA210_MVC_MAX_CHAN_COUNT; i++) + mvc->volume[i] = mvc->volume[0]; - regmap_write(mvc->regmap, reg, mvc->volume[chan]); + regmap_write(mvc->regmap, TEGRA210_MVC_INIT_VOL, + mvc->volume[0]); + + regmap_write(mvc->regmap, reg, mvc->volume[0]); + } regmap_update_bits(mvc->regmap, TEGRA210_MVC_SWITCH, TEGRA210_MVC_VOLUME_SWITCH_MASK, @@ -422,6 +489,14 @@ static const struct snd_kcontrol_new tegra210_mvc_vol_ctrl[] = { TEGRA210_MVC_CTRL, 0, TEGRA210_MUTE_MASK_EN, 0, tegra210_mvc_get_mute, tegra210_mvc_put_mute), + /* Master volume */ + SOC_SINGLE_EXT("Volume", TEGRA210_MVC_TARGET_VOL, 0, 16000, 0, + tegra210_mvc_get_vol, tegra210_mvc_put_vol), + + /* Master mute */ + SOC_SINGLE_EXT("Mute", TEGRA210_MVC_CTRL, 0, 1, 0, + tegra210_mvc_get_mute, tegra210_mvc_put_mute), + SOC_ENUM_EXT("Curve Type", tegra210_mvc_curve_type_ctrl, tegra210_mvc_get_curve_type, tegra210_mvc_put_curve_type), }; diff --git a/sound/soc/tegra/tegra210_mvc.h b/sound/soc/tegra/tegra210_mvc.h index def29c4..7f2567e 100644 --- a/sound/soc/tegra/tegra210_mvc.h +++ b/sound/soc/tegra/tegra210_mvc.h @@ -59,6 +59,8 @@ #define TEGRA210_MUTE_MASK_EN 0xff #define TEGRA210_MVC_MUTE_MASK (TEGRA210_MUTE_MASK_EN << TEGRA210_MVC_MUTE_SHIFT) #define TEGRA210_MVC_MUTE_EN (TEGRA210_MUTE_MASK_EN << TEGRA210_MVC_MUTE_SHIFT) +#define TEGRA210_MVC_CH0_MUTE_EN 1 +#define TEGRA210_MVC_CH0_MUTE_MASK (TEGRA210_MVC_CH0_MUTE_EN << TEGRA210_MVC_MUTE_SHIFT) #define TEGRA210_MVC_PER_CHAN_CTRL_EN_SHIFT 30 #define TEGRA210_MVC_PER_CHAN_CTRL_EN_MASK (1 << TEGRA210_MVC_PER_CHAN_CTRL_EN_SHIFT) -- 2.7.4

3 6