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

[alsa-devel] [PATCH] ASoC: doc: replace codec to component
by Kuninori Morimoto 13 Jul '18

13 Jul '18

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Now we can replace Codec to Component. Let's do it. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- Documentation/sound/soc/codec.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/sound/soc/codec.rst b/Documentation/sound/soc/codec.rst index f87612b..58f625f 100644 --- a/Documentation/sound/soc/codec.rst +++ b/Documentation/sound/soc/codec.rst @@ -179,12 +179,12 @@ i.e. static int wm8974_mute(struct snd_soc_dai *dai, int mute) { - struct snd_soc_codec *codec = dai->codec; - u16 mute_reg = snd_soc_read(codec, WM8974_DAC) & 0xffbf; + struct snd_soc_component *component = dai->component; + u16 mute_reg = snd_soc_component_read32(component, WM8974_DAC) & 0xffbf; if (mute) - snd_soc_write(codec, WM8974_DAC, mute_reg | 0x40); + snd_soc_component_write(component, WM8974_DAC, mute_reg | 0x40); else - snd_soc_write(codec, WM8974_DAC, mute_reg); + snd_soc_component_write(component, WM8974_DAC, mute_reg); return 0; } -- 1.9.1

2 7

[alsa-devel] [PATCH] ASoC: trace: remove snd_soc_codec
by Kuninori Morimoto 13 Jul '18

13 Jul '18

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> snd_soc_codec is replaced to snd_soc_component, and it is not used in this file. Let's remove it Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- include/trace/events/asoc.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/trace/events/asoc.h b/include/trace/events/asoc.h index ccd1a3b..40c300f 100644 --- a/include/trace/events/asoc.h +++ b/include/trace/events/asoc.h @@ -12,7 +12,6 @@ #define DAPM_ARROW(dir) (((dir) == SND_SOC_DAPM_DIR_OUT) ? "->" : "<-") struct snd_soc_jack; -struct snd_soc_codec; struct snd_soc_card; struct snd_soc_dapm_widget; struct snd_soc_dapm_path; -- 1.9.1

2 7

[alsa-devel] [PATCH v2 00/13] ARM: pxa: switch to DMA slave maps
by Robert Jarzmik 29 Jun '18

29 Jun '18

This v1 cover letter is quoted in [1]. For maintainers the table below should help you focus on the patches targetted at you, and ignore the other noise. The differences since v1 is by maintainers / topic / patch : - Arnd and Daniel / PXA topic / 0002 devices.c split into pxa25x.c, pxa27x.c and pxa3xx.c - Boris and Daniel / MTD topic / 0005 Review and ack of this one - Arnd and netdev / NET topic / 0006 and 0007 Arnd comment taken, review and ack of these one - Mark and alsa-devel / ASoC topic / 0008 Mark, I couldn't keep your former Ack because : - I changed one line so that the cpu device provides the DMA - I added pxa2xx-i2s which was forgotten Therefore I need a new ack - Arnd and Daniel / SSP topic / 0013 Review and ack of this one Happy review. -- Robert Robert Jarzmik (13): dmaengine: pxa: use a dma slave map ARM: pxa: add dma slave map mmc: pxamci: remove the dmaengine compat need media: pxa_camera: remove the dmaengine compat need mtd: rawnand: marvell: remove the dmaengine compat need net: smc911x: remove the dmaengine compat need net: smc91x: remove the dmaengine compat need ASoC: pxa: remove the dmaengine compat need ata: pata_pxa: remove the dmaengine compat need dmaengine: pxa: document pxad_param dmaengine: pxa: make the filter function internal ARM: pxa: remove the DMA IO resources ARM: pxa: change SSP DMA channels allocation arch/arm/mach-pxa/devices.c | 148 +--------------------------------- arch/arm/mach-pxa/devices.h | 6 +- arch/arm/mach-pxa/pxa25x.c | 41 +++++++++- arch/arm/mach-pxa/pxa27x.c | 42 +++++++++- arch/arm/mach-pxa/pxa3xx.c | 44 +++++++++- arch/arm/plat-pxa/ssp.c | 47 ----------- drivers/ata/pata_pxa.c | 10 +-- drivers/dma/pxa_dma.c | 13 ++- drivers/media/platform/pxa_camera.c | 22 +---- drivers/mmc/host/pxamci.c | 29 +------ drivers/mtd/nand/raw/marvell_nand.c | 17 +--- drivers/net/ethernet/smsc/smc911x.c | 16 +--- drivers/net/ethernet/smsc/smc91x.c | 12 +-- drivers/net/ethernet/smsc/smc91x.h | 1 - include/linux/dma/pxa-dma.h | 20 +++-- include/linux/platform_data/mmp_dma.h | 4 + include/linux/pxa2xx_ssp.h | 2 - sound/arm/pxa2xx-ac97.c | 14 +--- sound/arm/pxa2xx-pcm-lib.c | 6 +- sound/soc/pxa/pxa-ssp.c | 5 +- sound/soc/pxa/pxa2xx-ac97.c | 32 ++------ sound/soc/pxa/pxa2xx-i2s.c | 6 +- 22 files changed, 180 insertions(+), 357 deletions(-) -- 2.11.0 --- [1] Former v1 cover letter This serie is aimed at removing the dmaengine slave compat use, and transfer knowledge of the DMA requestors into architecture code. This was discussed/advised by Arnd a couple of years back, it's almost time. The serie is divided in 3 phasees : - phase 1 : patch 1/15 and patch 2/15 => this is the preparation work - phase 2 : patches 3/15 .. 10/15 => this is the switch of all the drivers => this one will require either an Ack of the maintainers or be taken by them once phase 1 is merged - phase 3 : patches 11/15 => this is the last part, cleanup and removal of export of the DMA filter function As this looks like a patch bomb, each maintainer expressing for his tree either an Ack or "I want to take through my tree" will be spared in the next iterations of this serie. Several of these changes have been tested on actual hardware, including : - pxamci - pxa_camera - smc* - ASoC and SSP

5 27

[alsa-devel] [PATCH 0/3] ASoC: make simple-card a bit more versatile
by Daniel Mack 25 Jun '18

25 Jun '18

In the process of porting some boards to DT, I noticed the simple-card driver is already capable of handling most cases just fine. The missing bits I've spotted are: * The clock that is passed in is only read, never set, which is not sufficient for boards that support several sampling rates with different base frequencies * The sysclk id that is passed to snd_soc_dai_set_sysclk() is hard-coded * There's currently no support for calling into snd_soc_dai_set_clkdiv() The following three patches fix all those and make simple-card a good match for the board I'm working with. Thanks, Daniel Daniel Mack (3): ASoC: simple-card: set cpu dai clk in hw_params ASoC: simple-card: make sysclk index configurable ASoC: simple-card: add support for clock divider setup .../devicetree/bindings/sound/simple-card.txt | 13 ++++++ include/sound/simple_card_utils.h | 19 ++++++++ sound/soc/generic/simple-card-utils.c | 50 ++++++++++++++++++++++ sound/soc/generic/simple-card.c | 49 +++++++++++++++++++-- 4 files changed, 127 insertions(+), 4 deletions(-) -- 2.14.3

4 27

[alsa-devel] [PATCH] ASoC: AMD: Change codec to channel link as per hardware redesign
by Akshu Agrawal 22 Jun '18

22 Jun '18

This is a correction to match acutal hardware configuration. The hardware configuration looks like: I2S_BT -> SPK(Max) + DMIC(Adau) I2S_SP -> DA7219 Headset No actual products have been shipped with previous configuration. Signed-off-by: Akshu Agrawal <akshu.agrawal(a)amd.com> --- This patch is dependent on [V4,10/10] ASoC: amd: dma driver changes for bt i2s instance https://patchwork.kernel.org/patch/10385381/ sound/soc/amd/acp-da7219-max98357a.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/sound/soc/amd/acp-da7219-max98357a.c b/sound/soc/amd/acp-da7219-max98357a.c index ccddc66..566bd26 100644 --- a/sound/soc/amd/acp-da7219-max98357a.c +++ b/sound/soc/amd/acp-da7219-max98357a.c @@ -148,7 +148,7 @@ static int cz_da7219_startup(struct snd_pcm_substream *substream) snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_RATE, &constraints_rates); - machine->i2s_instance = I2S_BT_INSTANCE; + machine->i2s_instance = I2S_SP_INSTANCE; return da7219_clk_enable(substream); } @@ -163,7 +163,7 @@ static int cz_max_startup(struct snd_pcm_substream *substream) struct snd_soc_card *card = rtd->card; struct acp_platform_info *machine = snd_soc_card_get_drvdata(card); - machine->i2s_instance = I2S_SP_INSTANCE; + machine->i2s_instance = I2S_BT_INSTANCE; return da7219_clk_enable(substream); } @@ -178,7 +178,7 @@ static int cz_dmic_startup(struct snd_pcm_substream *substream) struct snd_soc_card *card = rtd->card; struct acp_platform_info *machine = snd_soc_card_get_drvdata(card); - machine->i2s_instance = I2S_SP_INSTANCE; + machine->i2s_instance = I2S_BT_INSTANCE; return da7219_clk_enable(substream); } @@ -204,16 +204,27 @@ static void cz_dmic_shutdown(struct snd_pcm_substream *substream) static struct snd_soc_dai_link cz_dai_7219_98357[] = { { - .name = "amd-da7219-play-cap", - .stream_name = "Playback and Capture", + .name = "amd-da7219-play", + .stream_name = "Playback", .platform_name = "acp_audio_dma.0.auto", - .cpu_dai_name = "designware-i2s.3.auto", + .cpu_dai_name = "designware-i2s.1.auto", .codec_dai_name = "da7219-hifi", .codec_name = "i2c-DLGS7219:00", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM, .init = cz_da7219_init, .dpcm_playback = 1, + .ops = &cz_da7219_cap_ops, + }, + { + .name = "amd-da7219-cap", + .stream_name = "Capture", + .platform_name = "acp_audio_dma.0.auto", + .cpu_dai_name = "designware-i2s.2.auto", + .codec_dai_name = "da7219-hifi", + .codec_name = "i2c-DLGS7219:00", + .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF + | SND_SOC_DAIFMT_CBM_CFM, .dpcm_capture = 1, .ops = &cz_da7219_cap_ops, }, @@ -221,7 +232,7 @@ static void cz_dmic_shutdown(struct snd_pcm_substream *substream) .name = "amd-max98357-play", .stream_name = "HiFi Playback", .platform_name = "acp_audio_dma.0.auto", - .cpu_dai_name = "designware-i2s.1.auto", + .cpu_dai_name = "designware-i2s.3.auto", .codec_dai_name = "HiFi", .codec_name = "MX98357A:00", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF @@ -233,7 +244,7 @@ static void cz_dmic_shutdown(struct snd_pcm_substream *substream) .name = "dmic", .stream_name = "DMIC Capture", .platform_name = "acp_audio_dma.0.auto", - .cpu_dai_name = "designware-i2s.2.auto", + .cpu_dai_name = "designware-i2s.3.auto", .codec_dai_name = "adau7002-hifi", .codec_name = "ADAU7002:00", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF -- 1.9.1

2 1

[alsa-devel] [PATCH] ALSA: dice: add stream format parameters for Mytek devices
by Melvin Vermeeren 19 Jun '18

19 Jun '18

Mytek manufactures some equipment with DICE-based firewire ports. These devices contain old versions of DICE firmware which lacks detailed stream format reporting for all sampling clock modes. Building upon the recent work by Takashi Sakamoto, hard-coded parameters are added for the Stereo 192 DSD-DAC. When the device vendor and model match the coded parameters are copied into the stream format cache. Signed-off-by: Melvin Vermeeren <mail(a)mel.vin> --- sound/firewire/dice/Makefile | 2 +- sound/firewire/dice/dice-mytek.c | 46 ++++++++++++++++++++++++++++++++ sound/firewire/dice/dice.c | 9 +++++++ sound/firewire/dice/dice.h | 1 + 4 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 sound/firewire/dice/dice-mytek.c diff --git a/sound/firewire/dice/Makefile b/sound/firewire/dice/Makefile index 7b7997a5754c..37062a233f6a 100644 --- a/sound/firewire/dice/Makefile +++ b/sound/firewire/dice/Makefile @@ -1,4 +1,4 @@ snd-dice-objs := dice-transaction.o dice-stream.o dice-proc.o dice-midi.o \ dice-pcm.o dice-hwdep.o dice.o dice-tcelectronic.o \ - dice-alesis.o dice-extension.o + dice-alesis.o dice-extension.o dice-mytek.o obj-$(CONFIG_SND_DICE) += snd-dice.o diff --git a/sound/firewire/dice/dice-mytek.c b/sound/firewire/dice/dice-mytek.c new file mode 100644 index 000000000000..eb7d5492d10b --- /dev/null +++ b/sound/firewire/dice/dice-mytek.c @@ -0,0 +1,46 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * dice-mytek.c - a part of driver for DICE based devices + * + * Copyright (c) 2018 Melvin Vermeeren + */ + +#include "dice.h" + +struct dice_mytek_spec { + unsigned int tx_pcm_chs[MAX_STREAMS][SND_DICE_RATE_MODE_COUNT]; + unsigned int rx_pcm_chs[MAX_STREAMS][SND_DICE_RATE_MODE_COUNT]; +}; + +static const struct dice_mytek_spec stereo_192_dsd_dac = { + /* AES, TOSLINK, SPDIF, ADAT inputs on device */ + .tx_pcm_chs = {{8, 8, 8}, {0, 0, 0} }, + /* PCM 44.1-192, native DSD64/DSD128 to device */ + .rx_pcm_chs = {{4, 4, 4}, {0, 0, 0} } +}; + +/* + * Mytek has a few other firewire-capable devices, though newer models appear + * to lack the port more often than not. As I don't have access to any of them + * they are missing here. An example is the Mytek 8x192 ADDA, which is DICE. + */ + +int snd_dice_detect_mytek_formats(struct snd_dice *dice) +{ + int i; + const struct dice_mytek_spec *dev; + + dev = &stereo_192_dsd_dac; + + memcpy(dice->tx_pcm_chs, dev->tx_pcm_chs, + MAX_STREAMS * SND_DICE_RATE_MODE_COUNT * sizeof(unsigned int)); + memcpy(dice->rx_pcm_chs, dev->rx_pcm_chs, + MAX_STREAMS * SND_DICE_RATE_MODE_COUNT * sizeof(unsigned int)); + + for (i = 0; i < MAX_STREAMS; ++i) { + dice->tx_midi_ports[i] = 0; + dice->rx_midi_ports[i] = 0; + } + + return 0; +} diff --git a/sound/firewire/dice/dice.c b/sound/firewire/dice/dice.c index 40f7a32e4893..beeef62581ba 100644 --- a/sound/firewire/dice/dice.c +++ b/sound/firewire/dice/dice.c @@ -17,6 +17,7 @@ MODULE_LICENSE("GPL v2"); #define OUI_TCELECTRONIC 0x000166 #define OUI_ALESIS 0x000595 #define OUI_MAUDIO 0x000d6c +#define OUI_MYTEK 0x001ee8 #define DICE_CATEGORY_ID 0x04 #define WEISS_CATEGORY_ID 0x00 @@ -365,6 +366,14 @@ static const struct ieee1394_device_id dice_id_table[] = { .model_id = MODEL_ALESIS_IO_BOTH, .driver_data = (kernel_ulong_t)snd_dice_detect_alesis_formats, }, + /* Mytek Stereo 192 DSD-DAC. */ + { + .match_flags = IEEE1394_MATCH_VENDOR_ID | + IEEE1394_MATCH_MODEL_ID, + .vendor_id = OUI_MYTEK, + .model_id = 0x000002, + .driver_data = (kernel_ulong_t)snd_dice_detect_mytek_formats, + }, { .match_flags = IEEE1394_MATCH_VERSION, .version = DICE_INTERFACE, diff --git a/sound/firewire/dice/dice.h b/sound/firewire/dice/dice.h index 505b79fea6d9..83353a3559e8 100644 --- a/sound/firewire/dice/dice.h +++ b/sound/firewire/dice/dice.h @@ -226,5 +226,6 @@ int snd_dice_create_midi(struct snd_dice *dice); int snd_dice_detect_tcelectronic_formats(struct snd_dice *dice); int snd_dice_detect_alesis_formats(struct snd_dice *dice); int snd_dice_detect_extension_formats(struct snd_dice *dice); +int snd_dice_detect_mytek_formats(struct snd_dice *dice); #endif -- 2.17.0

3 7

[alsa-devel] [PATCH 0/5] ASoC: Intel: geminilake: Adds da7219+max98537 machine driver support
by Naveen Manohar 19 Jun '18

19 Jun '18

Patch adds required changes in bxt machine & corresponding driver entry in machine to use MAX98357A codec as speaker on SSP1 and DA7219 codec as headset on SSP2 for GLK board. Naveen Manohar (5): ASoC: Intel: broxton: reduce machine name for bxt_da7219_max98357a ASoC: Intel: Headset button support in broxton machine driver ASoC: Intel: Add Geminilake Dialog Maxim machine driver support ASoC: Intel: glk: Add DAI links for Multi-Playback ASoC: Intel: Add Geminilake Dialog+Maxim machine driver entry sound/soc/intel/boards/bxt_da7219_max98357a.c | 308 ++++++++++++++++++++++++-- sound/soc/intel/skylake/skl.c | 9 +- 2 files changed, 297 insertions(+), 20 deletions(-) -- 2.7.4

6 11

[alsa-devel] [PATCH v2 0/6] ASoC: SOF driver dependencies
by Liam Girdwood 18 Jun '18

18 Jun '18

This series is a set of ASoC core and topology updates needed by the SOF driver. The SOF driver uses topology extensively to define most of the characteristsics of an audio card with the exception of some immutable items like hardware backend DAI links. The SOF driver also allows for reuse of existing upstream machine drivers by re-writting some aspects of the DAI link and DAPM configuration with data from topology. i.e. existing machine drivers can be reused with different topologies. V2: Rebased on top of today for-next, V1 was probably missing 1/6 meaning the others would not apply. Liam Girdwood (6): ASoC: core: Allow topology to override machine driver FE DAI link config. ASoC: core: Add name prefix for machines with topology rewrites ASoC: topology: Give more data to clients via callbacks ASoC: topology: Add callback for DAPM route load/unload ASoC: topology: Check widget kcontrols before deref. ASoC: topology: Add support for compressed PCMs include/sound/soc-topology.h | 30 ++++++++---- include/sound/soc.h | 12 +++++ sound/soc/intel/skylake/skl-pcm.c | 7 +-- sound/soc/intel/skylake/skl-topology.c | 5 +- sound/soc/intel/skylake/skl-topology.h | 20 ++------ sound/soc/soc-core.c | 87 ++++++++++++++++++++++++++++++++-- sound/soc/soc-pcm.c | 12 +++++ sound/soc/soc-topology.c | 51 ++++++++++++++------ 8 files changed, 177 insertions(+), 47 deletions(-) -- 2.14.1

2 16

[alsa-devel] [PATCH] ASoC: codecs: PCM1789: include gpio/consumer.h
by Arnd Bergmann 14 Jun '18

14 Jun '18

When CONFIG_GPIOLIB is disabled, this codec fails to build because gpio/consumer.h is not included implicitly. sound/soc/codecs/pcm1789.c: In function 'pcm1789_common_init': sound/soc/codecs/pcm1789.c:247:19: error: implicit declaration of function 'devm_gpiod_get_optional'; did you mean 'devm_gpio_request_one'? [-Werror=implicit-function-declaration] pcm1789->reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH); ^~~~~~~~~~~~~~~~~~~~~~~ Fixes: 4ae340d1be36 ("ASoC: codecs: Add support for PCM1789") Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- sound/soc/codecs/pcm1789.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/pcm1789.c b/sound/soc/codecs/pcm1789.c index 507ac9412d6c..21f15219b3ad 100644 --- a/sound/soc/codecs/pcm1789.c +++ b/sound/soc/codecs/pcm1789.c @@ -3,7 +3,7 @@ // Copyright (C) 2018 Bootlin // Mylène Josserand <mylene.josserand(a)bootlin.com> -#include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/module.h> #include <linux/workqueue.h> -- 2.9.0

2 1

[alsa-devel] [PATCH v4 0/7] ASoC: add driver for Atmel I2S controller
by Codrin Ciubotariu 12 Jun '18

12 Jun '18

This is a rework of Cyrille's patches named: [PATCH v3 0/2] ASoC: add driver for Atmel I2S controller https://lkml.org/lkml/2015/9/29/454 This is the version 4 of the series, and addresses the received feedback on the mailing lists. This series applies on top of asoc-next branch of broonie/sound.git. Based on received feedback, I created a mux clock driver to select the I2S clock source, that also includes proper devicetree bindings and nodes. Also, I added the I2S nodes in sama5d2's devicetree, with the missing pin muxing for the second I2S controller. This series of patches adds support to the new Atmel I2S controller embedded on sama5d2 SoCs. ChangeLog v3 -> v4 - as suggested by Rob Herring: - added a clock mux driver for I2S's clock control bit; - more precise description of I2S's devicetree bindings; - removed SoC and internal detalls from bindings; - addressed comments from Mark Brown; - added devicetree nodes and pin muxing for I2S; v2 -> v3 - fix the coding style, add some more comments and add a section dedicated to sama5d2 SoCs in the DT binding documentation as suggested by Mark Brown. v1 -> v2 - initialize dev->dev before calling dev->caps->mck_init() Codrin Ciubotariu (3): dt-bindings: clk: at91: add an I2S mux clock clk: at91: add I2S clock mux driver ARM: dts: at91: sama5d2: add I2S clock muxing nodes Cyrille Pitchen (4): ASoC: atmel-i2s: dt-bindings: add DT bindings for I2S controller ASoC: atmel-i2s: add driver for the new Atmel I2S controller ARM: dts: at91: sama5d2: add nodes for I2S controllers ARM: dts: at91: sama5d2 Xplained: add pin muxing for I2S .../devicetree/bindings/clock/at91-clock.txt | 34 + .../devicetree/bindings/sound/atmel-i2s.txt | 47 ++ arch/arm/boot/dts/at91-sama5d2_xplained.dts | 28 + arch/arm/boot/dts/sama5d2.dtsi | 52 ++ arch/arm/mach-at91/Kconfig | 4 + drivers/clk/at91/Makefile | 1 + drivers/clk/at91/clk-i2s-mux.c | 117 ++++ sound/soc/atmel/Kconfig | 9 + sound/soc/atmel/Makefile | 2 + sound/soc/atmel/atmel-i2s.c | 765 +++++++++++++++++++++ 10 files changed, 1059 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/atmel-i2s.txt create mode 100644 drivers/clk/at91/clk-i2s-mux.c create mode 100644 sound/soc/atmel/atmel-i2s.c -- 2.7.4

5 20