February 2017 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH 6/6] pcm:plug: save converter config
by sutar.mounesh＠gmail.com 27 Feb '17

27 Feb '17

From: Andreas Pape <apape(a)de.adit-jv.com> Passed config is freed after call to open, thus it is invalid when trying to extract the converter name. So config entry is saved for later usage. Signed-off-by: Andreas Pape <apape(a)de.adit-jv.com> Signed-off-by: Mounesh Sutar <sutar.mounesh(a)gmail.com> diff --git a/src/pcm/pcm_plug.c b/src/pcm/pcm_plug.c index 266707b..6d0c03d 100644 --- a/src/pcm/pcm_plug.c +++ b/src/pcm/pcm_plug.c @@ -64,6 +64,8 @@ static int snd_pcm_plug_close(snd_pcm_t *pcm) snd_pcm_plug_t *plug = pcm->private_data; int err, result = 0; free(plug->ttable); + if (plug->rate_converter) + snd_config_delete((snd_config_t*)plug->rate_converter); assert(plug->gen.slave == plug->req_slave); if (plug->gen.close_slave) { snd_pcm_unlink_hw_ptr(pcm, plug->req_slave); @@ -1108,7 +1110,15 @@ int snd_pcm_plug_open(snd_pcm_t **pcmp, plug->sformat = sformat; plug->schannels = schannels; plug->srate = srate; - plug->rate_converter = rate_converter; + if (rate_converter) { + if ((err = snd_config_copy((snd_config_t**)&plug->rate_converter, + (snd_config_t *)rate_converter)) < 0) + free(plug); + return err; + } + else + snd_config_delete((snd_config_t*)plug->rate_converter); + plug->gen.slave = plug->req_slave = slave; plug->gen.close_slave = close_slave; plug->route_policy = route_policy; @@ -1119,6 +1129,8 @@ int snd_pcm_plug_open(snd_pcm_t **pcmp, err = snd_pcm_new(&pcm, SND_PCM_TYPE_PLUG, name, slave->stream, slave->mode); if (err < 0) { + if (plug->rate_converter) + snd_config_delete((snd_config_t*)plug->rate_converter); free(plug); return err; } -- 2.7.4

3 2

[alsa-devel] [PATCH 6/6 V2] pcm:plug: save converter config
by sutar.mounesh＠gmail.com 27 Feb '17

27 Feb '17

From: Andreas Pape <apape(a)de.adit-jv.com> Passed config is freed after call to open, thus it is invalid when trying to extract the converter name. So config entry is saved for later usage. Signed-off-by: Andreas Pape <apape(a)de.adit-jv.com> Signed-off-by: Mounesh Sutar <sutar.mounesh(a)gmail.com> diff --git a/src/pcm/pcm_plug.c b/src/pcm/pcm_plug.c index 266707b..ad0e99e 100644 --- a/src/pcm/pcm_plug.c +++ b/src/pcm/pcm_plug.c @@ -64,6 +64,8 @@ static int snd_pcm_plug_close(snd_pcm_t *pcm) snd_pcm_plug_t *plug = pcm->private_data; int err, result = 0; free(plug->ttable); + if (plug->rate_converter) + snd_config_delete((snd_config_t*)plug->rate_converter); assert(plug->gen.slave == plug->req_slave); if (plug->gen.close_slave) { snd_pcm_unlink_hw_ptr(pcm, plug->req_slave); @@ -1108,7 +1110,13 @@ int snd_pcm_plug_open(snd_pcm_t **pcmp, plug->sformat = sformat; plug->schannels = schannels; plug->srate = srate; - plug->rate_converter = rate_converter; + if (rate_converter) { + if ((err = snd_config_copy((snd_config_t**)&plug->rate_converter, + (snd_config_t *)rate_converter)) < 0) + free(plug); + return err; + } + plug->gen.slave = plug->req_slave = slave; plug->gen.close_slave = close_slave; plug->route_policy = route_policy; @@ -1119,6 +1127,8 @@ int snd_pcm_plug_open(snd_pcm_t **pcmp, err = snd_pcm_new(&pcm, SND_PCM_TYPE_PLUG, name, slave->stream, slave->mode); if (err < 0) { + if (plug->rate_converter) + snd_config_delete((snd_config_t*)plug->rate_converter); free(plug); return err; } -- 2.7.4

1 0

[alsa-devel] [PATCH v2 0/7][resend] ASoC: add OF-graph base simple-card
by Kuninori Morimoto 27 Feb '17

27 Feb '17

Hi Mark, Rob These are v2 of resend of OF-graph base simple-card patch-set. I added 3 OF-graph helper functions for it. 1) - 3) : new OF-graph helper functions 4) - 7) : OF-graph base simple-card Kuninori Morimoto (7): 1) of_graph: add of_graph_get_remote_endpoint() 2) of_graph: add of_graph_get_port_parent() 3) of_graph: add of_graph_get_endpoint_count() 4) ASoC: add snd_soc_get_dai_id() 5) ASoC: simple-card-utils: add asoc_simple_card_parse_graph_dai() 6) ASoC: add simple-graph-card document 7) ASoC: add simple-graph-card support .../bindings/sound/simple-graph-card.txt | 137 ++++++++++ drivers/of/base.c | 60 +++- include/linux/of_graph.h | 22 ++ include/sound/simple_card_utils.h | 10 + include/sound/soc.h | 1 + sound/soc/generic/Kconfig | 7 + sound/soc/generic/Makefile | 2 + sound/soc/generic/simple-card-utils.c | 36 +++ sound/soc/generic/simple-graph-card.c | 303 +++++++++++++++++++++ sound/soc/soc-core.c | 23 ++ 10 files changed, 591 insertions(+), 10 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/simple-graph-card.txt create mode 100644 sound/soc/generic/simple-graph-card.c -- 1.9.1

2 9

[alsa-devel] [PATCH] ASoC: bcm2835: Add 8 channel (multitrack) capability
by Matt Flax 26 Feb '17

26 Feb '17

This patch adds 8 channel capability by allowing DSP modes. It also increases the channels_max (in the bcm2835_i2s_dai structure) to 8. The driver guards against multitrack mode when the codec isn't master. The driver guards against multitrack capability when in I2S mode. Signed-off-by: Matt Flax <flatmax(a)flatmax.org> --- sound/soc/bcm/bcm2835-i2s.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/sound/soc/bcm/bcm2835-i2s.c b/sound/soc/bcm/bcm2835-i2s.c index 6ba2049..022ca13 100644 --- a/sound/soc/bcm/bcm2835-i2s.c +++ b/sound/soc/bcm/bcm2835-i2s.c @@ -276,11 +276,16 @@ static int bcm2835_i2s_hw_params(struct snd_pcm_substream *substream, /* otherwise calculate a fitting block ratio */ bclk_ratio = 2 * data_length; - /* Clock should only be set up here if CPU is clock master */ + /* Clock should only be set up here if CPU is clock master. + If codec isn't master guard against multichannel mode. */ switch (dev->fmt & SND_SOC_DAIFMT_MASTER_MASK) { case SND_SOC_DAIFMT_CBS_CFS: case SND_SOC_DAIFMT_CBS_CFM: clk_set_rate(dev->clk, sampling_rate * bclk_ratio); + case SND_SOC_DAIFMT_CBM_CFS: + /* Codec must be master in multichannel mode */ + if (params_channels(params) > 2) + return -EINVAL; break; default: break; @@ -294,8 +299,14 @@ static int bcm2835_i2s_hw_params(struct snd_pcm_substream *substream, format |= BCM2835_I2S_CHWID((data_length-8)&0xf); + /* Default data delay to 1 bit. + In I2S mode, we must have 2 channels */ switch (dev->fmt & SND_SOC_DAIFMT_FORMAT_MASK) { case SND_SOC_DAIFMT_I2S: + if (params_channels(params) != 2) + return -EINVAL; + case SND_SOC_DAIFMT_DSP_A: + case SND_SOC_DAIFMT_DSP_B: data_delay = 1; break; default: @@ -312,6 +323,7 @@ static int bcm2835_i2s_hw_params(struct snd_pcm_substream *substream, switch (params_channels(params)) { case 2: + case 8: format = BCM2835_I2S_CH1(format) | BCM2835_I2S_CH2(format); format |= BCM2835_I2S_CH1(BCM2835_I2S_CHPOS(ch1pos)); format |= BCM2835_I2S_CH2(BCM2835_I2S_CHPOS(ch2pos)); @@ -577,7 +589,7 @@ static struct snd_soc_dai_driver bcm2835_i2s_dai = { .probe = bcm2835_i2s_dai_probe, .playback = { .channels_min = 2, - .channels_max = 2, + .channels_max = 8, .rates = SNDRV_PCM_RATE_8000_192000, .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE @@ -585,7 +597,7 @@ static struct snd_soc_dai_driver bcm2835_i2s_dai = { }, .capture = { .channels_min = 2, - .channels_max = 2, + .channels_max = 8, .rates = SNDRV_PCM_RATE_8000_192000, .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE -- 2.7.4

9 36

[alsa-devel] [PATCH] ASoC: rockchip: i2s: Remove unnecessary 'out of memory' message
by Mihai-Valentin DUMITRU 26 Feb '17

26 Feb '17

This was reported by checkpatch.pl Signed-off-by: Mihai-Valentin DUMITRU <mihai.dumitru2201(a)gmail.com> --- sound/soc/rockchip/rockchip_i2s.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c index 974915cb4c4f..d02a1045fc0b 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c @@ -551,10 +551,8 @@ static int rockchip_i2s_probe(struct platform_device *pdev) int val; i2s = devm_kzalloc(&pdev->dev, sizeof(*i2s), GFP_KERNEL); - if (!i2s) { - dev_err(&pdev->dev, "Can't allocate rk_i2s_dev\n"); + if (!i2s) return -ENOMEM; - } i2s->dev = &pdev->dev; -- 2.11.1

2 1

[alsa-devel] [sound:topic/dollar-cove-ti 3/4] drivers/mfd/intel_soc_pmic_bxtwc.c:24:31: fatal error: asm/intel_pmc_ipc.h: No such file or directory
by kbuild test robot 26 Feb '17

26 Feb '17

tree: https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git topic/dollar-cove-ti head: 8dcecd0695c309e4f53fab087490fbc2217da5bf commit: 2546db2d230a263672858ec1b1ed51d0487a535a [3/4] mfd: intel-soc-pmic: Allow module build config: sh-allyesconfig (attached as .config) compiler: sh4-linux-gnu-gcc (Debian 6.1.1-9) 6.1.1 20160705 reproduce: wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/m… -O ~/bin/make.cross chmod +x ~/bin/make.cross git checkout 2546db2d230a263672858ec1b1ed51d0487a535a # save the attached .config to linux build tree make.cross ARCH=sh All errors (new ones prefixed by >>): >> drivers/mfd/intel_soc_pmic_bxtwc.c:24:31: fatal error: asm/intel_pmc_ipc.h: No such file or directory #include <asm/intel_pmc_ipc.h> ^ compilation terminated. vim +24 drivers/mfd/intel_soc_pmic_bxtwc.c 39d047c0 Qipeng Zha 2015-09-15 8 * version 2, as published by the Free Software Foundation. 39d047c0 Qipeng Zha 2015-09-15 9 * 39d047c0 Qipeng Zha 2015-09-15 10 * This program is distributed in the hope it will be useful, but WITHOUT 39d047c0 Qipeng Zha 2015-09-15 11 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 39d047c0 Qipeng Zha 2015-09-15 12 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for 39d047c0 Qipeng Zha 2015-09-15 13 * more details. 39d047c0 Qipeng Zha 2015-09-15 14 */ 39d047c0 Qipeng Zha 2015-09-15 15 39d047c0 Qipeng Zha 2015-09-15 16 #include <linux/module.h> 39d047c0 Qipeng Zha 2015-09-15 17 #include <linux/acpi.h> 39d047c0 Qipeng Zha 2015-09-15 18 #include <linux/err.h> 39d047c0 Qipeng Zha 2015-09-15 19 #include <linux/delay.h> 39d047c0 Qipeng Zha 2015-09-15 20 #include <linux/interrupt.h> 39d047c0 Qipeng Zha 2015-09-15 21 #include <linux/kernel.h> 39d047c0 Qipeng Zha 2015-09-15 22 #include <linux/mfd/core.h> 39d047c0 Qipeng Zha 2015-09-15 23 #include <linux/mfd/intel_bxtwc.h> 39d047c0 Qipeng Zha 2015-09-15 @24 #include <asm/intel_pmc_ipc.h> 39d047c0 Qipeng Zha 2015-09-15 25 39d047c0 Qipeng Zha 2015-09-15 26 /* PMIC device registers */ 39d047c0 Qipeng Zha 2015-09-15 27 #define REG_ADDR_MASK 0xFF00 39d047c0 Qipeng Zha 2015-09-15 28 #define REG_ADDR_SHIFT 8 39d047c0 Qipeng Zha 2015-09-15 29 #define REG_OFFSET_MASK 0xFF 39d047c0 Qipeng Zha 2015-09-15 30 39d047c0 Qipeng Zha 2015-09-15 31 /* Interrupt Status Registers */ 39d047c0 Qipeng Zha 2015-09-15 32 #define BXTWC_IRQLVL1 0x4E02 :::::: The code at line 24 was first introduced by commit :::::: 39d047c0b1c812e9f0014e7100e372e61f2de3de mfd: add Intel Broxton Whiskey Cove PMIC driver :::::: TO: Qipeng Zha <qipeng.zha(a)intel.com> :::::: CC: Lee Jones <lee.jones(a)linaro.org> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] [PATCH] ALSA: vx: remove 'out of memory' message
by Mihai Burduselu 26 Feb '17

26 Feb '17

Reported by checkpatch.pl Signed-off-by: Mihai Burduselu <michelcatalin(a)gmail.com> --- sound/drivers/vx/vx_core.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sound/drivers/vx/vx_core.c b/sound/drivers/vx/vx_core.c index 289f041706cd..f684fffd1397 100644 --- a/sound/drivers/vx/vx_core.c +++ b/sound/drivers/vx/vx_core.c @@ -795,10 +795,8 @@ struct vx_core *snd_vx_create(struct snd_card *card, struct snd_vx_hardware *hw, return NULL; chip = kzalloc(sizeof(*chip) + extra_size, GFP_KERNEL); - if (! chip) { - snd_printk(KERN_ERR "vx_core: no memory\n"); + if (! chip) return NULL; - } mutex_init(&chip->lock); chip->irq = -1; chip->hw = hw; -- 2.11.0

1 0

[alsa-devel] [PATCH] ASoC: pxa: The open brace is placed with the previous line
by Codrut Grosu 25 Feb '17

25 Feb '17

This was reported by checkpatch.pl Signed-off-by: Codrut Grosu <codrut.cristian.grosu(a)gmail.com> --- sound/soc/pxa/raumfeld.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sound/soc/pxa/raumfeld.c b/sound/soc/pxa/raumfeld.c index 552b763..47c9173 100644 --- a/sound/soc/pxa/raumfeld.c +++ b/sound/soc/pxa/raumfeld.c @@ -228,14 +228,12 @@ static int raumfeld_ak4104_hw_params(struct snd_pcm_substream *substream, .codec_name = "spi0.0", \ } -static struct snd_soc_dai_link snd_soc_raumfeld_connector_dai[] = -{ +static struct snd_soc_dai_link snd_soc_raumfeld_connector_dai[] = { DAI_LINK_CS4270, DAI_LINK_AK4104, }; -static struct snd_soc_dai_link snd_soc_raumfeld_speaker_dai[] = -{ +static struct snd_soc_dai_link snd_soc_raumfeld_speaker_dai[] = { DAI_LINK_CS4270, }; -- 1.9.1

1 0

[alsa-devel] [PATCH] ASoC: pxa-ssp: Line up *s in block comments
by Codrut Grosu 25 Feb '17

25 Feb '17

This was reported by checkpatch.pl Signed-off-by: Codrut Grosu <codrut.cristian.grosu(a)gmail.com> --- sound/soc/pxa/pxa-ssp.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c index 72a5e87..f3285a6 100644 --- a/sound/soc/pxa/pxa-ssp.c +++ b/sound/soc/pxa/pxa-ssp.c @@ -592,13 +592,13 @@ static int pxa_ssp_hw_params(struct snd_pcm_substream *substream, if ((pxa_ssp_get_scr(ssp) == 4) && (width == 16)) { /* This is a special case where the bitclk is 64fs - * and we're not dealing with 2*32 bits of audio - * samples. - * - * The SSP values used for that are all found out by - * trying and failing a lot; some of the registers - * needed for that mode are only available on PXA3xx. - */ + * and we're not dealing with 2*32 bits of audio + * samples. + * + * The SSP values used for that are all found out by + * trying and failing a lot; some of the registers + * needed for that mode are only available on PXA3xx. + */ if (ssp->type != PXA3xx_SSP) return -EINVAL; -- 1.9.1

1 0

[alsa-devel] [PATCH] ASoC: pxa: Remove unneeded else after return statement
by Codrut Grosu 25 Feb '17

25 Feb '17

This was reported by checkpatch.pl Signed-off-by: Codrut Grosu <codrut.cristian.grosu(a)gmail.com> --- sound/soc/pxa/pxa2xx-ac97.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c index 2e2fb18..f49bf02 100644 --- a/sound/soc/pxa/pxa2xx-ac97.c +++ b/sound/soc/pxa/pxa2xx-ac97.c @@ -140,9 +140,8 @@ static int pxa2xx_ac97_mic_startup(struct snd_pcm_substream *substream, { if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) return -ENODEV; - else - snd_soc_dai_set_dma_data(cpu_dai, substream, - &pxa2xx_ac97_pcm_mic_mono_in); + snd_soc_dai_set_dma_data(cpu_dai, substream, + &pxa2xx_ac97_pcm_mic_mono_in); return 0; } -- 1.9.1

1 0