June 2016 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH 1/1] alsabat: fix a missing break in switch
by han.lu＠intel.com 12 Jun '16

12 Jun '16

From: "Lu, Han" <han.lu(a)intel.com> Add the break line for OPT_ROUNDUPLATENCY case. Signed-off-by: Lu, Han <han.lu(a)intel.com> diff --git a/bat/bat.c b/bat/bat.c index 72ab8b2..8645770 100644 --- a/bat/bat.c +++ b/bat/bat.c @@ -420,6 +420,7 @@ static void parse_arguments(struct bat *bat, int argc, char *argv[]) break; case OPT_ROUNDTRIPLATENCY: bat->roundtriplatency = true; + break; case OPT_SNRTHD_DB: get_snr_thd_db(bat, optarg); break; -- 2.5.0

2 1

[alsa-devel] [asoc:for-next 6/11] cygnus-pcm.c:undefined reference to `bad_dma_ops'
by kbuild test robot 11 Jun '16

11 Jun '16

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next head: dfc5f51c33fb2dcc27bca3fce73a8bfc215716f3 commit: 1b02d429bfc97f490072f02502ac442c1176e670 [6/11] Merge remote-tracking branches 'asoc/topic/arizona', 'asoc/topic/atmel', 'asoc/topic/cs53l30', 'asoc/topic/cygnus' and 'asoc/topic/davinci' into asoc-next config: m32r-allyesconfig (attached as .config) compiler: m32r-linux-gcc (GCC) 4.9.0 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 1b02d429bfc97f490072f02502ac442c1176e670 # save the attached .config to linux build tree make.cross ARCH=m32r All errors (new ones prefixed by >>): drivers/built-in.o: In function `zynq_fpga_ops_write': zynq-fpga.c:(.text+0xeff3b4): undefined reference to `bad_dma_ops' zynq-fpga.c:(.text+0xeff3bc): undefined reference to `bad_dma_ops' zynq-fpga.c:(.text+0xeff4dc): undefined reference to `bad_dma_ops' sound/built-in.o: In function `snd_pcm_lib_default_mmap': (.text+0xfcb4): undefined reference to `bad_dma_ops' sound/built-in.o: In function `snd_pcm_lib_default_mmap': (.text+0xfcbc): undefined reference to `bad_dma_ops' sound/built-in.o: In function `snd_pcm_lib_default_mmap': (.text+0xfcd4): undefined reference to `dma_common_mmap' sound/built-in.o: In function `snd_pcm_lib_default_mmap': (.text+0xfcd4): relocation truncated to fit: R_M32R_26_PCREL_RELA against undefined symbol `dma_common_mmap' sound/built-in.o: In function `cygnus_pcm_preallocate_dma_buffer': >> cygnus-pcm.c:(.text+0x10d048): undefined reference to `bad_dma_ops' cygnus-pcm.c:(.text+0x10d04c): undefined reference to `bad_dma_ops' sound/built-in.o: In function `cygnus_dma_free_dma_buffers': cygnus-pcm.c:(.text+0x10d204): undefined reference to `bad_dma_ops' cygnus-pcm.c:(.text+0x10d208): undefined reference to `bad_dma_ops' cygnus-pcm.c:(.text+0x10d214): undefined reference to `bad_dma_ops' sound/built-in.o:cygnus-pcm.c:(.text+0x10d218): more undefined references to `bad_dma_ops' follow --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] AMD Carrizo HDMI audio
by João Paulo Rechi Vita 10 Jun '16

10 Jun '16

Hello Alex and Maruthi, I'm trying to get HDMI audio working on a AMD CARRIZO laptop, which I believe need the ACP changes which got merged into Linux 4.6. But testing the v4.6 tag, amd_acp_hw_init() returns -ENODEV, because it succeeds the "if (acp_mode != ACP_MODE_I2S)" test in acp_hw.c. Does this mean this chip does not uses ACP, or is there anything else missing? lspci shows me the following gfx/audio devices (I believe this is a dual-gpu machine): 00:01.0 VGA compatible controller: Advanced Micro Devices [AMD] nee ATI Device 9874 (rev c5) (prog-if 00 [VGA controller]) 00:01.1 Audio device: Advanced Micro Devices [AMD] nee ATI Device 9840 00:09.2 Audio device: Advanced Micro Devices [AMD] Device 157a 03:00.0 Display controller: Advanced Micro Devices [AMD] nee ATI Sun [Radeon HD 8600M Series] (rev ff) Both amdgpu and radeon get automatically probed. Sorry if I'm missing something obvious here, I'm quite new to dual-gpu machines. Thanks and best regards, -- João Paulo Rechi Vita http://about.me/jprvita

3 4

[alsa-devel] [PATCH v5 0/7] ARM/ASoC: OMAP3: Fix McBSP2/3 sidetone support
by Peter Ujfalusi 10 Jun '16

10 Jun '16

Hi, Changes since v4: - Moved DTS patch as the first in the series - rebased on top of 4.7-rc1 Changes since v3: - Rebased on next-20160525 [1] to apply cleanly - Fixed subject line for patch5 - Added Mark's acked-by to the ASoC patches [1] "ASoC: omap-mcbsp: Enable/disable sidetone block auto clock gating for omap3" is gone missing from linux-next - it was in next-20160517 and I'm not sure when it got dropped. Tony: since Paul did not replied to the series, I'm sending the v4 now, I hope he will have time to look at this. Commit message from v3: Based on the ongoing discussion on v2 (ARM: OMAP3: Fix McBSP2/3 hwmod setup for sidetone) I have dropped the removal of the sidetone hwmod and only corrected it. The series now includes all related changes needed to have correct sidetone support whenever we boot in legacy or in DT mode. This time the ASoC part have dependency on earlier patches so they can not be applied separately. Regards, Peter --- Peter Ujfalusi (7): ARM: dts: omap3: Add clocks to McBSP nodes ARM: OMAP3: hwmod data: Fix McBSP2/3 sidetone data ARM: OMAP3: McBSP: New callback for McBSP2/3 ICLK idle configuration ARM: OMAP3: pdata-quirks: Add support for McBSP2/3 sidetone handling ASoC: omap-mcbsp: Rename omap_mcbsp_sysfs_remove() to omap_mcbsp_cleanup() ASoC: omap-mcbsp: sidetone: Use the new callback for iclk handling ARM: OMAP2+: McBSP: Remove the old iclk allow/deny idle code arch/arm/boot/dts/omap3.dtsi | 10 ++++++++++ arch/arm/mach-omap2/mcbsp.c | 31 ++++++++++++++++------------- arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 24 ++++------------------ arch/arm/mach-omap2/pdata-quirks.c | 18 +++++++++++++++++ include/linux/platform_data/asoc-ti-mcbsp.h | 4 +++- sound/soc/omap/mcbsp.c | 21 +++++++++++++------ sound/soc/omap/mcbsp.h | 3 ++- sound/soc/omap/omap-mcbsp.c | 5 ++++- 8 files changed, 73 insertions(+), 43 deletions(-) -- 2.8.3

2 9

Re: [alsa-devel] dmix produces garbled sound on ARM
by Ihar Filipau 10 Jun '16

10 Jun '16

On 6/9/16, Takashi Iwai <tiwai(a)suse.de> wrote: > On Thu, 09 Jun 2016 16:05:42 +0200, > Ihar Filipau wrote: >> >> The only thing so far I have found is `aplay --dump-hw-params`, but it >> seem to display the allowed ranges, not the defaults/the params which >> are used. > > You just need to check what "aplay -v ..." shows. For example, > % aplay -Dplug:dmix -v foo.wav [ Replying back to the list, since exchange of the lengthy outputs is over for now. ] My parameters are nearly identical to yours (except for the differences which could be attributed to my 32-bit vs your 64-bit systems, and the hardware S16_LE vs S32_LE). Yet the problem persists. I have checked the Raspberry Pi forums/mail list and it seems that "dmix" works fine there. Thus, the problem might be related to the hw driver. How can I localize the problem? Is there any way to intercept the data stream which goes to the sound card, and compare the content between normal direct playback vs dmix? P.S. Though the window is closing for my investigations. I'm starting to prepare a workaround: applications shouldn't keep pcm open all the time, should open pcm when needed, and they should retry with a delay if opening pcm failed.

1 0

[alsa-devel] [PATCH 0/3] ASoC: da7219: Add ACPI initialisation support to driver
by Adam Thomson 10 Jun '16

10 Jun '16

This patch set updates the driver to use generic device property & fwnode related functions to read in either DT and ACPI data for driver initialisation. Changes are based on v4.6-rc6 Linux Kernel. Adam Thomson (3): ASoC: da7219: Convert driver to use generic device/fwnode functions ASoC: da7219: Add ACPI parsing support ASoC: da7219: Add initial ACPI id for device sound/soc/codecs/da7219-aad.c | 96 +++++++++++++++++++++++++++++++------------ sound/soc/codecs/da7219.c | 35 ++++++++++------ 2 files changed, 91 insertions(+), 40 deletions(-) -- 1.9.3

4 13

[alsa-devel] [PATCH v2] drm: msm: Add ASoC generic hdmi audio codec support.
by Srinivas Kandagatla 10 Jun '16

10 Jun '16

This patch adds support to generic audio codec via ASoC hdmi-codec infrastucture which is merged recently. Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> --- Changes since v1: -Fixed typo for 44.1Kz case spotted by Jyri Sarha drivers/gpu/drm/msm/Kconfig | 1 + drivers/gpu/drm/msm/hdmi/hdmi.c | 120 +++++++++++++++++++++++++++++++++++++++- drivers/gpu/drm/msm/hdmi/hdmi.h | 14 +++++ 3 files changed, 134 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig index 167a497..7c7a031 100644 --- a/drivers/gpu/drm/msm/Kconfig +++ b/drivers/gpu/drm/msm/Kconfig @@ -10,6 +10,7 @@ config DRM_MSM select SHMEM select TMPFS select QCOM_SCM + select SND_SOC_HDMI_CODEC if SND_SOC default y help DRM/KMS driver for MSM/snapdragon. diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c index 51b9ea5..aada355 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi.c +++ b/drivers/gpu/drm/msm/hdmi/hdmi.c @@ -19,6 +19,7 @@ #include <linux/of_irq.h> #include <linux/of_gpio.h> +#include <sound/hdmi-codec.h> #include "hdmi.h" void msm_hdmi_set_mode(struct hdmi *hdmi, bool power_on) @@ -434,6 +435,114 @@ static int msm_hdmi_get_gpio(struct device_node *of_node, const char *name) return gpio; } +/* + * HDMI audio codec callbacks + */ +static int msm_hdmi_audio_hw_params(struct device *dev, + struct hdmi_codec_daifmt *daifmt, + struct hdmi_codec_params *params) +{ + struct hdmi *hdmi = dev_get_drvdata(dev); + unsigned int chan; + unsigned int channel_allocation = 0; + unsigned int rate; + unsigned int level_shift = 0; /* 0dB */ + bool down_mix = false; + + dev_dbg(dev, "%u Hz, %d bit, %d channels\n", params->sample_rate, + params->sample_width, params->cea.channels); + + switch (params->cea.channels) { + case 2: + /* FR and FL speakers */ + channel_allocation = 0; + chan = MSM_HDMI_AUDIO_CHANNEL_2; + break; + case 4: + /* FC, LFE, FR and FL speakers */ + channel_allocation = 0x3; + chan = MSM_HDMI_AUDIO_CHANNEL_4; + break; + case 6: + /* RR, RL, FC, LFE, FR and FL speakers */ + channel_allocation = 0x0B; + chan = MSM_HDMI_AUDIO_CHANNEL_6; + break; + case 8: + /* FRC, FLC, RR, RL, FC, LFE, FR and FL speakers */ + channel_allocation = 0x1F; + chan = MSM_HDMI_AUDIO_CHANNEL_8; + break; + default: + return -EINVAL; + } + + switch (params->sample_rate) { + case 32000: + rate = HDMI_SAMPLE_RATE_32KHZ; + break; + case 44100: + rate = HDMI_SAMPLE_RATE_44_1KHZ; + break; + case 48000: + rate = HDMI_SAMPLE_RATE_48KHZ; + break; + case 88200: + rate = HDMI_SAMPLE_RATE_88_2KHZ; + break; + case 96000: + rate = HDMI_SAMPLE_RATE_96KHZ; + break; + case 176400: + rate = HDMI_SAMPLE_RATE_176_4KHZ; + break; + case 192000: + rate = HDMI_SAMPLE_RATE_192KHZ; + break; + default: + dev_err(dev, "rate[%d] not supported!\n", + params->sample_rate); + return -EINVAL; + } + + msm_hdmi_audio_set_sample_rate(hdmi, rate); + msm_hdmi_audio_info_setup(hdmi, 1, chan, channel_allocation, + level_shift, down_mix); + + return 0; +} + +static void msm_hdmi_audio_shutdown(struct device *dev) +{ + struct hdmi *hdmi = dev_get_drvdata(dev); + + msm_hdmi_audio_info_setup(hdmi, 0, 0, 0, 0, 0); +} + +static const struct hdmi_codec_ops msm_hdmi_audio_codec_ops = { + .hw_params = msm_hdmi_audio_hw_params, + .audio_shutdown = msm_hdmi_audio_shutdown, +}; + +static struct hdmi_codec_pdata codec_data = { + .ops = &msm_hdmi_audio_codec_ops, + .max_i2s_channels = 8, + .i2s = 1, +}; + +static int msm_hdmi_register_audio_driver(struct hdmi *hdmi, struct device *dev) +{ + hdmi->audio_pdev = platform_device_register_data(dev, + HDMI_CODEC_DRV_NAME, + PLATFORM_DEVID_AUTO, + &codec_data, + sizeof(codec_data)); + if (IS_ERR(hdmi->audio_pdev)) + return PTR_ERR(hdmi->audio_pdev); + + return 0; +} + static int msm_hdmi_bind(struct device *dev, struct device *master, void *data) { struct drm_device *drm = dev_get_drvdata(master); @@ -441,7 +550,7 @@ static int msm_hdmi_bind(struct device *dev, struct device *master, void *data) static struct hdmi_platform_config *hdmi_cfg; struct hdmi *hdmi; struct device_node *of_node = dev->of_node; - int i; + int i, err; hdmi_cfg = (struct hdmi_platform_config *) of_device_get_match_data(dev); @@ -468,6 +577,12 @@ static int msm_hdmi_bind(struct device *dev, struct device *master, void *data) return PTR_ERR(hdmi); priv->hdmi = hdmi; + err = msm_hdmi_register_audio_driver(hdmi, dev); + if (err) { + DRM_ERROR("Failed to attach an audio codec %d\n", err); + hdmi->audio_pdev = NULL; + } + return 0; } @@ -477,6 +592,9 @@ static void msm_hdmi_unbind(struct device *dev, struct device *master, struct drm_device *drm = dev_get_drvdata(master); struct msm_drm_private *priv = drm->dev_private; if (priv->hdmi) { + if (priv->hdmi->audio_pdev) + platform_device_unregister(priv->hdmi->audio_pdev); + msm_hdmi_destroy(priv->hdmi); priv->hdmi = NULL; } diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.h b/drivers/gpu/drm/msm/hdmi/hdmi.h index bc7ba0b..accc9a6 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi.h +++ b/drivers/gpu/drm/msm/hdmi/hdmi.h @@ -50,6 +50,7 @@ struct hdmi_hdcp_ctrl; struct hdmi { struct drm_device *dev; struct platform_device *pdev; + struct platform_device *audio_pdev; const struct hdmi_platform_config *config; @@ -210,6 +211,19 @@ static inline int msm_hdmi_pll_8996_init(struct platform_device *pdev) /* * audio: */ +/* Supported HDMI Audio channels and rates */ +#define MSM_HDMI_AUDIO_CHANNEL_2 0 +#define MSM_HDMI_AUDIO_CHANNEL_4 1 +#define MSM_HDMI_AUDIO_CHANNEL_6 2 +#define MSM_HDMI_AUDIO_CHANNEL_8 3 + +#define HDMI_SAMPLE_RATE_32KHZ 0 +#define HDMI_SAMPLE_RATE_44_1KHZ 1 +#define HDMI_SAMPLE_RATE_48KHZ 2 +#define HDMI_SAMPLE_RATE_88_2KHZ 3 +#define HDMI_SAMPLE_RATE_96KHZ 4 +#define HDMI_SAMPLE_RATE_176_4KHZ 5 +#define HDMI_SAMPLE_RATE_192KHZ 6 int msm_hdmi_audio_update(struct hdmi *hdmi); int msm_hdmi_audio_info_setup(struct hdmi *hdmi, bool enabled, -- 2.8.3

1 0

[alsa-devel] [PATCH 0/4] ASoC: sunxi: Add i2s controller support
by Maxime Ripard 10 Jun '16

10 Jun '16

Hi everyone, This is the first version of the I2S support for the controller found in the Allwinner A10 and later SoCs. Playback has been tested with an UDA1380 on an A20-Olinuxino. Capture is not implemented yet, but will come eventually. Let me know what you think, Maxime Emilio López (1): ARM: sun7i: Add mod1 clock nodes Maxime Ripard (3): dt-bindings: Add A10 I2S controller binding documentation ASoC: sunxi: Add Allwinner A10 Digital Audio driver ARM: sun7i: Add DAI nodes .../devicetree/bindings/sound/sun4i-i2s.txt | 33 + arch/arm/boot/dts/sun7i-a20.dtsi | 87 ++- sound/soc/sunxi/Kconfig | 10 + sound/soc/sunxi/Makefile | 2 +- sound/soc/sunxi/sun4i-i2s.c | 714 +++++++++++++++++++++ 5 files changed, 843 insertions(+), 3 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/sun4i-i2s.txt create mode 100644 sound/soc/sunxi/sun4i-i2s.c -- 2.8.3

4 13

[alsa-devel] Raspberry Pi sound card
by Matt Flax 10 Jun '16

10 Jun '16

If anyone is tinkering with the Raspberry Pi and wants a neat sound card, check out the Audio Injector which uses the previous patches to run the wm8731 codec with a 12 MHz crystal in normal mode : https://www.kickstarter.com/projects/1250664710/audio-injector-sound-card-f… http://www.audioinjector.net/ thanks Matt

1 0

[alsa-devel] [PATCH v2] ASoC: rsnd: adg :: AUDIO-CLKOUTn asynchronizes support
by Kuninori Morimoto 09 Jun '16

09 Jun '16

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> AUDIO-CLKOUTn can asynchronizes with L/R clock. AUDIO-CLKOUTn synchronizes with L/R clock is now default behavior. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- v1 -> v2 - default is synchronizes, asynchronizes is option .../devicetree/bindings/sound/renesas,rsnd.txt | 2 ++ sound/soc/sh/rcar/adg.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/renesas,rsnd.txt b/Documentation/devicetree/bindings/sound/renesas,rsnd.txt index c7b29df..15a7316 100644 --- a/Documentation/devicetree/bindings/sound/renesas,rsnd.txt +++ b/Documentation/devicetree/bindings/sound/renesas,rsnd.txt @@ -373,6 +373,8 @@ Optional properties: - #clock-cells : it must be 0 if your system has audio_clkout it must be 1 if your system has audio_clkout0/1/2/3 - clock-frequency : for all audio_clkout0/1/2/3 +- clkout-lr-asynchronous : boolean property. it indicates that audio_clkoutn + is asynchronizes with lr-clock. SSI subnode properties: - interrupts : Should contain SSI interrupt for PIO transfer diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c index 49354d1..7d3e0e4 100644 --- a/sound/soc/sh/rcar/adg.c +++ b/sound/soc/sh/rcar/adg.c @@ -33,11 +33,15 @@ struct rsnd_adg { struct clk *clkout[CLKOUTMAX]; struct clk_onecell_data onecell; struct rsnd_mod mod; + u32 flags; int rbga_rate_for_441khz; /* RBGA */ int rbgb_rate_for_48khz; /* RBGB */ }; +#define LRCLK_ASYNC (1 << 0) +#define adg_mode_flags(adg) (adg->flags) + #define for_each_rsnd_clk(pos, adg, i) \ for (i = 0; \ (i < CLKMAX) && \ @@ -355,6 +359,16 @@ found_clock: rsnd_adg_set_ssi_clk(ssi_mod, data); + if (!(adg_mode_flags(adg) & LRCLK_ASYNC)) { + struct rsnd_mod *adg_mod = rsnd_mod_get(adg); + u32 ckr = 0; + + if (0 == (rate % 8000)) + ckr = 0x80000000; + + rsnd_mod_bset(adg_mod, SSICKR, 0x80000000, ckr); + } + dev_dbg(dev, "ADG: %s[%d] selects 0x%x for %d\n", rsnd_mod_name(ssi_mod), rsnd_mod_id(ssi_mod), data, rate); @@ -532,6 +546,7 @@ int rsnd_adg_probe(struct rsnd_priv *priv) { struct rsnd_adg *adg; struct device *dev = rsnd_priv_to_dev(priv); + struct device_node *np = dev->of_node; adg = devm_kzalloc(dev, sizeof(*adg), GFP_KERNEL); if (!adg) { @@ -545,6 +560,9 @@ int rsnd_adg_probe(struct rsnd_priv *priv) rsnd_adg_get_clkin(priv, adg); rsnd_adg_get_clkout(priv, adg); + if (of_get_property(np, "clkout-lr-asynchronous", NULL)) + adg->flags = LRCLK_ASYNC; + priv->adg = adg; return 0; -- 1.9.1

2 1