March 2022 - Alsa-devel - mailman.alsa-project.org

Add UCM for PinePhone
by GitHub pull_request - edited 26 Mar '22

26 Mar '22

alsa-project/alsa-ucm-conf pull request #134 was edited from tomfitzhenry: Fixes https://github.com/alsa-project/alsa-ucm-conf/issues/124. This PR adds support for the https://wiki.pine64.org/index.php/PinePhone This PR contains: * This UCM config copied from https://gitlab.com/pine64-org/pine64-alsa-ucm/, which was developed by many developers ( https://gitlab.com/pine64-org/pine64-alsa-ucm/-/merge_requests/1 ) and is BSD-3-Clause licensed. * Fix paths to be relative to alsa-ucm-conf root. * Some refactoring of the UCM config, incl. removing duplicate directives, and moving volume directives to BootSequence. * Updating the playback/boost volumes, in response to comments on this PR. I have tested: * HiFi * Record audio via the headset. * Record audio via the internal mic. * Play audio on the headphones. * Play audio on the speaker. * Play audio on the internal speaker. * Voice Call * Speak on the headset. * Speak on the internal mic. * Listen on the headphones. * Listen on the speaker. This induces an echo, and given the audio routing is entirely on chip, and the chip doesn't advertise echo cancellation, I don't see how this is avoidable. * Listen on the internal speaker. See also: * `alsa-info`: https://alsa-project.org/db/?f=5e331f5ef10bd167b3bd7640bfcf0e879100f80d * `pa-info`: [pa-info.txt](https://github.com/alsa-project/alsa-ucm-conf/files/8015083/pa… * https://gitlab.com/pine64-org/pine64-alsa-ucm/-/issues/3 * Schematics/code * The device-tree configuration has had a unique audio card name since 5.14: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arc… * http://files.pine64.org/doc/PinePhone/PinePhone%20v1.2%20Released%20Schemat… * https://xnux.eu/devices/feature/audio-pp.html * https://github.com/torvalds/linux/blob/master/arch/arm64/boot/dts/allwinner… * https://github.com/torvalds/linux/blob/master/arch/arm64/boot/dts/allwinner… * https://github.com/torvalds/linux/blob/master/sound/soc/sunxi/sun50i-codec-… * https://files.pine64.org/doc/datasheet/pine64/Allwinner_A64_User_Manual_V1.… * https://static.chipdip.ru/lib/126/DOC001126567.pdf Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/134 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/134.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH -next] ASoC: SOF: Intel: Fix build error without SND_SOC_SOF_PCI_DEV
by Zheng Bin 25 Mar '22

25 Mar '22

If SND_SOC_SOF_PCI_DEV is n, bulding fails: sound/soc/sof/intel/pci-tng.o:(.data+0x1c0): undefined reference to `sof_pci_probe' sound/soc/sof/intel/pci-tng.o:(.data+0x1c8): undefined reference to `sof_pci_remove' sound/soc/sof/intel/pci-tng.o:(.data+0x1e0): undefined reference to `sof_pci_shutdown' sound/soc/sof/intel/pci-tng.o:(.data+0x290): undefined reference to `sof_pci_pm' Make SND_SOC_SOF_MERRIFIELD select SND_SOC_SOF_PCI_DEV to fix this. Fixes: 8d4ba1be3d22 ("ASoC: SOF: pci: split PCI into different drivers") Reported-by: Hulk Robot <hulkci(a)huawei.com> Signed-off-by: Zheng Bin <zhengbin13(a)huawei.com> --- sound/soc/sof/intel/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/sof/intel/Kconfig b/sound/soc/sof/intel/Kconfig index b53f216d4ecc..172419392b33 100644 --- a/sound/soc/sof/intel/Kconfig +++ b/sound/soc/sof/intel/Kconfig @@ -84,6 +84,7 @@ if SND_SOC_SOF_PCI config SND_SOC_SOF_MERRIFIELD tristate "SOF support for Tangier/Merrifield" default SND_SOC_SOF_PCI + select SND_SOC_SOF_PCI_DEV select SND_SOC_SOF_INTEL_ATOM_HIFI_EP help This adds support for Sound Open Firmware for Intel(R) platforms -- 2.31.1

3 2

[PATCH] ASoC: rt5682s: Separate the regulator consumer controls
by derek.fang＠realtek.com 25 Mar '22

25 Mar '22

From: Derek Fang <derek.fang(a)realtek.com> Control the regulators separately instead of using regulator_bulk to accord to the timing request in the datasheet. Signed-off-by: Derek Fang <derek.fang(a)realtek.com> --- sound/soc/codecs/rt5682s.c | 26 +++++++++++++++++++++----- sound/soc/codecs/rt5682s.h | 6 +++++- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/rt5682s.c b/sound/soc/codecs/rt5682s.c index 1cba8ec7cedb..b8bf9aede29c 100644 --- a/sound/soc/codecs/rt5682s.c +++ b/sound/soc/codecs/rt5682s.c @@ -42,8 +42,8 @@ static const struct rt5682s_platform_data i2s_default_platform_data = { }; static const char *rt5682s_supply_names[RT5682S_NUM_SUPPLIES] = { - "AVDD", - "MICVDD", + [RT5682S_SUPPLY_AVDD] = "AVDD", + [RT5682S_SUPPLY_MICVDD] = "MICVDD", }; static const struct reg_sequence patch_list[] = { @@ -3025,8 +3025,17 @@ static struct snd_soc_dai_driver rt5682s_dai[] = { static void rt5682s_i2c_disable_regulators(void *data) { struct rt5682s_priv *rt5682s = data; + int ret; + + ret = regulator_disable(rt5682s->supplies[RT5682S_SUPPLY_AVDD].consumer); + if (ret) + pr_err("%s: Failed to disable supply AVDD: %d\n", __func__, ret); - regulator_bulk_disable(ARRAY_SIZE(rt5682s->supplies), rt5682s->supplies); + usleep_range(1000, 1500); + + ret = regulator_disable(rt5682s->supplies[RT5682S_SUPPLY_MICVDD].consumer); + if (ret) + pr_err("%s: Failed to disable supply MICVDD: %d\n", __func__, ret); } static int rt5682s_i2c_probe(struct i2c_client *i2c, @@ -3071,9 +3080,16 @@ static int rt5682s_i2c_probe(struct i2c_client *i2c, if (ret) return ret; - ret = regulator_bulk_enable(ARRAY_SIZE(rt5682s->supplies), rt5682s->supplies); + ret = regulator_enable(rt5682s->supplies[RT5682S_SUPPLY_MICVDD].consumer); + if (ret) { + dev_err(&i2c->dev, "Failed to enable supply MICVDD: %d\n", ret); + return ret; + } + usleep_range(1000, 1500); + + ret = regulator_enable(rt5682s->supplies[RT5682S_SUPPLY_AVDD].consumer); if (ret) { - dev_err(&i2c->dev, "Failed to enable supplies: %d\n", ret); + dev_err(&i2c->dev, "Failed to enable supply AVDD: %d\n", ret); return ret; } diff --git a/sound/soc/codecs/rt5682s.h b/sound/soc/codecs/rt5682s.h index 397a2531b6f6..7353831c73dd 100644 --- a/sound/soc/codecs/rt5682s.h +++ b/sound/soc/codecs/rt5682s.h @@ -1434,7 +1434,11 @@ struct pll_calc_map { bool sel_ps; }; -#define RT5682S_NUM_SUPPLIES 2 +enum { + RT5682S_SUPPLY_AVDD, + RT5682S_SUPPLY_MICVDD, + RT5682S_NUM_SUPPLIES, +}; struct rt5682s_priv { struct snd_soc_component *component; -- 2.17.1

2 1

[PATCH v2 1/2] ASoC: bindings: fsl-asoc-card: Add compatible for tlv320aic31xx codec
by Ariel D'Alessandro 25 Mar '22

25 Mar '22

Commit 8c9b9cfb7724 ("ASoC: fsl-asoc-card: Support fsl,imx-audio-tlv320aic31xx codec")' added support for tlv320aic31xx codec to fsl-asoc-card, but missed the related device-tree compatible string documentation. Fix this. Signed-off-by: Ariel D'Alessandro <ariel.dalessandro(a)collabora.com> --- Documentation/devicetree/bindings/sound/fsl-asoc-card.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/fsl-asoc-card.txt b/Documentation/devicetree/bindings/sound/fsl-asoc-card.txt index b219626a5403..8b4f4015cfe4 100644 --- a/Documentation/devicetree/bindings/sound/fsl-asoc-card.txt +++ b/Documentation/devicetree/bindings/sound/fsl-asoc-card.txt @@ -40,6 +40,8 @@ The compatible list for this generic sound card currently: "fsl,imx-audio-tlv320aic32x4" + "fsl,imx-audio-tlv320aic31xx" + "fsl,imx-audio-si476x" "fsl,imx-audio-wm8958" -- 2.34.1

4 7

Re: Apogee ONEv2 keeps resetting
by Alan Stern 24 Mar '22

24 Mar '22

On Thu, Mar 24, 2022 at 03:44:41AM +0100, Petr Janecek wrote: > Hi Alan, > > On 3/22/22 19:03, Alan Stern wrote: > > On Sun, Mar 20, 2022 at 02:15:40AM +0100, Petr Janecek wrote: > > > Hi, > > > I'm trying to use Apogee ONEv2. From usb dumps under > > > macos or windows it seems like a usb Class Audio 2.0 > > > device, but in linux, it keeps resetting every two seconds > > > or so. It keeps resetting even when the snd-usb-audio > > > driver is disabled, so the problem is probably at a lower > > > level. > > > > Can you post the log output on a system where snd-usb-audio is disabled? > > [ 3412.279063] usb 3-8: new high-speed USB device number 6 using xhci_hcd > [ 3412.470003] usb 3-8: New USB device found, idVendor=0c60, idProduct=0017, > bcdDevice= 1.05 > [ 3412.470017] usb 3-8: New USB device strings: Mfr=1, Product=2, > SerialNumber=3 > [ 3412.470023] usb 3-8: Product: ONEv2 > [ 3412.470028] usb 3-8: Manufacturer: Apogee > [ 3412.470033] usb 3-8: SerialNumber: 0C12FF2020204652334D513A7A2A9B > [ 3413.217053] usb 3-8: USB disconnect, device number 6 > [ 3413.629046] usb 3-8: new high-speed USB device number 7 using xhci_hcd > [ 3413.829760] usb 3-8: New USB device found, idVendor=0c60, idProduct=0017, > bcdDevice= 1.05 > [ 3413.829766] usb 3-8: New USB device strings: Mfr=1, Product=2, > SerialNumber=3 > [ 3413.829768] usb 3-8: Product: ONEv2 > [ 3413.829770] usb 3-8: Manufacturer: Apogee > [ 3413.829772] usb 3-8: SerialNumber: 0C12FF2020204652334D513A7A2A9B > [ 3414.421964] usb 3-8: USB disconnect, device number 7 > [ 3414.838981] usb 3-8: new high-speed USB device number 8 using xhci_hcd > [ 3415.029947] usb 3-8: New USB device found, idVendor=0c60, idProduct=0017, > bcdDevice= 1.05 > [ 3415.029961] usb 3-8: New USB device strings: Mfr=1, Product=2, > SerialNumber=3 > [ 3415.029968] usb 3-8: Product: ONEv2 > [ 3415.029973] usb 3-8: Manufacturer: Apogee > [ 3415.029978] usb 3-8: SerialNumber: 0C12FF2020204652334D513A7A2A9B > [ 3415.627052] usb 3-8: USB disconnect, device number 8 Nothing particularly suspicious there. > > > > The messages below are from v5.16.16, but it behaves > > > the same no matter what I plug it into. > > > > > > [ 253.708616] usb 3-8: new high-speed USB device number 6 using xhci_hcd > > > [ 253.899363] usb 3-8: New USB device found, idVendor=0c60, idProduct=0017, > > > bcdDevice= 1.05 > > > [ 253.899370] usb 3-8: New USB device strings: Mfr=1, Product=2, > > > SerialNumber=3 > > > [ 253.899373] usb 3-8: Product: ONEv2 > > > [ 253.899375] usb 3-8: Manufacturer: Apogee > > > [ 253.899377] usb 3-8: SerialNumber: 0C12FF2020204652334D513A7A2A9B > > > [ 253.960901] mc: Linux media interface: v0.10 > > > > Any idea where that line came from? > > That's from CONFIG_MEDIA_CONTROLLER, which is selected for usb > webcam. It also selects CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER. > Compiled it out, rebooted. Now the line is missing, but no other > change. > > > You should try capturing a usbmon trace showing what happens when the > > device is plugged in and then resets. Preferably on a system where > > snd-usb-audio is disabled. > > Trace from wireshark is attached. The trace doesn't help much, unfortunately. It shows normal device initialization, plus a couple of extra string descriptor reads. About 1/2 second afterward, the device disconnects itself electronically from the USB bus and reconnects 20 ms later. I get the feeling that the device expects to receive some specific messages from the host within that one-half second, and disconnects if it doesn't see them. And presumably it doesn't get what it's looking for even when the USB sound drivers are enabled. Although I doubt it will show anything helpful, you might try collecting a usbmon trace with the sound drivers enabled. Perhaps it will suggest something to the USB audio developers. > > One other thing you might try: Disable runtime PM for USB ("echo -1 > > > /sys/module/usbcore/parameters/autosuspend" before plugging in the > > device). > > Makes no difference -- almost: after few resets it once took much > longer (>10x) to reconnect. Oh well, it was worth a try. Some devices don't like runtime suspend. But obviously that isn't the problem here. Alan Stern

1 0

snd_hda_intel initialization failure with Xen PCI passthrough
by Jason Andryuk 24 Mar '22

24 Mar '22

Hi, I'm running Xen hypervisor and using PCI passthrough to assign an Intel HDA audio device (00:1f.3 Audio device: Intel Corporation Cannon Point-LP High Definition Audio Controller (rev 30)) to a Xen HVM virtual machine. I do this for both Linux 5.4.185 and a different Windows 10 VM (only one at a time). The Windows VM seems to work every time. The Linux VM has issues after the first VM boot. This is one boot of the physical hardware and multiple boots of the virtual machines. For Linux, on first boot, the sound card is detected and works properly. After that, things usually don't work. I just ran a reboot loop and it was: 1st boot - audio detected and working 2 & 3 - no audio 4th - audio detected and working 5 - 20 - no audio For boots 2, 3, 5-7, dmesg shows: [ 0.760401] hdaudio hdaudioC0D0: no AFG or MFG node found [ 0.760415] snd_hda_intel 0000:00:06.0: no codecs initialized For boots 8+, the errors changed to: [ 0.783397] hdaudio hdaudioC0D0: cannot read sub nodes for FG 0x10 [ 0.783413] snd_hda_intel 0000:00:06.0: no codecs initialized At this point, I booted a Windows 10 VM and audio works Trying to boot Linux again gives a new error message [ 0.789041] snd_hda_intel 0000:00:06.0: Unknown capability 0 [ 1.811205] snd_hda_intel 0000:00:06.0: No response from codec, resetting bus: last cmd=0x0eef0004 [ 1.811246] hdaudio hdaudioC0D0: cannot read sub nodes for FG 0x10ee [ 1.811263] snd_hda_intel 0000:00:06.0: no codecs initialized Reboot VM and it's back to: [ 0.775917] hdaudio hdaudioC0D0: no AFG or MFG node found [ 0.775932] snd_hda_intel 0000:00:06.0: no codecs initialized Reboot VM and again: [ 0.789069] hdaudio hdaudioC0D0: cannot read sub nodes for FG 0x10 [ 0.789084] snd_hda_intel 0000:00:06.0: no codecs initialized Reboot physical laptop: 1. boot Windows 10 - audio works 2. boot Linux - audio works 3. reboot Linux - no audio [ 0.773111] hdaudio hdaudioC0D0: no AFG or MFG node found [ 0.773151] snd_hda_intel 0000:00:06.0: no codecs initialized This seems to me like Windows does a better job resetting the card to get the audio hardware working. Any suggestions on what to investigate? Thanks, Jason

2 4

[PATCH 1/1] ALSA: hda/realtek: Add mute and micmut LED support for Zbook Fury 17 G9
by Kai-Heng Feng 24 Mar '22

24 Mar '22

Zbook Fury 17 G9 requires the same ALC285_FIXUP_HP_GPIO_LED quirk to make its audio LEDs work. So apply the quirk, and make it the last one since it's an LED quirk. Signed-off-by: Kai-Heng Feng <kai.heng.feng(a)canonical.com> --- sound/pci/hda/patch_realtek.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index f6ee67f41c45a..e88fbef57c40c 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -7011,6 +7011,7 @@ enum { ALC287_FIXUP_LEGION_16ACHG6, ALC287_FIXUP_CS35L41_I2C_2, ALC245_FIXUP_CS35L41_SPI_2, + ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED, ALC245_FIXUP_CS35L41_SPI_4, ALC245_FIXUP_CS35L41_SPI_4_HP_GPIO_LED, ALC285_FIXUP_HP_SPEAKERS_MICMUTE_LED, @@ -8776,6 +8777,12 @@ static const struct hda_fixup alc269_fixups[] = { .type = HDA_FIXUP_FUNC, .v.func = cs35l41_fixup_spi_two, }, + [ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED] = { + .type = HDA_FIXUP_FUNC, + .v.func = cs35l41_fixup_spi_two, + .chained = true, + .chain_id = ALC285_FIXUP_HP_GPIO_LED, + }, [ALC245_FIXUP_CS35L41_SPI_4] = { .type = HDA_FIXUP_FUNC, .v.func = cs35l41_fixup_spi_four, @@ -9031,7 +9038,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x103c, 0x89ac, "HP EliteBook 640 G9", ALC236_FIXUP_HP_GPIO_LED), SND_PCI_QUIRK(0x103c, 0x89ae, "HP EliteBook 650 G9", ALC236_FIXUP_HP_GPIO_LED), SND_PCI_QUIRK(0x103c, 0x89c3, "Zbook Studio G9", ALC245_FIXUP_CS35L41_SPI_4_HP_GPIO_LED), - SND_PCI_QUIRK(0x103c, 0x89c6, "Zbook Fury 17 G9", ALC245_FIXUP_CS35L41_SPI_2), + SND_PCI_QUIRK(0x103c, 0x89c6, "Zbook Fury 17 G9", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED), SND_PCI_QUIRK(0x103c, 0x89ca, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF), SND_PCI_QUIRK(0x1043, 0x103e, "ASUS X540SA", ALC256_FIXUP_ASUS_MIC), SND_PCI_QUIRK(0x1043, 0x103f, "ASUS TX300", ALC282_FIXUP_ASUS_TX300), -- 2.34.1

2 1

RE: [PATCH 00/19] ASoC: fsl_micfil: Driver updates
by S.J. Wang 24 Mar '22

24 Mar '22

Hi > > This series has a bunch of cleanups for the FSL MICFIL driver. There is not > much chance for regressions in this series as the driver currently can't work > at all. The MICFIL needs multififo support in the i.MX SDMA engine which is > added with this series, see 10/19. > > The multififo support is selected in the dma phandle arguments in the device > tree, the transfer type must be '25' aka IMX_DMATYPE_MULTI_SAI. > This is set already to 25 in the upstream i.MX8M[NM] dtsi files, but the SDMA > driver silently ignores unsupported values instead of throwing an error. This > is fixed in this series and multififo support is added. > > I think the series should go via the ASoC tree, so I'll need an ack from the > DMA guys for 9/19 and 10/10. Thanks for this series, basically I am ok with the fsl_micfil part, just a comments for sdma change as we have discussed. Best regards Wang Shengjiu > > Sascha > > Sascha Hauer (19): > ASoC: fsl_micfil: Drop unnecessary register read > ASoC: fsl_micfil: Drop unused register read > ASoC: fsl_micfil: drop fsl_micfil_set_mclk_rate() > ASoC: fsl_micfil: do not define SHIFT/MASK for single bits > ASoC: fsl_micfil: use GENMASK to define register bit fields > ASoC: fsl_micfil: use clear/set bits > ASoC: fsl_micfil: drop error messages from failed register accesses > ASoC: fsl_micfil: drop unused variables > dma: imx-sdma: error out on unsupported transfer types > dma: imx-sdma: Add multi fifo support > ASoC: fsl_micfil: add multi fifo support > ASoC: fsl_micfil: use define for OSR default value > ASoC: fsl_micfil: Drop get_pdm_clk() > ASoC: fsl_micfil: simplify clock setting > ASoC: fsl_micfil: rework quality setting > ASoC: fsl_micfil: drop unused include > ASoC: fsl_micfil: drop only once used defines > ASoC: fsl_micfil: drop support for undocumented property > ASoC: fsl_micfil: fold fsl_set_clock_params() into its only user > > drivers/dma/imx-sdma.c | 71 ++++- > include/linux/platform_data/dma-imx.h | 7 + > sound/soc/fsl/fsl_micfil.c | 368 +++++++++----------------- > sound/soc/fsl/fsl_micfil.h | 269 +++++-------------- > 4 files changed, 265 insertions(+), 450 deletions(-) > > -- > 2.30.2

1 0

[v6 0/4] ASoC: mediatek: mt8192: support rt1015p_rt5682s
by Jiaxin Yu 24 Mar '22

24 Mar '22

The series reuses mt8192-mt6359-rt10150rt5682.c for supporting machine driver with rt1015p speaker amplifier and rt5682s headset codec. Changes from v5: - "mediatek,headset-codec" and "mediatek,speaker-codec" drop prefix and move to properties from patternProperties. Changes form v4: - split a large patch into three small patches for easy reviewing - correct coding style Changes from v3: - fix build error: too many arguments for format [-Werror-format-extra-args] Changes from v2: - fix build warnings such as "data argument not used by format string" Changes from v1: - uses the snd_soc_of_get_dai_link_codecs to complete the configuration of dai_link's codecs - uses definitions to simplifies card name and compatible name Jiaxin Yu (4): ASoC: dt-bindings: mt8192-mt6359: add new compatible and new properties ASoC: mediatek: mt8192: refactor for I2S3 DAI link of speaker ASoC: mediatek: mt8192: refactor for I2S8/I2S9 DAI links of headset ASoC: mediatek: mt8192: support rt1015p_rt5682s .../sound/mt8192-mt6359-rt1015-rt5682.yaml | 32 +++ sound/soc/mediatek/Kconfig | 1 + .../mt8192/mt8192-mt6359-rt1015-rt5682.c | 201 +++++++++++------- 3 files changed, 156 insertions(+), 78 deletions(-) -- 2.18.0

2 8

[PATCH v4 1/3] rename tas2764 to tas27xx-Makefile and Kconfig
by Raphael-Xu 23 Mar '22

23 Mar '22

Signed-off-by: Raphael-Xu <13691752556(a)139.com> --- sound/soc/codecs/Kconfig | 13 ++++++++----- sound/soc/codecs/Makefile | 4 ++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index d3e5ae8310ef..95f45f3b6b17 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -212,8 +212,8 @@ config SND_SOC_ALL_CODECS imply SND_SOC_STI_SAS imply SND_SOC_TAS2552 imply SND_SOC_TAS2562 - imply SND_SOC_TAS2764 imply SND_SOC_TAS2770 + imply SND_SOC_TAS27XX imply SND_SOC_TAS5086 imply SND_SOC_TAS571X imply SND_SOC_TAS5720 @@ -1459,14 +1459,17 @@ config SND_SOC_TAS2562 tristate "Texas Instruments TAS2562 Mono Audio amplifier" depends on I2C -config SND_SOC_TAS2764 - tristate "Texas Instruments TAS2764 Mono Audio amplifier" - depends on I2C - config SND_SOC_TAS2770 tristate "Texas Instruments TAS2770 speaker amplifier" depends on I2C +config SND_SOC_TAS27XX + tristate "Texas Instruments TAS27xx speaker amplifier" + depends on I2C + help + Enable support for Texas Instruments TAS2764 and TAS2780 + power amplifiers + config SND_SOC_TAS5086 tristate "Texas Instruments TAS5086 speaker amplifier" depends on I2C diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index ac7f20972470..2cd2b2352ee7 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -334,7 +334,7 @@ snd-soc-simple-amplifier-objs := simple-amplifier.o snd-soc-tpa6130a2-objs := tpa6130a2.o snd-soc-tas2552-objs := tas2552.o snd-soc-tas2562-objs := tas2562.o -snd-soc-tas2764-objs := tas2764.o +snd-soc-tas27xx-objs := tas27xx.o # Mux snd-soc-simple-mux-objs := simple-mux.o @@ -570,7 +570,7 @@ obj-$(CONFIG_SND_SOC_STAC9766) += snd-soc-stac9766.o obj-$(CONFIG_SND_SOC_STI_SAS) += snd-soc-sti-sas.o obj-$(CONFIG_SND_SOC_TAS2552) += snd-soc-tas2552.o obj-$(CONFIG_SND_SOC_TAS2562) += snd-soc-tas2562.o -obj-$(CONFIG_SND_SOC_TAS2764) += snd-soc-tas2764.o +obj-$(CONFIG_SND_SOC_TAS27XX) += snd-soc-tas27xx.o obj-$(CONFIG_SND_SOC_TAS5086) += snd-soc-tas5086.o obj-$(CONFIG_SND_SOC_TAS571X) += snd-soc-tas571x.o obj-$(CONFIG_SND_SOC_TAS5720) += snd-soc-tas5720.o -- 2.35.1

4 7