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

[alsa-devel] [PATCH] ASoC: rcar: clear DE bit only in PDMACHCR when it stops
by Kuninori Morimoto 15 Mar '17

15 Mar '17

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> R-Car datasheet indicates "Clear DE in PDMACHCR" for transfer stop, but current code clears all bits in PDMACHCR. Because of this, DE bit might never been cleared, and it causes CMD overflow. This patch fixes this issue. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Tested-by: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx(a)renesas.com> --- sound/soc/sh/rcar/dma.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/sound/soc/sh/rcar/dma.c b/sound/soc/sh/rcar/dma.c index 1f405c8..c2e199b 100644 --- a/sound/soc/sh/rcar/dma.c +++ b/sound/soc/sh/rcar/dma.c @@ -454,6 +454,20 @@ static u32 rsnd_dmapp_read(struct rsnd_dma *dma, u32 reg) return ioread32(rsnd_dmapp_addr(dmac, dma, reg)); } +static void rsnd_dmapp_bset(struct rsnd_dma *dma, u32 data, u32 mask, u32 reg) +{ + struct rsnd_mod *mod = rsnd_mod_get(dma); + struct rsnd_priv *priv = rsnd_mod_to_priv(mod); + struct rsnd_dma_ctrl *dmac = rsnd_priv_to_dmac(priv); + volatile void __iomem *addr = rsnd_dmapp_addr(dmac, dma, reg); + u32 val = ioread32(addr); + + val &= ~mask; + val |= (data & mask); + + iowrite32(val, addr); +} + static int rsnd_dmapp_stop(struct rsnd_mod *mod, struct rsnd_dai_stream *io, struct rsnd_priv *priv) @@ -461,10 +475,10 @@ static int rsnd_dmapp_stop(struct rsnd_mod *mod, struct rsnd_dma *dma = rsnd_mod_to_dma(mod); int i; - rsnd_dmapp_write(dma, 0, PDMACHCR); + rsnd_dmapp_bset(dma, 0, PDMACHCR_DE, PDMACHCR); for (i = 0; i < 1024; i++) { - if (0 == rsnd_dmapp_read(dma, PDMACHCR)) + if (0 == (rsnd_dmapp_read(dma, PDMACHCR) & PDMACHCR_DE)) return 0; udelay(1); } -- 1.9.1

2 1

[alsa-devel] [PATCH 1/1] ASoC: Add AU1761 audio codec as selectable option
by me＠rockwellcollins.com 15 Mar '17

15 Mar '17

From: Bryce Ferguson <bryce.ferguson(a)rockwellcollins.com> This commit adds the ADI AU1761 audio codec as a selectable option in the kernel config. Currently the driver can only be selected for ADI blackfin devices or if SND_SOC_ALL_CODECS is enabled. Signed-off-by: Bryce Ferguson <bryce.ferguson(a)rockwellcollins.com> diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index e49e9da..43539c3b 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -303,12 +303,14 @@ config SND_SOC_ADAU1761 select SND_SOC_ADAU17X1 config SND_SOC_ADAU1761_I2C - tristate + tristate "Analog Devices AU1761 CODEC - I2C" + depends on I2C select SND_SOC_ADAU1761 select REGMAP_I2C config SND_SOC_ADAU1761_SPI - tristate + tristate "Analog Devices AU1761 CODEC - SPI" + depends on SPI select SND_SOC_ADAU1761 select REGMAP_SPI -- 2.7.4

4 3

[alsa-devel] [PATCH v2 00/12] Add support for the audio codec on Allwinner V3s
by Icenowy Zheng 15 Mar '17

15 Mar '17

Allwinner V3s features a audio codec with dedicated digital and analog parts, like the ones on A23/H3, but much simpler (lack of MIC2, LINE IN and MBIAS). Add support for it. In order to make the codec usable, DMA support is also added in this series; the support of Lichee Pi Zero's dock board is also added here, as it's the only board hackable that come with ports connected to the codec. Patch 1~3 split out parts that is not available on V3s in the analog codec. Patch 4/5 adds support for V3s in analog/digital codec. Patch 6 add the gate bit as a common quirk of sun6i-dma driver, as V3s also needs it. Patch 7 really adds support for V3s in DMA engine. Patch 8 restores the inclusion of CCU headers in the DTSI file of V3s, as it's removed when merging. Patch 9/10/11 adds three parts of V3s: DMA engine, codec support and pinmux of mmc1 (used on Lichee Pi Zero dock). Patch 12 adds support for Lichee Pi Zero dock, with support of mmc1 and codec. Icenowy Zheng (12): ASoC: sun8i-codec-analog: split out mic2 ASoC: sun8i-codec-analog: split out line in ASoC: sun8i-codec-analog: split out mbias ASoC: sun8i-codec-analog: add support for V3s SoC ASoC: sun4i-codec: Add support for V3s codec dmaengine: sun6i: make gate bit in sun8i's DMA engines a common quirk dmaengine: sun6i: support V3s SoC variant ARM: dts: sun8i: restore the inclusion of ccu headers in V3s DTSI ARM: dts: sun8i: add DMA engine in V3s DTSI ARM: dts: sun8i: add audio codec support into V3s DTSI ARM: dts: sun8i: add pinmux for V3s mmc1 ARM: dts: sun8i: add device tree for Lichee Pi Zero with Dock .../devicetree/bindings/dma/sun6i-dma.txt | 1 + .../devicetree/bindings/sound/sun4i-codec.txt | 11 +- .../bindings/sound/sun8i-codec-analog.txt | 1 + arch/arm/boot/dts/Makefile | 3 +- arch/arm/boot/dts/sun8i-v3s-licheepi-zero-dock.dts | 67 +++++++ arch/arm/boot/dts/sun8i-v3s.dtsi | 103 ++++++---- drivers/dma/sun6i-dma.c | 22 ++- sound/soc/sunxi/sun4i-codec.c | 59 ++++++ sound/soc/sunxi/sun8i-codec-analog.c | 211 +++++++++++++++++---- 9 files changed, 405 insertions(+), 73 deletions(-) create mode 100644 arch/arm/boot/dts/sun8i-v3s-licheepi-zero-dock.dts -- 2.11.1

4 30

[alsa-devel] [PATCH 0/3] ASoC: add dio2125 amplifier support
by Jerome Brunet 15 Mar '17

15 Mar '17

This patchset adds the support for the dio2125 from Dioo microcircuits. The dio2125 is audio driver with adjustable gain. The EN pad allows to enable or disable the outputs of the driver. The link to the datasheet is not provided as part of the commit. It is not provided the manufacturer and it is doubtful it will still be available a few years from now. Still provided here in case anyone is interested [0]. This patchset has been tested on Amlogic's meson-gxbb-p200 board. [0]: http://www.winine.com/Line%E9%9F%B3/DIO2125XM10%20V1.0.pdf Jerome Brunet (3): dt-bindings: add vendor prefix for Dioo ASoC: dio2125: add dio2125 amp driver ASoC: dio2125: add dt-bindings .../devicetree/bindings/sound/dioo,dio2125.txt | 12 +++ .../devicetree/bindings/vendor-prefixes.txt | 1 + sound/soc/codecs/Kconfig | 5 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/dio2125.c | 120 +++++++++++++++++++++ 5 files changed, 140 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/dioo,dio2125.txt create mode 100644 sound/soc/codecs/dio2125.c -- 2.9.3

4 12

[alsa-devel] [RFC PATCH] ASoC: wm8960: Use physical width for bclk
by Daniel Baluta 15 Mar '17

15 Mar '17

bclk is derived from sysclk with the help of bclk_divs. Anyhow, for S20_3LE format there is no bclk_divs that could be used to derive an exact bclk. We can fix this by using storage size instead the exact number of bits of the sample when computing bclk. With this approach we can play S20_3LE encoded files at the cost of some unused BCLK cycles for S20_3LE and S24_LE. Signed-off-by: Daniel Baluta <daniel.baluta(a)nxp.com> --- sound/soc/codecs/wm8960.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c index e1429e3..18ca5fc 100644 --- a/sound/soc/codecs/wm8960.c +++ b/sound/soc/codecs/wm8960.c @@ -722,7 +722,8 @@ static int wm8960_hw_params(struct snd_pcm_substream *substream, bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK; int i; - wm8960->bclk = snd_soc_params_to_bclk(params); + wm8960->bclk = params_physical_width(params) * + params_channels(params) * params_rate(params); if (params_channels(params) == 1) wm8960->bclk *= 2; -- 2.7.4

4 4

[alsa-devel] [PATCH v2 14/14] ASoC: sunxi: simplify optional reset handling
by Philipp Zabel 15 Mar '17

15 Mar '17

As of commit bb475230b8e5 ("reset: make optional functions really optional"), the reset framework API calls use NULL pointers to describe optional, non-present reset controls. This allows to return errors from devm_reset_control_get_optional and to call reset_control_deassert unconditionally. Signed-off-by: Philipp Zabel <p.zabel(a)pengutronix.de> Acked-by: Mark Brown <broonie(a)kernel.org> Acked-by: Chen-Yu Tsai <wens(a)csie.org> --- sound/soc/sunxi/sun4i-spdif.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sound/soc/sunxi/sun4i-spdif.c b/sound/soc/sunxi/sun4i-spdif.c index eaefd07a5ed08..cdf8a6d86010c 100644 --- a/sound/soc/sunxi/sun4i-spdif.c +++ b/sound/soc/sunxi/sun4i-spdif.c @@ -521,13 +521,12 @@ static int sun4i_spdif_probe(struct platform_device *pdev) if (quirks->has_reset) { host->rst = devm_reset_control_get_optional(&pdev->dev, NULL); - if (IS_ERR(host->rst) && PTR_ERR(host->rst) == -EPROBE_DEFER) { - ret = -EPROBE_DEFER; + if (IS_ERR(host->rst)) { + ret = PTR_ERR(host->rst); dev_err(&pdev->dev, "Failed to get reset: %d\n", ret); return ret; } - if (!IS_ERR(host->rst)) - reset_control_deassert(host->rst); + reset_control_deassert(host->rst); } ret = devm_snd_soc_register_component(&pdev->dev, -- 2.11.0

1 0

[alsa-devel] [PATCH v2] ASoC: hdmi-codec: fix non static symbol warnings
by Takashi Sakamoto 14 Mar '17

14 Mar '17

Fixes the following sparse warnings: $ make C=2 sound/soc/codecs/hdmi-codec.o sound/soc/codecs/hdmi-codec.c:34:1: warning: symbol 'hdmi_device_list' was not declared. Should it be static? sound/soc/codecs/hdmi-codec.c:80:33: warning: symbol 'hdmi_codec_stereo_chmaps' was not declared. Should it be static? sound/soc/codecs/hdmi-codec.c:87:33: warning: symbol 'hdmi_codec_8ch_chmaps' was not declared. Should it be static? sound/soc/codecs/hdmi-codec.c:354:6: warning: symbol 'hdmi_codec_eld_chmap' was not declared. Should it be static? Cc: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> Signed-off-by: Wei Yongjun <weiyongjun1(a)huawei.com> Signed-off-by: Takashi Sakamoto <takashi.sakamoto(a)miraclelinux.com> --- sound/soc/codecs/hdmi-codec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c index 8c5ae1f..6ba6aa5 100644 --- a/sound/soc/codecs/hdmi-codec.c +++ b/sound/soc/codecs/hdmi-codec.c @@ -31,7 +31,7 @@ struct hdmi_device { int cnt; }; #define pos_to_hdmi_device(pos) container_of((pos), struct hdmi_device, list) -LIST_HEAD(hdmi_device_list); +static LIST_HEAD(hdmi_device_list); static DEFINE_MUTEX(hdmi_mutex); #define DAI_NAME_SIZE 16 @@ -78,14 +78,14 @@ struct hdmi_codec_cea_spk_alloc { }; /* Channel maps stereo HDMI */ -const struct snd_pcm_chmap_elem hdmi_codec_stereo_chmaps[] = { +static const struct snd_pcm_chmap_elem hdmi_codec_stereo_chmaps[] = { { .channels = 2, .map = { SNDRV_CHMAP_FL, SNDRV_CHMAP_FR } }, { } }; /* Channel maps for multi-channel playbacks, up to 8 n_ch */ -const struct snd_pcm_chmap_elem hdmi_codec_8ch_chmaps[] = { +static const struct snd_pcm_chmap_elem hdmi_codec_8ch_chmaps[] = { { .channels = 2, /* CA_ID 0x00 */ .map = { SNDRV_CHMAP_FL, SNDRV_CHMAP_FR } }, { .channels = 4, /* CA_ID 0x01 */ @@ -352,7 +352,7 @@ static unsigned long hdmi_codec_spk_mask_from_alloc(int spk_alloc) return spk_mask; } -void hdmi_codec_eld_chmap(struct hdmi_codec_priv *hcp) +static void hdmi_codec_eld_chmap(struct hdmi_codec_priv *hcp) { u8 spk_alloc; unsigned long spk_mask; -- 2.9.3

3 3

Re: [alsa-devel] [PATCH for-4.11] ASoC: don't dereference NULL pcm_{new, free}
by Mark Brown 14 Mar '17

14 Mar '17

On Mon, Mar 13, 2017 at 02:52:56PM -0700, Brian Norris wrote: > Sure, I can understand frustration with essentially contentless "bug > reports." And I got frustrated by a seemingly pat response that was > (IMO) a bit mistargeted. It *is* a pat response, it's one of the things I find I have to send often enough that I've got a canned response for it - I find that if I don't do things like that then after a while what gets sent becomes so brief that unless you're really familiar with what's being said it can be hard to understand the feedback. It's tricky though because as you say it's fairly obvious it's a form letter. > BTW, I don't see the patch applied anywhere (and I have no reply - > either manual or automated/patchwork - other than the above quote to say > it was). 20170309102819.bx5paxtffvmvmuov(a)sirena.org.uk, fix/core Didn't seem to have made -next today, guess it'll hit tomorrow.

1 0

Re: [alsa-devel] [PATCH 4/4] dts: bcm283x.dtsi: Add analog audio/headphone jack for bcm2835
by Michael Zoran 14 Mar '17

14 Mar '17

On Tue, 2017-03-14 at 11:07 +0100, Stefan Wahren wrote: > Am 14.03.2017 um 09:47 schrieb Michael Zoran: > > On Tue, 2017-03-14 at 09:05 +0100, Stefan Wahren wrote: > > > > > AFAIK the Raspberry Pi 3 uses pin 40 and 41. > > > > > > > I did all my testing on the RPI 3, so I'm almost certain it's > > correct. > > It matches with the schematic and it matches with what the > > downstream > > tree uses for the firmware based driver(dummy claiming of pins). > > The reduced schematic that i have name the pins as AUD_PWM0 and > AUD_PWM1, which says nothing about the actual pins. Do you have a > better > document? > > In the firmware dt-blob.dts [1] the Raspberry Pi 3 uses pin 40 and > 41. > > [1] - https://github.com/raspberrypi/firmware/blob/master/extra/dt-bl > ob.dts Here are the references I used: https://www.raspberrypi.org/documentation/hardware/raspberrypi/schemati cs/Raspberry-Pi-Rev-2.0-Model-AB-Schematics.pdf https://github.com/raspberrypi/linux/blob/rpi-4.9.y/arch/arm/boot/dts/o verlays/pwm-2chan-overlay.dts But looking at the downstream specific RPI 3 device tree, maybe it should be 40,41 instead of 40,45. The source code and tree I submitted does work. But I agree this is something that needs to be fixed.

1 0

Re: [alsa-devel] [PATCH 3/4] sound: arm: Add build system for bcm2835-analog-audio driver.
by Michael Zoran 14 Mar '17

14 Mar '17

On Tue, 2017-03-14 at 10:13 +0100, Stefan Wahren wrote: > Am 14.03.2017 um 09:58 schrieb Michael Zoran: > > On Tue, 2017-03-14 at 15:15 +0800, kbuild test robot wrote: > > > Hi Michael, > > > > > > [auto build test ERROR on sound/for-next] > > > [also build test ERROR on v4.11-rc2 next-20170310] > > > [if your patch is applied to the wrong git tree, please drop us a > > > note to help improve the system] > > > > > > url: https://github.com/0day-ci/linux/commits/Michael-Zoran/dt > > > -bin > > > dings-Document-the-dmas-and-dma-names-properties-for-bcm2835- > > > analog- > > > audio/20170314-091035 > > > base: https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sou > > > nd.g > > > it for-next > > > config: arm64-allmodconfig (attached as .config) > > > compiler: aarch64-linux-gnu-gcc (Debian 6.1.1-9) 6.1.1 20160705 > > > reproduce: > > > wget https://raw.githubusercontent.com/01org/lkp-tests/ma > > > ster > > > /sbin/make.cross -O ~/bin/make.cross > > > chmod +x ~/bin/make.cross > > > # save the attached .config to linux build tree > > > make.cross ARCH=arm64 > > > > > > All errors (new ones prefixed by >>): > > > > > > /tmp/ccNU8kQ5.s: Assembler messages: > > > > > /tmp/ccNU8kQ5.s:1411: Error: unknown mnemonic `ldmia' -- > > > > > `ldmia > > > > > x26,{r0,r1,r2,r3}' > > > > > /tmp/ccNU8kQ5.s:1412: Error: unknown mnemonic `stmia' -- > > > > > `stmia > > > > > x19!,{r0,r1,r2,r3}' > > > > > /tmp/ccNU8kQ5.s:1618: Error: unknown mnemonic `ldmia' -- > > > > > `ldmia > > > > > x19!,{r0,r1,r2,r3}' > > > > > /tmp/ccNU8kQ5.s:1619: Error: unknown mnemonic `stmia' -- > > > > > `stmia > > > > > x26,{r0,r1,r2,r3}' > > > > > > --- > > > 0-DAY kernel test infrastructure Open Source > > > Technology Center > > > https://lists.01.org/pipermail/kbuild-all Intel > > > Corporation > > > > I'm a bit confused here. Why I'm I seeing assembly instruction > > build > > errors when the mail points to a DT binding document change? > > > > > > The email subject doesn't refer to a DT binding. > > I assume it's your change to enable ARM64 for all SND_ARM drivers, > which > aren't aware of that. OK, that makes sense now. Should I just submit another change adding a depends on ARM to the 1 or 2 other drivers in the directory?

1 0