July 2018 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH 00/15] ASoC: meson: add axg audio subsystem support
by Jerome Brunet 26 Jul '18

26 Jul '18

This patchset adds support for the audio subsystem found on Amlogic's axg SoC family. The first SoC of this family is the A113D/X targeted at smart speaker application. The G12a SoC family, Amlogic next-gen STB chipset, will reuse this audio subsystem with a few changes. This patchset implements the DPCM machine driver and the different components it made of. Several components are still missing, such spdif input and pdm, and will submitted later on. The fancier part of this patchset is probably around the TDM. Properly modeling the SoC architecture and its capatilities made things a little more complex than usual (details in the related commit descriptions) If necessary, this patchset could broken into smaller series. For the intial submission, I wanted to give a global view of the subsystem. Hopefully, it will make it a bit easier to understand. Jerome Brunet (15): ASoC: meson: add axg fifos DT binding documentation ASoC: meson: add axg fifo base driver ASoC: meson: add axg frddr driver ASoC: meson: add axg toddr driver ASoC: meson: add axg spdif output DT bindings documentation ASoC: meson: add axg spdif output ASoC: meson: add axg tdm formatters DT bindings documentation ASoC: meson: add axg tdm interface DT bindings documentation ASoC: meson: add tdm formatter base driver ASoC: meson: add tdm interface driver ASoC: meson: add tdm output driver ASoC: meson: add tdm input driver ASoC: export snd_soc_of_get_slot_mask ASoC: meson: add axg sound card DT bindings documentation ASoC: meson: add axg sound card support .../devicetree/bindings/sound/amlogic,axg-fifo.txt | 23 + .../bindings/sound/amlogic,axg-sound-card.txt | 124 ++++ .../bindings/sound/amlogic,axg-spdifout.txt | 20 + .../bindings/sound/amlogic,axg-tdm-formatters.txt | 28 + .../bindings/sound/amlogic,axg-tdm-iface.txt | 22 + include/sound/soc.h | 3 + sound/soc/Kconfig | 1 + sound/soc/Makefile | 1 + sound/soc/meson/Kconfig | 64 ++ sound/soc/meson/Makefile | 21 + sound/soc/meson/axg-card.c | 671 +++++++++++++++++++++ sound/soc/meson/axg-fifo.c | 341 +++++++++++ sound/soc/meson/axg-fifo.h | 80 +++ sound/soc/meson/axg-frddr.c | 141 +++++ sound/soc/meson/axg-spdifout.c | 456 ++++++++++++++ sound/soc/meson/axg-tdm-formatter.c | 381 ++++++++++++ sound/soc/meson/axg-tdm-formatter.h | 39 ++ sound/soc/meson/axg-tdm-interface.c | 542 +++++++++++++++++ sound/soc/meson/axg-tdm.h | 78 +++ sound/soc/meson/axg-tdmin.c | 229 +++++++ sound/soc/meson/axg-tdmout.c | 259 ++++++++ sound/soc/meson/axg-toddr.c | 199 ++++++ sound/soc/soc-core.c | 7 +- 23 files changed, 3727 insertions(+), 3 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/amlogic,axg-fifo.txt create mode 100644 Documentation/devicetree/bindings/sound/amlogic,axg-sound-card.txt create mode 100644 Documentation/devicetree/bindings/sound/amlogic,axg-spdifout.txt create mode 100644 Documentation/devicetree/bindings/sound/amlogic,axg-tdm-formatters.txt create mode 100644 Documentation/devicetree/bindings/sound/amlogic,axg-tdm-iface.txt create mode 100644 sound/soc/meson/Kconfig create mode 100644 sound/soc/meson/Makefile create mode 100644 sound/soc/meson/axg-card.c create mode 100644 sound/soc/meson/axg-fifo.c create mode 100644 sound/soc/meson/axg-fifo.h create mode 100644 sound/soc/meson/axg-frddr.c create mode 100644 sound/soc/meson/axg-spdifout.c create mode 100644 sound/soc/meson/axg-tdm-formatter.c create mode 100644 sound/soc/meson/axg-tdm-formatter.h create mode 100644 sound/soc/meson/axg-tdm-interface.c create mode 100644 sound/soc/meson/axg-tdm.h create mode 100644 sound/soc/meson/axg-tdmin.c create mode 100644 sound/soc/meson/axg-tdmout.c create mode 100644 sound/soc/meson/axg-toddr.c -- 2.14.4

4 39

[alsa-devel] Applied "ASoC: AMD: Add a fix voltage regulator for DA7219 and ADAU7002" to the asoc tree
by Mark Brown 26 Jul '18

26 Jul '18

The patch ASoC: AMD: Add a fix voltage regulator for DA7219 and ADAU7002 has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From c183fec10ae6b3d1dfb77471d4158e576f6b43ae Mon Sep 17 00:00:00 2001 From: Akshu Agrawal <akshu.agrawal(a)amd.com> Date: Wed, 25 Jul 2018 17:00:59 +0800 Subject: [PATCH] ASoC: AMD: Add a fix voltage regulator for DA7219 and ADAU7002 DA7219 for our platform need to be configured for 1.8V. Hence, we add a volatge regulator with supplies of 1.8V in the machine driver. Signed-off-by: Adam Thomson <Adam.Thomson.Opensource(a)diasemi.com> Signed-off-by: Akshu Agrawal <akshu.agrawal(a)amd.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/amd/Kconfig | 1 + sound/soc/amd/acp-da7219-max98357a.c | 43 ++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/sound/soc/amd/Kconfig b/sound/soc/amd/Kconfig index 6cbf9cf4d1a4..58c1dcb4d255 100644 --- a/sound/soc/amd/Kconfig +++ b/sound/soc/amd/Kconfig @@ -8,6 +8,7 @@ config SND_SOC_AMD_CZ_DA7219MX98357_MACH select SND_SOC_DA7219 select SND_SOC_MAX98357A select SND_SOC_ADAU7002 + select REGULATOR depends on SND_SOC_AMD_ACP && I2C help This option enables machine driver for DA7219 and MAX9835. diff --git a/sound/soc/amd/acp-da7219-max98357a.c b/sound/soc/amd/acp-da7219-max98357a.c index f42606e5879e..cd3cf6e691a9 100644 --- a/sound/soc/amd/acp-da7219-max98357a.c +++ b/sound/soc/amd/acp-da7219-max98357a.c @@ -32,6 +32,8 @@ #include <linux/clk.h> #include <linux/gpio.h> #include <linux/module.h> +#include <linux/regulator/machine.h> +#include <linux/regulator/driver.h> #include <linux/i2c.h> #include <linux/input.h> #include <linux/acpi.h> @@ -320,11 +322,52 @@ static struct snd_soc_card cz_card = { .num_controls = ARRAY_SIZE(cz_mc_controls), }; +static struct regulator_consumer_supply acp_da7219_supplies[] = { + REGULATOR_SUPPLY("VDD", "i2c-DLGS7219:00"), + REGULATOR_SUPPLY("VDDMIC", "i2c-DLGS7219:00"), + REGULATOR_SUPPLY("VDDIO", "i2c-DLGS7219:00"), + REGULATOR_SUPPLY("IOVDD", "ADAU7002:00"), +}; + +static struct regulator_init_data acp_da7219_data = { + .constraints = { + .always_on = 1, + }, + .num_consumer_supplies = ARRAY_SIZE(acp_da7219_supplies), + .consumer_supplies = acp_da7219_supplies, +}; + +static struct regulator_config acp_da7219_cfg = { + .init_data = &acp_da7219_data, +}; + +static struct regulator_ops acp_da7219_ops = { +}; + +static struct regulator_desc acp_da7219_desc = { + .name = "reg-fixed-1.8V", + .type = REGULATOR_VOLTAGE, + .owner = THIS_MODULE, + .ops = &acp_da7219_ops, + .fixed_uV = 1800000, /* 1.8V */ + .n_voltages = 1, +}; + static int cz_probe(struct platform_device *pdev) { int ret; struct snd_soc_card *card; struct acp_platform_info *machine; + struct regulator_dev *rdev; + + acp_da7219_cfg.dev = &pdev->dev; + rdev = devm_regulator_register(&pdev->dev, &acp_da7219_desc, + &acp_da7219_cfg); + if (IS_ERR(rdev)) { + dev_err(&pdev->dev, "Failed to register regulator: %d\n", + ret); + return -EINVAL; + } machine = devm_kzalloc(&pdev->dev, sizeof(struct acp_platform_info), GFP_KERNEL); -- 2.18.0

1 0

[alsa-devel] [PATCH v2] ASoC: AMD: Fix build warning
by Akshu Agrawal 26 Jul '18

26 Jul '18

Fixes sound/soc/amd/acp-da7219-max98357a.c: In function 'cz_probe': sound/soc/amd/acp-da7219-max98357a.c:367:3: warning: 'ret' may be used uninitialized in this function [-Wmaybe-uninitialized] dev_err(&pdev->dev, "Failed to register regulator: %d\n", ret); Signed-off-by: Akshu Agrawal <akshu.agrawal(a)amd.com> --- v2: closing braces missing sound/soc/amd/acp-da7219-max98357a.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/amd/acp-da7219-max98357a.c b/sound/soc/amd/acp-da7219-max98357a.c index cd3cf6e..8e3275a 100644 --- a/sound/soc/amd/acp-da7219-max98357a.c +++ b/sound/soc/amd/acp-da7219-max98357a.c @@ -365,7 +365,7 @@ static int cz_probe(struct platform_device *pdev) &acp_da7219_cfg); if (IS_ERR(rdev)) { dev_err(&pdev->dev, "Failed to register regulator: %d\n", - ret); + (int)PTR_ERR(rdev)); return -EINVAL; } -- 1.9.1

2 1

[alsa-devel] [PATCH] ALSA: trident: Suppress gcc string warning
by Takashi Iwai 26 Jul '18

26 Jul '18

The meddlesome gcc warns about the possible shortname string in trident driver code: sound/pci/trident/trident.c: In function ‘snd_trident_probe’: sound/pci/trident/trident.c:126:2: warning: ‘strcat’ accessing 17 or more bytes at offsets 36 and 20 may overlap 1 byte at offset 36 [-Wrestrict] strcat(card->shortname, card->driver); It happens since gcc calculates the possible string size from card->driver, but this can't be true since we did set the string just before that, and they are much shorter. For shutting it up, use the exactly same string set to card->driver for strcat() to card->shortname, too. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/trident/trident.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/pci/trident/trident.c b/sound/pci/trident/trident.c index cedf13b64803..2f18b1cdc2cd 100644 --- a/sound/pci/trident/trident.c +++ b/sound/pci/trident/trident.c @@ -123,7 +123,7 @@ static int snd_trident_probe(struct pci_dev *pci, } else { strcpy(card->shortname, "Trident "); } - strcat(card->shortname, card->driver); + strcat(card->shortname, str); sprintf(card->longname, "%s PCI Audio at 0x%lx, irq %d", card->shortname, trident->port, trident->irq); -- 2.18.0

1 0

[alsa-devel] [PATCH 1/2] ASoC: tegra: improve goto error label
by Marcel Ziswiler 26 Jul '18

26 Jul '18

From: Marcel Ziswiler <marcel.ziswiler(a)toradex.com> While the two error labels "err" and "err_clk_put" goto the same place it is rather confusing that the earlier one is certainly used later again. Signed-off-by: Marcel Ziswiler <marcel.ziswiler(a)toradex.com> --- sound/soc/tegra/tegra20_ac97.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/tegra/tegra20_ac97.c b/sound/soc/tegra/tegra20_ac97.c index affad46bf188..682ef33afb5f 100644 --- a/sound/soc/tegra/tegra20_ac97.c +++ b/sound/soc/tegra/tegra20_ac97.c @@ -377,7 +377,7 @@ static int tegra20_ac97_platform_probe(struct platform_device *pdev) ret = clk_prepare_enable(ac97->clk_ac97); if (ret) { dev_err(&pdev->dev, "clk_enable failed: %d\n", ret); - goto err; + goto err_clk_put; } ret = snd_soc_set_ac97_ops(&tegra20_ac97_ops); -- 2.14.4

5 12

[alsa-devel] [PATCH] Added support for Encore mDSD USB DAC
by Jeff Crukley 26 Jul '18

26 Jul '18

From: JCruk <jcrukley(a)gmail.com> This patch adds native DSD playback support for the Encore mDSD USB DAC by specifying the vendor and product ID's Signed-off-by: Jeff Crukley <jcrukley(a)gmail.com> --- sound/usb/quirks.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index 02b6cc0..6fbafce 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -1373,6 +1373,7 @@ u64 snd_usb_interface_dsd_format_quirks(struct snd_usb_audio *chip, return SNDRV_PCM_FMTBIT_DSD_U32_BE; break; + case USB_ID(0x16d0, 0x09dd): /* Encore mDSD */ case USB_ID(0x0d8c, 0x0316): /* Hegel HD12 DSD */ case USB_ID(0x16b0, 0x06b2): /* NuPrime DAC-10 */ case USB_ID(0x16d0, 0x0733): /* Furutech ADL Stratos */ -- 2.7.4

2 1

[alsa-devel] [PATCH] ASoC: AMD: Fix build warning
by Akshu Agrawal 26 Jul '18

26 Jul '18

Fixes sound/soc/amd/acp-da7219-max98357a.c: In function 'cz_probe': sound/soc/amd/acp-da7219-max98357a.c:367:3: warning: 'ret' may be used uninitialized in this function [-Wmaybe-uninitialized] dev_err(&pdev->dev, "Failed to register regulator: %d\n", ret); Signed-off-by: Akshu Agrawal <akshu.agrawal(a)amd.com> --- sound/soc/amd/acp-da7219-max98357a.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/amd/acp-da7219-max98357a.c b/sound/soc/amd/acp-da7219-max98357a.c index cd3cf6e..48c1d94 100644 --- a/sound/soc/amd/acp-da7219-max98357a.c +++ b/sound/soc/amd/acp-da7219-max98357a.c @@ -365,7 +365,7 @@ static int cz_probe(struct platform_device *pdev) &acp_da7219_cfg); if (IS_ERR(rdev)) { dev_err(&pdev->dev, "Failed to register regulator: %d\n", - ret); + (int)PTR_ERR(rdev); return -EINVAL; } -- 1.9.1

1 0

[alsa-devel] [PATCH 00/14] ALSA: Proper endian notations
by Takashi Iwai 25 Jul '18

25 Jul '18

Hi, this is a patchset for correcting the integer types to the endian-wise ones, as caught by sparse. Just cosmetic fixes for catching future bugs, no functional change by itself. Takashi === Takashi Iwai (14): ALSA: ymfpci: Proper endian notations ALSA: trident: Proper endian notations ALSA: hda: Proper endian notations for BDL pointers ALSA: riptide: Properly endian notations ALSA: mixart: Proper endian notations ALSA: lola: Proper endian notations ALSA: intel8x0: Proper endian notations ALSA: intel8x0m: Proper endian notations ALSA: maestro3: Proper endian notations ALSA: echoaudio: Proper endian notations ALSA: bt87x: Proper endian notations ALSA: atiixp: Proper endian notations ALSA: atiixp_modem: Proper endian notations ALSA: sb: Proper endian notations sound/hda/hdac_stream.c | 4 +- sound/isa/sb/sb16_csp.c | 30 +++++------ sound/pci/atiixp.c | 4 +- sound/pci/atiixp_modem.c | 4 +- sound/pci/bt87x.c | 4 +- sound/pci/echoaudio/echoaudio.h | 2 +- sound/pci/echoaudio/echoaudio_3g.c | 14 +++--- sound/pci/echoaudio/echoaudio_dsp.c | 6 +-- sound/pci/echoaudio/echoaudio_dsp.h | 50 +++++++++--------- sound/pci/echoaudio/echoaudio_gml.c | 8 +-- sound/pci/intel8x0.c | 6 +-- sound/pci/intel8x0m.c | 6 +-- sound/pci/lola/lola.c | 4 +- sound/pci/lola/lola.h | 4 +- sound/pci/lola/lola_pcm.c | 8 +-- sound/pci/maestro3.c | 6 +-- sound/pci/mixart/mixart_core.c | 4 +- sound/pci/mixart/mixart_hwdep.c | 42 ++++++++-------- sound/pci/mixart/mixart_hwdep.h | 8 +-- sound/pci/riptide/riptide.c | 8 +-- sound/pci/trident/trident.h | 2 +- sound/pci/trident/trident_main.c | 2 +- sound/pci/ymfpci/ymfpci.h | 78 ++++++++++++++--------------- sound/pci/ymfpci/ymfpci_main.c | 6 +-- 24 files changed, 157 insertions(+), 153 deletions(-) -- 2.18.0

1 14

[alsa-devel] [PATCH 00/10] ALSA: yet more PCM format type conversion fixes
by Takashi Iwai 25 Jul '18

25 Jul '18

Hi, this is a series of similar fixes as the previous patchset for ASoC, covering other ALSA drivers to deal with PCM format type properly. Takashi === Takashi Iwai (10): ALSA: hda: Fix implicit PCM format type conversion ALSA: riptide: Fix PCM format type conversion ALSA: pcm: Fix sparse warning wrt PCM format type ALSA: ad1816a: Fix sparse warning wrt PCM format type ALSA: au88x0: Fix sparse warning wrt PCM format type ALSA: asihpi: Fix PCM format notations ALSA: wss: Fix sparse warning wrt PCM format type ALSA: sb: Fix PCM format bit calculation ALSA: sb: Fix sparse warning wrt PCM format type ALSA: xen: Use standard pcm_format_to_bits() for ALSA format bits include/sound/hdaudio.h | 3 ++- include/sound/sb16_csp.h | 2 +- sound/core/oss/pcm_oss.c | 2 +- sound/hda/hdac_device.c | 2 +- sound/isa/ad1816a/ad1816a_lib.c | 3 ++- sound/isa/sb/sb16_csp.c | 6 +++--- sound/isa/sb/sb16_main.c | 9 ++++++--- sound/isa/wss/wss_lib.c | 2 +- sound/pci/asihpi/asihpi.c | 24 +++++++++++++----------- sound/pci/au88x0/au88x0.h | 2 +- sound/pci/au88x0/au88x0_core.c | 2 +- sound/pci/riptide/riptide.c | 2 +- sound/xen/xen_snd_front_alsa.c | 4 ++-- 13 files changed, 35 insertions(+), 28 deletions(-) -- 2.18.0

1 10

[alsa-devel] [PATCH 00/12] Fixes for sparse warnings and other misc bugs
by Takashi Iwai 25 Jul '18

25 Jul '18

Hi, this is a series of patches to correct bugs spotted by sparse and manual lookups, applied in a wide range of drivers. Takashi === Takashi Iwai (12): ALSA: usb-audio: Fix multiple definitions in AU0828_DEVICE() macro ALSA: msnd: Add missing __iomem annotations ALSA: msnd: Fix the default sample sizes ALSA: hda/ca0132 - Use NULL instead of 0 ALSA: msnd: Use NULL instead of 0 ALSA: hda - Fix a sparse warning about snd_ctl_elem_iface_t ALSA: opl3: Declare common variables properly ALSA: usb-audio: Declare the common variable in header file ALSA: pcm: Add __force to cast in snd_pcm_lib_read/write() ALSA: pcm: Use standard lower_32_bits() and upper_32_bits() ALSA: korg1212: Add __force annotation to cast in user-copy callbacks ALSA: emu10k1: Fix missing __force annotation for user/kernel pointer cast include/sound/pcm.h | 4 ++-- sound/core/oss/pcm_plugin.c | 8 ++++---- sound/drivers/opl3/opl3_drums.c | 2 -- sound/drivers/opl3/opl3_lib.c | 3 +-- sound/drivers/opl3/opl3_midi.c | 4 ---- sound/drivers/opl3/opl3_oss.c | 2 -- sound/drivers/opl3/opl3_synth.c | 1 + sound/drivers/opl3/opl3_voice.h | 4 ++++ sound/isa/msnd/msnd.c | 18 +++++++++--------- sound/isa/msnd/msnd.h | 2 +- sound/isa/msnd/msnd_midi.c | 2 +- sound/isa/msnd/msnd_pinnacle.c | 8 ++++---- sound/pci/emu10k1/emufx.c | 24 ++++++++++++------------ sound/pci/hda/hda_codec.c | 4 ++-- sound/pci/hda/patch_ca0132.c | 3 +-- sound/pci/korg1212/korg1212.c | 4 ++-- sound/usb/mixer.h | 2 ++ sound/usb/mixer_quirks.c | 2 -- sound/usb/quirks-table.h | 3 ++- 19 files changed, 48 insertions(+), 52 deletions(-) -- 2.18.0

1 12

[alsa-devel] [PATCH 1/3] ALSA: vx222: Fix invalid endian conversions
by Takashi Iwai 25 Jul '18

25 Jul '18

The endian conversions used in vx2_dma_read() and vx2_dma_write() are superfluous and even wrong on big-endian machines, as inl() and outl() already do conversions. Kill them. Spotted by sparse, a warning like: sound/pci/vx222/vx222_ops.c:278:30: warning: incorrect type in argument 1 (different base types) Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/vx222/vx222_ops.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/pci/vx222/vx222_ops.c b/sound/pci/vx222/vx222_ops.c index d4298af6d3ee..c0d0bf44f365 100644 --- a/sound/pci/vx222/vx222_ops.c +++ b/sound/pci/vx222/vx222_ops.c @@ -275,7 +275,7 @@ static void vx2_dma_write(struct vx_core *chip, struct snd_pcm_runtime *runtime, length >>= 2; /* in 32bit words */ /* Transfer using pseudo-dma. */ for (; length > 0; length--) { - outl(cpu_to_le32(*addr), port); + outl(*addr, port); addr++; } addr = (u32 *)runtime->dma_area; @@ -285,7 +285,7 @@ static void vx2_dma_write(struct vx_core *chip, struct snd_pcm_runtime *runtime, count >>= 2; /* in 32bit words */ /* Transfer using pseudo-dma. */ for (; count > 0; count--) { - outl(cpu_to_le32(*addr), port); + outl(*addr, port); addr++; } @@ -313,7 +313,7 @@ static void vx2_dma_read(struct vx_core *chip, struct snd_pcm_runtime *runtime, length >>= 2; /* in 32bit words */ /* Transfer using pseudo-dma. */ for (; length > 0; length--) - *addr++ = le32_to_cpu(inl(port)); + *addr++ = inl(port); addr = (u32 *)runtime->dma_area; pipe->hw_ptr = 0; } @@ -321,7 +321,7 @@ static void vx2_dma_read(struct vx_core *chip, struct snd_pcm_runtime *runtime, count >>= 2; /* in 32bit words */ /* Transfer using pseudo-dma. */ for (; count > 0; count--) - *addr++ = le32_to_cpu(inl(port)); + *addr++ = inl(port); vx2_release_pseudo_dma(chip); } -- 2.18.0

1 2

[alsa-devel] [PATCH] ALSA: seq: Fix poll() error return
by Takashi Iwai 25 Jul '18

25 Jul '18

The sanity checks in ALSA sequencer and OSS sequencer emulation codes return falsely -ENXIO from poll callback. They should be EPOLLERR instead. This was caught thanks to the recent change to the return value. Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/core/seq/oss/seq_oss.c | 2 +- sound/core/seq/seq_clientmgr.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/core/seq/oss/seq_oss.c b/sound/core/seq/oss/seq_oss.c index 5f64d0d88320..e1f44fc86885 100644 --- a/sound/core/seq/oss/seq_oss.c +++ b/sound/core/seq/oss/seq_oss.c @@ -203,7 +203,7 @@ odev_poll(struct file *file, poll_table * wait) struct seq_oss_devinfo *dp; dp = file->private_data; if (snd_BUG_ON(!dp)) - return -ENXIO; + return EPOLLERR; return snd_seq_oss_poll(dp, file, wait); } diff --git a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c index 56ca78423040..6fd4b074b206 100644 --- a/sound/core/seq/seq_clientmgr.c +++ b/sound/core/seq/seq_clientmgr.c @@ -1101,7 +1101,7 @@ static __poll_t snd_seq_poll(struct file *file, poll_table * wait) /* check client structures are in place */ if (snd_BUG_ON(!client)) - return -ENXIO; + return EPOLLERR; if ((snd_seq_file_flags(file) & SNDRV_SEQ_LFLG_INPUT) && client->data.user.fifo) { -- 2.18.0

1 0

[alsa-devel] Need some help building alsa-utils
by Jamey Kirby 25 Jul '18

25 Jul '18

I have been working with alsa for a while. We use it to archive content from our radio station. I am using arecord. Build problem: 1) I cloned alsa-utils from github 2) Spent two hours on Google trying to figure out how to build the darn thing. 3) I am running Ubuntu Server 18.0 with build-essentials installed. 4) I get errors that I do not know how to fix when I try to setup ./configure. 5) I just need to make a build. What do I need to do? Feature: I am adding a feature. In the loop for capture(), when a new file is opened, I want to close the old file (when doing continuous recording). I added a new CLI parameter -K. When this is set, the capture() loop will close the old file before opening the new file. This is an issue for me for two reasons: 1) When will i run out of file handles? I capture one hour files continuously. After 10 hours, I see that all the capture files are still open? 2) I need to be notified when the file is closed so that I can do post-processing of rht capture. I've tried inotifywait in a script, and in another script I tried lsof. lsof works great, but the files are open,. See, the main issue is that I need to know when each file completes so that I can post process. Here is my post process script outline: #!/bin/bash for f in $HOME/vboxshare/jkirby/newarc/*.raw do filename=$(basename $f) open=$(lsof -t $f | wc -w) if [ $open -lt 1 ] then echo "$filename is closed" echo "Do post processing here" else echo "$filename is open by $open processe(s)" fi done If I could close the file before or after the previous file is closed, I can do my work. Otherwise, I have no way to know if the file is open and being processed or not. So, I've made the changes, I just need to build the darn thing. Thanks for any advice or help. -- Jamey Kirby Disrupting the establishment since 1964 This is a personal email account and as such, emails are not subject to archiving. Nothing else really matters.

1 2

[alsa-devel] [asoc:topic/amd 1/1] sound/soc/amd/acp-da7219-max98357a.c:325:3: warning: 'ret' may be used uninitialized in this function
by kbuild test robot 25 Jul '18

25 Jul '18

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git topic/amd head: 7b5317aa809f833d017196ad4a34e3b3b7dae101 commit: 7b5317aa809f833d017196ad4a34e3b3b7dae101 [1/1] ASoC: AMD: Add a fix voltage regulator for DA7219 and ADAU7002 config: x86_64-randconfig-x002-201829 (attached as .config) compiler: gcc-7 (Debian 7.3.0-16) 7.3.0 reproduce: git checkout 7b5317aa809f833d017196ad4a34e3b3b7dae101 # save the attached .config to linux build tree make ARCH=x86_64 Note: it may well be a FALSE warning. FWIW you are at least aware of it now. http://gcc.gnu.org/wiki/Better_Uninitialized_Warnings All warnings (new ones prefixed by >>): sound/soc/amd/acp-da7219-max98357a.c: In function 'cz_probe': >> sound/soc/amd/acp-da7219-max98357a.c:325:3: warning: 'ret' may be used uninitialized in this function [-Wmaybe-uninitialized] dev_err(&pdev->dev, "Failed to register regulator: %d\n", ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ret); ~~~~ vim +/ret +325 sound/soc/amd/acp-da7219-max98357a.c 313 314 static int cz_probe(struct platform_device *pdev) 315 { 316 int ret; 317 struct snd_soc_card *card; 318 struct acp_platform_info *machine; 319 struct regulator_dev *rdev; 320 321 acp_da7219_cfg.dev = &pdev->dev; 322 rdev = devm_regulator_register(&pdev->dev, &acp_da7219_desc, 323 &acp_da7219_cfg); 324 if (IS_ERR(rdev)) { > 325 dev_err(&pdev->dev, "Failed to register regulator: %d\n", 326 ret); 327 return -EINVAL; 328 } 329 330 machine = devm_kzalloc(&pdev->dev, sizeof(struct acp_platform_info), 331 GFP_KERNEL); 332 if (!machine) 333 return -ENOMEM; 334 card = &cz_card; 335 cz_card.dev = &pdev->dev; 336 platform_set_drvdata(pdev, card); 337 snd_soc_card_set_drvdata(card, machine); 338 ret = devm_snd_soc_register_card(&pdev->dev, &cz_card); 339 if (ret) { 340 dev_err(&pdev->dev, 341 "devm_snd_soc_register_card(%s) failed: %d\n", 342 cz_card.name, ret); 343 return ret; 344 } 345 bt_uart_enable = !device_property_read_bool(&pdev->dev, 346 "bt-pad-enable"); 347 return 0; 348 } 349 --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] [PATCH v2] ASoC: AMD: Add a fix voltage regulator for DA7219 and ADAU7002
by Akshu Agrawal 25 Jul '18

25 Jul '18

DA7219 for our platform need to be configured for 1.8V. Hence, we add a volatge regulator with supplies of 1.8V in the machine driver. Signed-off-by: Adam Thomson <Adam.Thomson.Opensource(a)diasemi.com> Signed-off-by: Akshu Agrawal <akshu.agrawal(a)amd.com> --- sound/soc/amd/Kconfig | 1 + sound/soc/amd/acp-da7219-max98357a.c | 43 ++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/sound/soc/amd/Kconfig b/sound/soc/amd/Kconfig index 6cbf9cf..58c1dcb 100644 --- a/sound/soc/amd/Kconfig +++ b/sound/soc/amd/Kconfig @@ -8,6 +8,7 @@ config SND_SOC_AMD_CZ_DA7219MX98357_MACH select SND_SOC_DA7219 select SND_SOC_MAX98357A select SND_SOC_ADAU7002 + select REGULATOR depends on SND_SOC_AMD_ACP && I2C help This option enables machine driver for DA7219 and MAX9835. diff --git a/sound/soc/amd/acp-da7219-max98357a.c b/sound/soc/amd/acp-da7219-max98357a.c index f42606e..cd3cf6e 100644 --- a/sound/soc/amd/acp-da7219-max98357a.c +++ b/sound/soc/amd/acp-da7219-max98357a.c @@ -32,6 +32,8 @@ #include <linux/clk.h> #include <linux/gpio.h> #include <linux/module.h> +#include <linux/regulator/machine.h> +#include <linux/regulator/driver.h> #include <linux/i2c.h> #include <linux/input.h> #include <linux/acpi.h> @@ -320,11 +322,52 @@ static void cz_dmic_shutdown(struct snd_pcm_substream *substream) .num_controls = ARRAY_SIZE(cz_mc_controls), }; +static struct regulator_consumer_supply acp_da7219_supplies[] = { + REGULATOR_SUPPLY("VDD", "i2c-DLGS7219:00"), + REGULATOR_SUPPLY("VDDMIC", "i2c-DLGS7219:00"), + REGULATOR_SUPPLY("VDDIO", "i2c-DLGS7219:00"), + REGULATOR_SUPPLY("IOVDD", "ADAU7002:00"), +}; + +static struct regulator_init_data acp_da7219_data = { + .constraints = { + .always_on = 1, + }, + .num_consumer_supplies = ARRAY_SIZE(acp_da7219_supplies), + .consumer_supplies = acp_da7219_supplies, +}; + +static struct regulator_config acp_da7219_cfg = { + .init_data = &acp_da7219_data, +}; + +static struct regulator_ops acp_da7219_ops = { +}; + +static struct regulator_desc acp_da7219_desc = { + .name = "reg-fixed-1.8V", + .type = REGULATOR_VOLTAGE, + .owner = THIS_MODULE, + .ops = &acp_da7219_ops, + .fixed_uV = 1800000, /* 1.8V */ + .n_voltages = 1, +}; + static int cz_probe(struct platform_device *pdev) { int ret; struct snd_soc_card *card; struct acp_platform_info *machine; + struct regulator_dev *rdev; + + acp_da7219_cfg.dev = &pdev->dev; + rdev = devm_regulator_register(&pdev->dev, &acp_da7219_desc, + &acp_da7219_cfg); + if (IS_ERR(rdev)) { + dev_err(&pdev->dev, "Failed to register regulator: %d\n", + ret); + return -EINVAL; + } machine = devm_kzalloc(&pdev->dev, sizeof(struct acp_platform_info), GFP_KERNEL); -- 1.9.1

2 1

[alsa-devel] [PATCH 1/3] ASoC: rt5651: add Volume to the name of volume control
by Bard Liao 25 Jul '18

25 Jul '18

add Volume to the name of volume control Signed-off-by: Bard Liao <bardliao(a)realtek.com> --- sound/soc/codecs/rt5651.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/rt5651.c b/sound/soc/codecs/rt5651.c index 985852f..fe970ed 100644 --- a/sound/soc/codecs/rt5651.c +++ b/sound/soc/codecs/rt5651.c @@ -332,11 +332,11 @@ static const struct snd_kcontrol_new rt5651_snd_controls[] = { RT5651_L_VOL_SFT, RT5651_R_VOL_SFT, 175, 0, dac_vol_tlv), /* IN1/IN2/IN3 Control */ - SOC_SINGLE_TLV("IN1 Boost", RT5651_IN1_IN2, + SOC_SINGLE_TLV("IN1 Boost Volume", RT5651_IN1_IN2, RT5651_BST_SFT1, 8, 0, bst_tlv), - SOC_SINGLE_TLV("IN2 Boost", RT5651_IN1_IN2, + SOC_SINGLE_TLV("IN2 Boost Volume", RT5651_IN1_IN2, RT5651_BST_SFT2, 8, 0, bst_tlv), - SOC_SINGLE_TLV("IN3 Boost", RT5651_IN3, + SOC_SINGLE_TLV("IN3 Boost Volume", RT5651_IN3, RT5651_BST_SFT1, 8, 0, bst_tlv), /* INL/INR Volume Control */ SOC_DOUBLE_TLV("IN Capture Volume", RT5651_INL1_INR1_VOL, -- 2.7.4

2 3

[alsa-devel] [PATCH 0/6] Fix Sparse warnings on sound/soc/intel
by Pierre-Louis Bossart 25 Jul '18

25 Jul '18

Since we found quite a few issues when checking the SOF code with Sparse, I figured I'd run a quick check on the rest of the Intel audio drivers. Some of the issues are trivial but in the end there are a couple of improvements identified by reducing the volume of warnings, so it's worth it overall. If there are concerns about the code readability, I would still recommend merging the last 3-4 patches that are really the interesting ones exposed by Sparse checks. Pierre-Louis Bossart (6): ASoC: Intel: boards: cleanup snd_mask_set usage ASoC: Intel: Haswell: fix endianness handling ASoC: Intel: Skylake: BDL definitions should be __le32 ASoC: Intel: common: make sst_dma functions static ASoC: Intel: Atom: simplify iomem address and casts ASoC: Intel: Atom: fix inversion between __iowrite32 and __ioread32 sound/soc/intel/atom/sst/sst_drv_interface.c | 29 ++++++------ sound/soc/intel/atom/sst/sst_loader.c | 6 +-- sound/soc/intel/boards/bdw-rt5677.c | 2 +- sound/soc/intel/boards/bxt_da7219_max98357a.c | 2 +- sound/soc/intel/boards/bxt_rt298.c | 2 +- sound/soc/intel/boards/glk_rt5682_max98357a.c | 2 +- sound/soc/intel/boards/kbl_da7219_max98357a.c | 2 +- sound/soc/intel/boards/kbl_rt5663_max98927.c | 6 ++- .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 6 ++- sound/soc/intel/boards/skl_nau88l25_max98357a.c | 2 +- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 2 +- sound/soc/intel/boards/skl_rt286.c | 2 +- sound/soc/intel/common/sst-firmware.c | 6 +-- sound/soc/intel/haswell/sst-haswell-dsp.c | 53 ++++++++++++---------- sound/soc/intel/skylake/skl-sst-cldma.c | 8 ++-- sound/soc/intel/skylake/skl-sst-cldma.h | 2 +- 16 files changed, 70 insertions(+), 62 deletions(-) -- 2.14.1

3 13

[alsa-devel] Applied "ASoC: Intel: Skylake: fix widget handling" to the asoc tree
by Mark Brown 25 Jul '18

25 Jul '18

The patch ASoC: Intel: Skylake: fix widget handling has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From fe65324e3f5205072a2d55ac9c63ec77155fa528 Mon Sep 17 00:00:00 2001 From: Rakesh Ughreja <rakesh.a.ughreja(a)intel.com> Date: Tue, 24 Jul 2018 19:50:48 -0500 Subject: [PATCH] ASoC: Intel: Skylake: fix widget handling include DAPM Mux and output widgets into the list. Signed-off-by: Rakesh Ughreja <rakesh.a.ughreja(a)intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/intel/skylake/skl-topology.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c index 647e52aecdc3..9845d853644c 100644 --- a/sound/soc/intel/skylake/skl-topology.c +++ b/sound/soc/intel/skylake/skl-topology.c @@ -108,6 +108,9 @@ static int is_skl_dsp_widget_type(struct snd_soc_dapm_widget *w, case snd_soc_dapm_aif_out: case snd_soc_dapm_dai_out: case snd_soc_dapm_switch: + case snd_soc_dapm_output: + case snd_soc_dapm_mux: + return false; default: return true; -- 2.18.0

1 0

[alsa-devel] [PATCH] Added support for Encore mDSD and Topping DX7s XMOS USB DACs
by JCruk 25 Jul '18

25 Jul '18

Signed-off-by: JCruk <jcrukley(a)gmail.com> --- sound/usb/quirks.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index 02b6cc0..7683d33 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -1373,6 +1373,8 @@ u64 snd_usb_interface_dsd_format_quirks(struct snd_usb_audio *chip, return SNDRV_PCM_FMTBIT_DSD_U32_BE; break; + case USB_ID(0x152a, 0x8750): /* Topping DX7s */ + case USB_ID(0x16d0, 0x09dd): /* Encore mDSD */ case USB_ID(0x0d8c, 0x0316): /* Hegel HD12 DSD */ case USB_ID(0x16b0, 0x06b2): /* NuPrime DAC-10 */ case USB_ID(0x16d0, 0x0733): /* Furutech ADL Stratos */ -- 2.7.4

1 0

Re: [alsa-devel] [PATCH 1/3] ASoC: rt5651: add Volume to the name of volume control
by Mark Brown 25 Jul '18

25 Jul '18

On Wed, Jul 25, 2018 at 02:01:21AM +0000, Bard Liao wrote: > > The RT5631 doesn't appear to have any users except Arndale, certainly no > > x86 users? > As far as I know, there is no x86 users using RT5631. OK, I think it's probably safe to apply that one then as I'm not seeing any in tree users except that Arndale expansion.

1 0

[alsa-devel] [PATCH] ASoC: AMD: Add a fix voltage regulator for DA7219 and ADAU7002
by Akshu Agrawal 25 Jul '18

25 Jul '18

DA7219 for our platform need to be configured for 1.8V. Hence, we add a fixed volatge regulator with supplies of 1.8V in the machine driver. Signed-off-by: Akshu Agrawal <akshu.agrawal(a)amd.com> --- sound/soc/amd/Kconfig | 2 ++ sound/soc/amd/acp-da7219-max98357a.c | 45 ++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/sound/soc/amd/Kconfig b/sound/soc/amd/Kconfig index 6cbf9cf..c447a51 100644 --- a/sound/soc/amd/Kconfig +++ b/sound/soc/amd/Kconfig @@ -8,6 +8,8 @@ config SND_SOC_AMD_CZ_DA7219MX98357_MACH select SND_SOC_DA7219 select SND_SOC_MAX98357A select SND_SOC_ADAU7002 + select REGULATOR + select REGULATOR_FIXED_VOLTAGE depends on SND_SOC_AMD_ACP && I2C help This option enables machine driver for DA7219 and MAX9835. diff --git a/sound/soc/amd/acp-da7219-max98357a.c b/sound/soc/amd/acp-da7219-max98357a.c index f42606e..fdf8972 100644 --- a/sound/soc/amd/acp-da7219-max98357a.c +++ b/sound/soc/amd/acp-da7219-max98357a.c @@ -31,7 +31,10 @@ #include <sound/jack.h> #include <linux/clk.h> #include <linux/gpio.h> +#include <linux/platform_device.h> #include <linux/module.h> +#include <linux/regulator/fixed.h> +#include <linux/regulator/machine.h> #include <linux/i2c.h> #include <linux/input.h> #include <linux/acpi.h> @@ -320,11 +323,53 @@ static void cz_dmic_shutdown(struct snd_pcm_substream *substream) .num_controls = ARRAY_SIZE(cz_mc_controls), }; +static struct regulator_consumer_supply acp_da7219_supplies[] = { + REGULATOR_SUPPLY("VDD", "i2c-DLGS7219:00"), + REGULATOR_SUPPLY("VDDMIC", "i2c-DLGS7219:00"), + REGULATOR_SUPPLY("VDDIO", "i2c-DLGS7219:00"), + REGULATOR_SUPPLY("IOVDD", "ADAU7002:00"), +}; + +static struct regulator_init_data acp_da7219_data = { + .constraints = { + .always_on = 1, + }, + .num_consumer_supplies = ARRAY_SIZE(acp_da7219_supplies), + .consumer_supplies = acp_da7219_supplies, +}; + +static struct fixed_voltage_config acp_da7219 = { + .supply_name = "reg-fixed-1.8V", + .microvolts = 1800000, /* 1.8V */ + .gpio = -EINVAL, + .enabled_at_boot = 1, + .init_data = &acp_da7219_data, +}; + +static struct platform_device acp_da7219_regulator = { + .name = "reg-fixed-voltage", + .id = PLATFORM_DEVID_AUTO, + .dev = { + .platform_data = &acp_da7219, + }, +}; + static int cz_probe(struct platform_device *pdev) { int ret; struct snd_soc_card *card; struct acp_platform_info *machine; + static bool regulators_registered; + + if (!regulators_registered) { + ret = platform_device_register(&acp_da7219_regulator); + if (ret) { + dev_err(&pdev->dev, "Failed to register regulator: %d\n", + ret); + return ret; + } + regulators_registered = true; + } machine = devm_kzalloc(&pdev->dev, sizeof(struct acp_platform_info), GFP_KERNEL); -- 1.9.1

3 4

Re: [alsa-devel] 答复: [PATCH 3/4] drm/radeon: Add audio component support
by Takashi Iwai 25 Jul '18

25 Jul '18

On Wed, 25 Jul 2018 05:32:52 +0200, Qu, Jim wrote: > @@ -269,6 +271,10 @@ static void radeon_audio_enable(struct radeon_device *rdev, > > if (rdev->audio.funcs->enable) > rdev->audio.funcs->enable(rdev, pin, enable_mask); > + > + if (acomp && acomp->audio_ops && acomp->audio_ops->pin_eld_notify) > + acomp->audio_ops->pin_eld_notify(acomp->audio_ops->audio_ptr, > + pin->id, -1); > > >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> > Jim: radeon_audio_enable() can enable audios and also disable them, so eld noitfy callback should be called when enable_mask is true. It's intentional. The notifier needs to be called at disablement time, too. The audio driver has to follow the HDMI audio disablement, and notifier receives both on and off case. The actual state is inquired via get_eld call by HD-audio followed after the notification. thanks, Takashi

2 1

[alsa-devel] Building alsa-utils, adding changes
by Jamey Kirby 25 Jul '18

25 Jul '18

I have been working with alsa for a while. We use it to archive content from our radio station. I am using arecord. Build problem: 1) I cloned alsa-utils from github 2) Spent two hours on Google trying to figure out how to build the darn thing. 3) I am running Ubuntu Server 18.0 with build-essentials installed. 4) I get errors that I do not know how to fix when I try to setup ./configure. 5) I just need to make a build. What do I need to do? Feature: I am adding a feature. In the loop for capture(), when a new file is opened, I want to close the old file (when doing continuous recording). I added a new CLI parameter -K. When this is set, the capture() loop will close the old file before opening the new file. This is an issue for me for two reasons: 1) When will i run out of file handles? I capture one hour files continuously. After 10 hours, I see that all the capture files are still open? 2) I need to be notified when the file is closed so that I can do post-processing of rht capture. I've tried inotifywait in a script, and in another script I tried lsof. lsof works great, but the files are open,. See, the main issue is that I need to know when each file completes so that I can post process. Here is my post process script outline: #!/bin/bash for f in $HOME/vboxshare/jkirby/newarc/*.raw do filename=$(basename $f) open=$(lsof -t $f | wc -w) if [ $open -lt 1 ] then echo "$filename is closed" echo "Do post processing here" else echo "$filename is open by $open processe(s)" fi done If I could close the file before or after the previous file is closed, I can do my work. Otherwise, I have no way to know if the file is open and being processed or not. So, I've made the changes, I just need to build the darn thing. Thanks for any advice or help. -- Jamey Kirby Disrupting the establishment since 1964 *This is a personal email account and as such, emails are not subject to archiving. Nothing else really matters.*

1 0

[alsa-devel] [PATCH v2] ASoC: da7219: Allow pdata to specify a VDDIO
by Daniel Kurtz 24 Jul '18

24 Jul '18

Some systems do not have software controllable regulators driving the DA7219's supplies, nor can they use device tree to create "always-on fixed regulators" to easily pretend like they do. On these systems the call to devm_regulator_bulk_get() just creates a set of dummy registers. Calling regulator_get_voltage() on a dummy regulator just returns -EINVAL, in which case the DA7219 is always set up to use the default VDDIO voltage range of 2.5-3.6V. Provide a new device property to let such systems specify a different VDDIO if needed (e.g., 1.8V). Signed-off-by: Daniel Kurtz <djkurtz(a)chromium.org> --- Changes for v2: - fix to use device_property_read_u32() include/sound/da7219.h | 2 ++ sound/soc/codecs/da7219.c | 19 +++++++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/include/sound/da7219.h b/include/sound/da7219.h index 1bfcb16f2d10ab..16ab125ad4adbf 100644 --- a/include/sound/da7219.h +++ b/include/sound/da7219.h @@ -38,6 +38,8 @@ struct da7219_pdata { const char *dai_clks_name; + u32 vddio; + /* Mic */ enum da7219_micbias_voltage micbias_lvl; enum da7219_mic_amp_in_sel mic_amp_in_sel; diff --git a/sound/soc/codecs/da7219.c b/sound/soc/codecs/da7219.c index 980a6a8bf56d38..9893920b26f41f 100644 --- a/sound/soc/codecs/da7219.c +++ b/sound/soc/codecs/da7219.c @@ -1634,6 +1634,9 @@ static struct da7219_pdata *da7219_fw_to_pdata(struct snd_soc_component *compone else pdata->mic_amp_in_sel = DA7219_MIC_AMP_IN_SEL_DIFF; + if (device_property_read_u32(dev, "dlg,vddio", &of_val32) >= 0) + pdata->vddio = of_val32; + return pdata; } @@ -1717,8 +1720,12 @@ static int da7219_handle_supplies(struct snd_soc_component *component) /* Determine VDDIO voltage provided */ vddio = da7219->supplies[DA7219_SUPPLY_VDDIO].consumer; ret = regulator_get_voltage(vddio); + /* If regulator_get_voltage() fails, try to use vddio from pdata. */ + if (ret < 0 && da7219->pdata) + ret = da7219->pdata->vddio; if (ret < 1200000) - dev_warn(component->dev, "Invalid VDDIO voltage\n"); + dev_warn(component->dev, "Invalid VDDIO voltage: %d mV\n", + ret); else if (ret < 2800000) io_voltage_lvl = DA7219_IO_VOLTAGE_LEVEL_1_2V_2_8V; @@ -1872,6 +1879,11 @@ static int da7219_probe(struct snd_soc_component *component) mutex_init(&da7219->ctrl_lock); mutex_init(&da7219->pll_lock); + /* Handle DT/ACPI/Platform data */ + da7219->pdata = dev_get_platdata(component->dev); + if (!da7219->pdata) + da7219->pdata = da7219_fw_to_pdata(component); + /* Regulator configuration */ ret = da7219_handle_supplies(component); if (ret) @@ -1897,11 +1909,6 @@ static int da7219_probe(struct snd_soc_component *component) break; } - /* Handle DT/ACPI/Platform data */ - da7219->pdata = dev_get_platdata(component->dev); - if (!da7219->pdata) - da7219->pdata = da7219_fw_to_pdata(component); - da7219_handle_pdata(component); /* Check if MCLK provided */ -- 2.18.0.233.g985f88cf7e-goog

3 2

[alsa-devel] [PATCH 1/4] ASoC: fsl-asoc-card: Switch to SPDX identifier
by Fabio Estevam 24 Jul '18

24 Jul '18

Adopt the SPDX license identifier headers to ease license compliance management. Signed-off-by: Fabio Estevam <fabio.estevam(a)nxp.com> --- sound/soc/fsl/fsl-asoc-card.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c index 4a6750a..07808c6 100644 --- a/sound/soc/fsl/fsl-asoc-card.c +++ b/sound/soc/fsl/fsl-asoc-card.c @@ -1,14 +1,10 @@ -/* - * Freescale Generic ASoC Sound Card driver with ASRC - * - * Copyright (C) 2014 Freescale Semiconductor, Inc. - * - * Author: Nicolin Chen <nicoleotsuka(a)gmail.com> - * - * This file is licensed under the terms of the GNU General Public License - * version 2. This program is licensed "as is" without any warranty of any - * kind, whether express or implied. - */ +// SPDX-License-Identifier: GPL-2.0 +// +// Freescale Generic ASoC Sound Card driver with ASRC +// +// Copyright (C) 2014 Freescale Semiconductor, Inc. +// +// Author: Nicolin Chen <nicoleotsuka(a)gmail.com> #include <linux/clk.h> #include <linux/i2c.h> -- 2.7.4

2 7