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

[alsa-devel] No sound after suspend-to-ram
by George Gugulea 27 Oct '15

27 Oct '15

After a fresh reboot, the sound works ok but if I put the computer to sleep (pm-suspend), after it wakes up there is no sound anymore. I did try 'alsa force-reload' after suspend but still no sound. After 'pm-hibernate' sound is back again. I found an old thread here: https://bugzilla.kernel.org/show_bug.cgi?id=49421 where Michael seems to have the same problem which is still unsolved; maybe I can help with more info. I attached the 'alsa-info.sh' output before and after suspend: 'alsa-info.txt.before' and 'alsa-info.txt.after' (as a patch to stay below 80k mail size rule: diff -u alsa-info.txt.before alsa-info.txt.after > alsa-info.txt.patch) The only difference between before and after is this one: @@ -241,7 +241,7 @@ Node 0x11 [Audio Input] wcaps 0x10051b: Stereo Amp-In Amp-In caps: ofs=0x11, nsteps=0x2e, stepsize=0x03, mute=1 Amp-In vals: [0x12 0x12] - Converter: stream=4, channel=0 + Converter: stream=0, channel=0 SDI-Select: 0 PCM: rates [0x160]: 44100 48000 96000 The PC is here: http://www.dell.com/us/p/xps-27-2720-aio/pd?ref=PD_OC, but the 2y older version with no touch If I boot into windows (8.1) everything works great, including sound (even after suspend) -- gg

3 15

[alsa-devel] Using snd_pcm_set_params() on a capture handle
by Erik de Castro Lopo 27 Oct '15

27 Oct '15

Hi all, I've got a simple PCM capture test program below, which is basically a slightly tweak version of something from: http://equalarea.com/paul/alsa-audio.html The program uses two different methods of setting up the capture handle; one that works (and is complex) and one that doesn't but seems like it should (and is simple). I'm trying to figure out why the simple one (using snd_pcm_set_params) doesn't work. The program can be compiled and run in two ways: gcc -Wall -O2 -DUSE_SET_PARAMS=1 alsa_capture.c -lasound -o alsa_capture ./alsa_capture which fails with: Read from audio interface failed (Input/output error) and: gcc -Wall -O2 -DUSE_SET_PARAMS=0 alsa_capture.c -lasound -o alsa_capture ./alsa_capture which works as expected. Questions: * Is snd_pcm_set_params() supposed to work on capture handles (I've used it successfully on playback handles)? * Is my use of snd_pcm_set_params() missing something and if so what? * If snd_pcm_set_params() is not supposed to work on capture handles would it be possible to update the documentation to reflect that? Thanks, Erik //--------------------------------------------- #include <stdio.h> #include <stdlib.h> #include <alsa/asoundlib.h> #include <alsa/pcm.h> int main (int argc, char *argv[]) { int i; int err; char *buffer; int buffer_frames = 128; unsigned int rate = 44100; snd_pcm_t *capture_handle; snd_pcm_format_t format = SND_PCM_FORMAT_S32_LE; char* device = "default"; if (argc > 1) device = argv[1]; if ((err = snd_pcm_open (&capture_handle, device, SND_PCM_STREAM_CAPTURE, 0)) < 0) { printf ("Cannot open audio device %s (%s)\n", device, snd_strerror (err)); exit (1) ; } if (USE_SET_PARAMS) { if ((err = snd_pcm_set_params (capture_handle, format, SND_PCM_ACCESS_RW_INTERLEAVED, 2, rate, 0, 500000)) < 0) { /* 0.5sec */ printf ("Capture open error: %s\n", snd_strerror (err)); exit (1) ; } } else { snd_pcm_hw_params_t *hw_params; if ((err = snd_pcm_hw_params_malloc (&hw_params)) < 0) { printf ("Cannot allocate hardware parameter structure (%s)\n", snd_strerror (err)); exit (1) ; } if ((err = snd_pcm_hw_params_any (capture_handle, hw_params)) < 0) { printf ("Cannot initialize hardware parameter structure (%s)\n", snd_strerror (err)); exit (1) ; } if ((err = snd_pcm_hw_params_set_access (capture_handle, hw_params, SND_PCM_ACCESS_RW_INTERLEAVED)) < 0) { printf ("cannot set access type (%s)\n", snd_strerror (err)); exit (1) ; } if ((err = snd_pcm_hw_params_set_format (capture_handle, hw_params, format)) < 0) { printf ("Cannot set sample format (%s)\n", snd_strerror (err)); exit (1) ; } if ((err = snd_pcm_hw_params_set_rate_near (capture_handle, hw_params, &rate, 0)) < 0) { printf ("Cannot set sample rate (%s)\n", snd_strerror (err)); exit (1) ; } if ((err = snd_pcm_hw_params_set_channels (capture_handle, hw_params, 2)) < 0) { printf ("cannot set channel count (%s)\n", snd_strerror (err)); exit (1) ; } if ((err = snd_pcm_hw_params (capture_handle, hw_params)) < 0) { printf ("cannot set parameters (%s)\n", snd_strerror (err)); exit (1) ; } snd_pcm_hw_params_free (hw_params); } buffer = malloc (buffer_frames * snd_pcm_format_width(format) / 8 * 2); if ((err = snd_pcm_prepare (capture_handle)) < 0) { printf ("cannot prepare audio interface for use (%s)\n", snd_strerror (err)); exit (1) ; } for (i = 0; i < 10; ++i) { if ((err = snd_pcm_readi (capture_handle, buffer, buffer_frames)) != buffer_frames) { printf ("Read from audio interface failed (%s)\n", snd_strerror (err)); exit (1) ; break; } printf("read %d done\n", i); } free(buffer); snd_pcm_close (capture_handle); puts ("Audio interface closed"); return 0; } -- ---------------------------------------------------------------------- Erik de Castro Lopo http://www.mega-nerd.com/

4 10

[alsa-devel] [PATCH 0/18] ASoC: rsnd: use mod base common method on DMA/CMD/SSIU/SSI-parent
by Kuninori Morimoto 27 Oct '15

27 Oct '15

Hi Mark Renesas sound has (SSI/SSIU/SRC/CTU/MIX/DVC/CMD/AudioDMAC/AudioDMACpp). Here, SSI/SRC/CTU/MIX/DVC are implemented as "module". But, SSI parent / SSIU are implemented as part of SSI, CMD is implemented as part of CTU/MIX/DVC AudioDMAC/AudioDMACpp are implemented as part of SSI/SRC. because I assumed that SSI/SRC/CTU/MIX/DVC (which are implemented as module) are MAIN modules, and others are option. But, current style is 1) ununderstandable each IPs setting order when debugging, because debug message can't indicate invisible "modules". 2) there is no flexibility for each devices. This patch-set makes DMA/CMD/SSIU/SSI-parent as common module. All devices are controlled as common module now. 1) - 12) prepare for each device 13) - 18) mod base common method patches. Becase DMA was implemented as part of SSI/SRC, it was difficult to separate it in 1 patch. It used 3 phases here Kuninori Morimoto (18): 1) ASoC: rsnd: DMA become SSI/SRC member 2) ASoC: rsnd: DMA related definition goes to dma.c 3) ASoC: rsnd: rename rsnd_dma_init() to rsnd_dma_attach() 4) ASoC: rsnd: enable to use rsnd_dai_connect() from each mod 5) ASoC: rsnd: remove all modules when DMA fail case 6) ASoC: rsnd: fixup rsnd_dma_of_path method for mod base common method 7) ASoC: rsnd: move rsnd_src_ssi_irq_enable/disable() to ssi.c 8) ASoC: rsnd: disable SRC.out only when stop timing 9) ASoC: rsnd: rsnd_dai_stream has each mod's status insted of rsnd_mod 10) ASoC: rsnd: Don't stop HW even if a large number of errors occur 11) ASoC: rsnd: avoid pointless loop in rsnd_mod_interrupt() 12) ASoC: rsnd: use common rsnd_ssi_status_xxx() 13) ASoC: rsnd: use mod base common method on DMA phase1 14) ASoC: rsnd: use mod base common method on DMA phase2 15) ASoC: rsnd: use mod base common method on DMA phase3 16) ASoC: rsnd: use mod base common method on CMD 17) ASoC: rsnd: use mod base common method on SSIU 18) ASoC: rsnd: use mod base common method on SSI-parent sound/soc/sh/rcar/Makefile | 2 +- sound/soc/sh/rcar/cmd.c | 153 ++++++++++++++++++++++++++++++++++++++++++++++++ sound/soc/sh/rcar/core.c | 155 +++++++++++++------------------------------------ sound/soc/sh/rcar/ctu.c | 8 +++ sound/soc/sh/rcar/dma.c | 240 +++++++++++++++++++++++++++++++++++++++++++++------------------------------ sound/soc/sh/rcar/dvc.c | 18 ++++-- sound/soc/sh/rcar/mix.c | 10 +++- sound/soc/sh/rcar/rsnd.h | 88 +++++++++++++++------------- sound/soc/sh/rcar/src.c | 179 ++++++++++++-------------------------------------------- sound/soc/sh/rcar/ssi.c | 423 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------- sound/soc/sh/rcar/ssiu.c | 181 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 11 files changed, 860 insertions(+), 597 deletions(-)

2 36

[alsa-devel] [PATCH 0/5] ALSA: firewire-tascam: add MIDI functionality
by Takashi Sakamoto 27 Oct '15

27 Oct '15

Hi, TASCAM FireWire series driver may be newly available in Linux 4.4. For the driver, this patchset adds ALSA MIDI ports to communicate to physical MIDI ports. This patchset includes some fixes, and updates my former post: [alsa-devel] [PATCH 00/25 v2] ALSA: support AMDTP variants http://mailman.alsa-project.org/pipermail/alsa-devel/2015-August/096739.html Changes: * support system exclusive messages * drop virtual MIDI ports * drop MMAP support via hwdep interface for status and control message Although TASCAM FireWire series has physical controls, this patchset doesn't support them. I think some facilities are required to enable this functionality: * handling MIDI messages on virtual MIDI ports by this driver * handling status and control messages in isochronous packet by this driver * parsing the status and control messages by userspace application * supporting assignment of physical controls to MIDI ports by userspace application * turn on/off LEDs on device by userspace application These work are apparently beyond my current effort. Takashi Sakamoto (5): ALSA: firewire-tascam: add support for incoming MIDI messages by asynchronous transaction ALSA: firewire-tascam: add support for outgoing MIDI messages by asynchronous transaction ALSA: firewire-tascam: add support for MIDI functionality ALSA: firewire-tascam: Turn on/off FireWire LED ALSA: firewire-tascam: change device probing processing sound/firewire/tascam/Makefile | 3 +- sound/firewire/tascam/tascam-midi.c | 135 +++++++++++++ sound/firewire/tascam/tascam-transaction.c | 293 +++++++++++++++++++++++++++++ sound/firewire/tascam/tascam.c | 89 +++++---- sound/firewire/tascam/tascam.h | 30 +++ 5 files changed, 503 insertions(+), 47 deletions(-) create mode 100644 sound/firewire/tascam/tascam-midi.c create mode 100644 sound/firewire/tascam/tascam-transaction.c -- 2.1.4

4 25

[alsa-devel] [PATCH v2 0/4] Add SPDIF support for Allwinner SoCs
by codekipper＠gmail.com 26 Oct '15

26 Oct '15

From: Marcus Cooper <codekipper(a)gmail.com> This patch set adds support for the Allwinner SPDIF transceiver as present on the A10, A20 and A31 SoC boards. For now just the SPDIF transmitter has been tested on a Mele A2000. In order for this patch set to be functional we require audio clock patches which will be delivered separately. For those that are interested I've pushed the patches here with all the required changes to get SPDIF audio out of the device. https://github.com/codekipper/linux-sunxi/commits/spdif_delivery This is version 2 of the patch series. After Mark's initial comments I realised that I shouldn't of blindly copied the register set-up from the original SDK that was released. It doesn't help also that the datasheet that finally emerged lacked a serious amount of detail. If anybody does recognise the IP used for the block then please speak out. In short, much of the code that was in the first release is no longer here. I'm still unsure about the machine driver setup. Simple card seems a bit overkill and what I've added is pretty much a copy of what is done in imx-spdif. I'm not planning on arguing the case for my method so if you can advise then I'm all ears. Thanks in advance, CK --- Changes since v1: - Moved sunxi-machine-spdif.c to seperate patch - replaced sunxi in naming scheme with sun4i in the sun4i-spdif driver. - split tx controller into seperate enable/disable functions - moved setclk and setfmt functionality into hw params - added support for mono signals. - cleaned up probe clock set up. - removed all writes to transmit status registers. - removed of_id - removed power management code. - Added support for more rates. --- Marcus Cooper (4): dt-bindings: add sunxi SPDIF transceiver bindings dt-binding: Add sunxi S/PDIF machine driver ASoC: sunxi: Add S/PDIF machine driver. ASOC: sunxi: Add support for the spdif block .../devicetree/bindings/sound/sunxi,spdif.txt | 49 ++ .../bindings/sound/sunxi-audio-spdif.txt | 36 ++ sound/soc/sunxi/Kconfig | 12 + sound/soc/sunxi/Makefile | 4 + sound/soc/sunxi/sun4i-spdif.c | 612 +++++++++++++++++++++ sound/soc/sunxi/sunxi-machine-spdif.c | 108 ++++ 6 files changed, 821 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/sunxi,spdif.txt create mode 100644 Documentation/devicetree/bindings/sound/sunxi-audio-spdif.txt create mode 100644 sound/soc/sunxi/sun4i-spdif.c create mode 100644 sound/soc/sunxi/sunxi-machine-spdif.c -- 1.9.1

4 17

[alsa-devel] [PATCH] ALSA: hda/ca0132 - Convert leftover pr_info() and pr_err()
by Takashi Iwai 26 Oct '15

26 Oct '15

Use codec_*() macro instead of pr_*() for improving the log information. The current form even slips from alsa-info.sh. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/patch_ca0132.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c index 3a02e5c14d09..f8a12ca477f1 100644 --- a/sound/pci/hda/patch_ca0132.c +++ b/sound/pci/hda/patch_ca0132.c @@ -2673,13 +2673,13 @@ static bool dspload_wait_loaded(struct hda_codec *codec) do { if (dspload_is_loaded(codec)) { - pr_info("ca0132 DOWNLOAD OK :-) DSP IS RUNNING.\n"); + codec_info(codec, "ca0132 DSP downloaded and running\n"); return true; } msleep(20); } while (time_before(jiffies, timeout)); - pr_err("ca0132 DOWNLOAD FAILED!!! DSP IS NOT RUNNING.\n"); + codec_err(codec, "ca0132 failed to download DSP\n"); return false; } @@ -4375,7 +4375,7 @@ static bool ca0132_download_dsp_images(struct hda_codec *codec) dsp_os_image = (struct dsp_image_seg *)(fw_entry->data); if (dspload_image(codec, dsp_os_image, 0, 0, true, 0)) { - pr_err("ca0132 dspload_image failed.\n"); + codec_err(codec, "ca0132 DSP load image failed\n"); goto exit_download; } -- 2.6.2

1 0

Re: [alsa-devel] BAT: restructuring code
by Caleb Crome 26 Oct '15

26 Oct '15

On Fri, Oct 23, 2015 at 3:47 AM, Liam Girdwood <liam.r.girdwood(a)linux.intel.com> wrote: > Hi Caleb, > > I have no problem as long as we can still support Android (via tinyalsa) > and Chrome (via alsa-lib) and also tinycompress. You will need to > justify any changes you make in your commit message. > > Btw, probably best to also CC alsa-devel mailing list for these sort of > questions too as other folks doing BAT patches may also be interested. > > Fwiw, a structure like your proposing could also be used for SIMD based > optimisations too (if we ever need them). > > Liam > > On Thu, 2015-10-22 at 17:23 -0700, Caleb Crome wrote: >> Hi guys, >> since i've got several different tests to write, I'm basically >> rewriting a meaningful section of the code to make the >> init/generate/playout/analyze modular. >> >> To that end, I'm creating a struct like this: >> >> >> struct bat_ops { >> (void *)(*init)(int channels, int format, float sample_rate, float >> *frequencies) >> // generate_playout_data is called every period to, well, generate >> the data to be played. >> int (*generate_playout_data)(void *priv, int frames, void *buffer); >> // process_capture_data is called every period to do something >> with the data. >> int (*process_input_data)(void *priv, int frames, const void *buffer); >> // analyze is called at the end of the whole capture time. Can be >> used to analyze and report results. >> int (*analyze)(void *priv); >> void (*free)(**priv); >> }; >> >> Then, we can create a separate ops struct for each type of test, i.e. >> a generated sine wave, reading from a file, ramp test, etc. >> >> The alsa code is fantastically complex, so I'm not touching any of >> that. :-/ Just splitting out the generate, capture, and analysis to >> be modular. >> >> Let me know if you think this is going to be a problem. >> >> -Caleb > > In order to support the molecularity, I need the ability for each module (i.e. test type) to accept its own arguments. In order to accomplish this, I think it would be better to use argp instead of getopt_long. Is it okay if I switch it over? Will that break android? Basically, I need the general options like sample rate, channels and format to be in the first set of arguments, but then be able to call a second parser to manage the module's options, like sine frequency (for the sine based test), or impulse response length (for an impulse response test). Perhaps there's a way to do it with getopt_long, but it doesn't look too simple because getopt_long requires all the options to be already defined before parsing starts, whereas argp can bring in new parsers (from the ops struct previously described). Any thoughts? -Caleb

2 2

[alsa-devel] [GIT PULL] ASoC updates for v4.3
by Mark Brown 26 Oct '15

26 Oct '15

The following changes since commit 32b88194f71d6ae7768a29f87fbba454728273ee: Linux 4.3-rc7 (2015-10-25 10:39:47 +0900) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v4.3-rc6 for you to fetch changes up to bb9a13a0209c56cdf27d125a1f2f6f34378c64f4: Merge remote-tracking branches 'asoc/topic/wm8904', 'asoc/topic/wm8955' and 'asoc/topic/wm8960' into asoc-next (2015-10-26 11:16:20 +0900) ---------------------------------------------------------------- ASoC: Updates for v4.4 Not much core work here, a few small tweaks to interfaces but mainly the changes here are driver ones. Highlights include: - Updates to the topology userspace interface - Big updates to the Renesas support from Morimoto-san - Most of the support for Intel Sky Lake systems. - New drivers for Asahi Kasei Microdevices AK4613, Allwinnner A10, Cirrus Logic WM8998, Dialog DA7219, Nuvoton NAU8825 and Rockchip S/PDIF. ---------------------------------------------------------------- Also a new driver for the Atmel Class D speaker drivers which I forgot in the tag message, sorry. Adam Thomson (11): ASoC: Add SOC_DOUBLE_R_EXT ASoC: codecs: Add da7219 codec driver ASoC: da7219: Add bindings documentation for DA7219 audio codec ASoC: da7219: Add entry to cover DA7219 bindings document ASoC: da7219: Improve error handling for regulator supplies ASoC: da7219: Use of_match_ptr() when assigning match table ASoC: da7219: Improve error checking of mclk enable/disable ASoC: da7213: Add DT support to codec driver ASoC: da7213: Add support to handle mclk data provided to driver ASoC: da7213: Add bindings documentation for codec driver ASoC: da7213: Correct units description of dmic-clkrate Anatol Pomozov (2): ASoC: nau8825: Add driver for headset chip Nuvoton 8825 ASoC: Document DAI signal polarity Andy Shevchenko (1): ASoC: Intel: use dw_dmac autoconfiguration Axel Lin (20): ASoC: mediatek: Convert to devm_snd_soc_register_card ASoC: au1x: Convert to devm_snd_soc_register_card ASoC: blackfin: Convert to devm_snd_soc_register_card ASoC: mxs-sgtl5000: Convert to devm_snd_soc_register_card ASoC: pxa: Convert to devm_snd_soc_register_card ASoC: sh: siu_dai: Convert to use resource managed APIs ASoC: intel: broadwell: Convert to devm_snd_soc_register_card ASoC: SPEAr: Make SND_SPEAR_SOC select SND_SOC_GENERIC_DMAENGINE_PCM ASoC: rockchip: Fix missing CLKDEV_LOOKUP dependency ASoC: rl6347a: Clean up unneeded inclusion of header files ASoC: ad193x-spi: Fixup ad193x_spi_id table ASoC: rt286: Fix run time error while modifying const data ASoC: rt298: Make rt298_index_def const ASoC: rockchip: spdif: Convert to use devm_snd_dmaengine_pcm_register ASoC: ad193x-spi: Add adau1328 to ad193x_spi_id table ASoC: ad193x: Drop .volatile_reg implementation ASoC: ssm2518: Drop .volatile_reg implementation ASoC: da7219: Fix da7219->alc_en state when enabling ALC ASoC: Intel: Skylake: Convert to devm_snd_soc_register_card ASoC: rt5645: Sort the order for register bit defines Bard Liao (1): ASoC: rt298: set register non-volatile by default Ben Zhang (3): ASoC: rt5645: Allow 4 channel recording on AIF1 ASoC: nau8825: Add FLL configuration ASoC: nau8825: Show device properties Charles Keepax (4): ASoC: arizona: Add default cases for event switches ASoC: arizona: Add utility function to check if an input is analog ASoC: Add SOC_SINGLE_RANGE_EXT_TLV macro ASoC: wm5110: Add additional analogue input enable for early revs Cyrille Pitchen (1): ASoC: ad193x: add support to ad1934 Dan Carpenter (7): ASoC: wm8904: harmless underflow in wm8904_put_deemph() ASoC: wm8731: harmless underflow in wm8731_put_deemph() ASoC: wm8960: harmless underflow in wm8960_put_deemph() ASoC: wm8903: harmless underflow in wm8903_put_deemph() ASoC: wm8955: harmless underflow in wm8955_put_deemph() ASoC: es8328: harmless underflow in es8328_put_deemph() ASoC: wm2000: a couple harmless underflows Dan Williams (1): ASoC: Intel: switch from ioremap_cache to memremap Daniel Mack (1): ASoC: pxa: pxa-pcm-lib: switch over to snd-soc-dmaengine-pcm Emilio López (1): ASoC: sunxi: add support for the on-chip codec on early Allwinner SoCs Fang, Yang A (1): ASoC: nau8825: add acpi match ID Geert Uytterhoeven (1): ASoC: rsnd: Remove obsolete platform data support Jarkko Nikula (1): spi: atmel: Remove needless bits_per_word and speed_hz tests Jeeja KP (19): ASoC: Intel: Skylake: Remove unused CPU dais ASoC: Intel: Skylake: Add pipe and modules handlers ASoC: Intel: Skylake: Add module configuration helpers ASoC: Intel: Skylake: Initialize and load DSP controls ASoC: Intel: Skylake: Add DSP support and enable it ASoC: Intel: Skylake: Initialize NHLT table ASoC: Intel: Skylake: Check CPA bit in DSP core power down ASoC: Intel: Skylake: Verify the status bit before handling interrupt ASoC: Intel: Skylake: Correct the runtime handler behaviour ASoC: Intel: Skylake: power down all link in suspend ASoC: dapm: Add kcontrol support for PGAs ASoC: dapm: Add startup & shutdown for dai_links ASoC: Intel: Skylake: Fix return for pm_runtime_get_sync() ASoC: Intel: Skylake: Remove BE copier blob memcpy ASoC: Intel: Skylake: Update for ssp node index in copier cfg ASoC: Intel: Skylake: Add support to disable module notifications ASoC: Intel: Skylake: Fix to check return value of dsp init ASoC: Intel: Skylake: Fix to set Non gateway copier cfg ASoC: Intel: Skylake: Add support to topology for module static pin Jie Yang (2): ASoC: compress: add config item for soc-compress to make it compiled only when needed ASoC: Intel: sst: only use sst-firmware when DW DMAC is available John Lin (3): ASoC: rt5645: Add dmi for Broadwell ASoC: rt5645: Add jd_invert for Broadwell ASoC: rt5645: Add dmi "Google Reks" for chrome Julia Lawall (1): ASoC: qcom: change PTR_ERR argument Jyri Sarha (6): ASoC: tlv320aic3x: Improve tdm support ASoC: davinci-mcasp: Add set_tdm_slots() support ASoC: simple-card: Add tdm slot mask support to simple-card ASoC: soc-core: Fix sparse warning in be32_to_cpup() call ASoC: davinci-mcasp: Get rid of bclk_lrclk_ratio in private data ASoC: hdmi: Remove obsolete dummy HDMI codec Kuninori Morimoto (31): ASoC: ak4642: use *dev on ak4642_i2c_probe() ASoC: ak4642: enable to use MCKO as fixed rate output pin on DT ASoC: rsnd: tidyup rsnd_dma_to_xxx() position ASoC: rsnd: rename rsnd_src_pcm_new() to rsnd_src_pcm_new_gen2() ASoC: rsnd: remove unneeded sh_clk header ASoC: rsnd: add missing #sound-dai-cells explain on Document ASoC: rsnd: Add Gen3 initial support ASoC: rsnd: add rsnd_mod_get() macro and use it ASoC: rsnd: ADG uses mod base common method ASoC: rsnd: add common mod confirm method ASoC: rsnd: ADG initial setup on rsnd_adg_ssi_clk_init() ASoC: rsnd: tidyup ADG clock calculate method ASoC: rsnd: tidyup ADG debug message for clock selection ASoC: rsnd: adg: ignore undefined clock error ASoC: rsnd: add AUDIO_CLKOUT support ASoC: rsnd: SND_SOC_RCAR depends on COMMON_CLK ASoC: ak4642: exchange macro name to avoid redefinition ASoC: rsnd: fixup clkout_name[] index error for single AUDIO_CLKOUT SoC ASoC: add ak4613 support ASoC: ak4613: add Digital Playback Volume support ASoC: rsnd: Announce for removing Gen1 SRU support ASoC: rsnd: Gen1 probe is not error ASoC: rsnd: fixup print debug message after read ASoC: rsnd: fixup struct rsnd_gen::res array size ASoC: rsnd: fixup devm_request_irq() option on ssi.c ASoC: rsnd: fixup rsnd_mod_call() behavior for debug ASoC: rsnd: fixup rsnd_dai_call() behavior for unimplemented method ASoC: rsnd: fixup rsnd_dai_call() behavior for .stop/.quit ASoC: rsnd: rename rsnd_mod_hw_start/stop to rsnd_mod_power_on/off ASoC: rsnd: remove unused rsnd_dma_to_ssi() macro ASoC: rsnd: remove duplicate parameter from rsnd_ssi_xxx() Lars-Peter Clausen (4): ASoC: Let snd_soc_limit_volume() take a snd_soc_card ASoC: h1940_uda1380: Constify rate constraints ASoC: rx1950_uda1380: Constify rate constraints ASoC: fsl_sai: Constify rate constraints Luis de Bethencourt (8): ASoC: atmel_wm8904: Fix module autoload for OF platform driver ASoC: fsl-asoc-card: Fix module autoload for OF platform driver ASoC: fsl_sai: Fix module autoload for OF platform driver ASoC: jz4740: Fix module autoload for OF platform driver ASoC: kirkwood: Fix module autoload for OF platform driver ASoC: pxa: Fix module autoload for OF platform drivers ASoC: mop500: Fix module autoload for OF platform driver ASoC: ux500: Fix module autoload for OF platform driver Maciej S. Szmigiero (1): ASoC: fsl-asoc-card: add AC'97 support Mark Brown (27): Merge branch 'fix/rt5645' of git://git.kernel.org/.../broonie/sound into asoc-rt5645 Merge remote-tracking branch 'asoc/topic/rt5645' into asoc-next Merge remote-tracking branches 'asoc/topic/ak4613', 'asoc/topic/ak4642', 'asoc/topic/arizona', 'asoc/topic/atmel' and 'asoc/topic/au1x' into asoc-next Merge remote-tracking branches 'asoc/topic/blackfin', 'asoc/topic/davinci', 'asoc/topic/fsl', 'asoc/topic/hdmi' and 'asoc/topic/intel' into asoc-next Merge remote-tracking branches 'asoc/topic/jz4740', 'asoc/topic/kirkwood', 'asoc/topic/mtk', 'asoc/topic/multi' and 'asoc/topic/mxs' into asoc-next Merge remote-tracking branches 'asoc/topic/pxa', 'asoc/topic/qcom', 'asoc/topic/rcar' and 'asoc/topic/rockchip' into asoc-next Merge remote-tracking branches 'asoc/topic/sh', 'asoc/topic/simple', 'asoc/topic/spear', 'asoc/topic/sunxi' and 'asoc/topic/tlv320aic3x' into asoc-next Merge remote-tracking branch 'asoc/topic/ux500' into asoc-next Merge tag 'asoc-fix-v4.3-rc2' into asoc-pxa Merge branch 'fix/rt298' of git://git.kernel.org/.../broonie/sound into asoc-rt298 Merge branch 'topic/fsl-mega-fast' of git://git.kernel.org/.../broonie/sound into asoc-fsl Merge tag 'asoc-v4.3-rc2' into asoc-next Merge remote-tracking branch 'asoc/topic/core' into asoc-next Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next Merge remote-tracking branch 'asoc/topic/doc' into asoc-next Merge remote-tracking branch 'asoc/topic/rt5645' into asoc-next Merge remote-tracking branches 'asoc/topic/ad193x' and 'asoc/topic/arizona' into asoc-next Merge remote-tracking branches 'asoc/topic/atmel-classd' and 'asoc/topic/da7213' into asoc-next Merge remote-tracking branch 'asoc/topic/da7219' into asoc-next Merge remote-tracking branches 'asoc/topic/dwc', 'asoc/topic/es8328', 'asoc/topic/fsl' and 'asoc/topic/fsl-card' into asoc-next Merge remote-tracking branches 'asoc/topic/imx' and 'asoc/topic/intel' into asoc-next Merge remote-tracking branches 'asoc/topic/nau8825' and 'asoc/topic/pxa' into asoc-next Merge remote-tracking branches 'asoc/topic/rcar', 'asoc/topic/rl6347a', 'asoc/topic/rockchip' and 'asoc/topic/rt286' into asoc-next Merge remote-tracking branches 'asoc/topic/rt298', 'asoc/topic/rt5640', 'asoc/topic/samsung' and 'asoc/topic/sh' into asoc-next Merge remote-tracking branches 'asoc/topic/ssm2518' and 'asoc/topic/sunxi' into asoc-next Merge remote-tracking branches 'asoc/topic/topology', 'asoc/topic/wm2000', 'asoc/topic/wm8731' and 'asoc/topic/wm8903' into asoc-next Merge remote-tracking branches 'asoc/topic/wm8904', 'asoc/topic/wm8955' and 'asoc/topic/wm8960' into asoc-next Maruthi Srinivas Bayyavarapu (2): ASoC: dwc: support dw i2s in slave mode ASoC: dwc: add check for master/slave format Masanari Iida (1): ASoC: sh: Fit typo in Kconfig Maxime Ripard (4): ASoC: sunxi: Add the Allwinner A10 codec bindings ASoC: sun4i-codec: pass through clk_set_rate error ASoC: sun4i-codec: Remove redundant SND_PCM_RATE_KNOT ASoC: sun4i-codec: Remove the routing property Mengdong Lin (2): ASoC: topology: ABI - Change stream formats to a bitwise flag ASoC: topology: ABI - Remove tdm_slot & dai_fmt from snd_soc_tplg_stream Mythri P K (1): ASoC: dapm: Add snd_soc_dapm_kcontrol_widget() Nicolin Chen (1): ASoC: fsl: Use #ifdef instead of #if for CONFIG_PM_SLEEP Oder Chiou (7): ASoC: rt5645: Remove the repeated definitions ASoC: rt5645: Add the control of ClassD modulator Speaker Gain Ratio ASoC: rt5645: Prevent the weird sound of the headphone while rebooting ASoC: rt5645: Recheck the jack detect status after resuming from S3 ASoC: rt5640: Revise the input pin name of IN1 and IN2 in document of the devicetree ASoC: rt5640: Fill up the IN3's support ASoC: rt5645: Add the HWEQ for the speaker output Omair M Abdullah (1): ASoC: Intel: Skylake - Add Skylake RT286 I2S machine driver Ricard Wanderlof (1): ASoC: Handle multiple codecs with split playback / capture Richard Fitzgerald (2): ASoC: arizona: add defines for single-input gain control ASoC: wm8998: Initial WM8998 codec driver Sjoerd Simons (4): ASoC: rockchip: namespace rockchip i2s module name ASoC: dt-bindings: add rockchip tranceiver bindings ASoC: rockchip: Add rockchip SPDIF transceiver driver ASoC: rockchip: Drop unneeded properties rockchip i2s/spdif bindings Songjun Wu (2): ASoC: atmel-classd: add the Audio Class D Amplifier ASoC: atmel-classd: DT binding for Class D audio amplifier driver Subhransu S. Prusty (2): ASoC: Intel: Skylake: Fix to use correct macros for the path iteration ASoC: Intel: Skylake: Fix to fill all sink/source pipe params Sudip Mukherjee (2): ASoC: Intel: remove unused function ASoC: rt5645: fix build warning Sugar Zhang (3): ASoC: rockchip: i2s: add 8 channels capture support ASoC: rockchip: add capture property ASoC: rockchip: i2s: share tx/rx lrck when symmetric_rates enabled Vedang Patel (6): ASoC: topology: ABI - Add PCM Support and bump ABI version to 4 ASoC: topology: ABI - Remove unused struct snd_soc_tplg_stream_config ASoC: topology: ABI - Use __le32 instead of __u32 in snd_soc_tplg_dapm_widget ASoC: topology: ABI - Add name element to snd_soc_tplg_stream ASoC: topology: ABI - Add the type for BE DAI link ASoC: topology: ABI - Add configuration for BE & Codec-Codec DAI Links Vinod Koul (4): ASoC: Intel: Skylake: add DSP platform widget event handlers ASoC: Intel: Skylake: Add FE and BE hw_params handling ASoC: Intel: Skylake: Add topology core init and handlers ASoC: Intel: Skylake: Modify the log level Zidan Wang (5): ASoC: imx-spdif: add snd_soc_pm_ops for spdif machine driver ASoC: fsl_sai: Add driver suspend and resume to support MEGA Fast ASoC: fsl_spdif: Add driver suspend and resume to support MEGA Fast ASoC: fsl_ssi: Add driver suspend and resume to support MEGA Fast ASoC: fsl_esai: Add driver suspend and resume to support MEGA Fast kbuild test robot (2): ASoC: sunxi: fix platform_no_drv_owner.cocci warnings ASoC: nau8825: fix platform_no_drv_owner.cocci warnings Documentation/devicetree/bindings/sound/ak4613.txt | 17 + Documentation/devicetree/bindings/sound/ak4642.txt | 22 +- .../devicetree/bindings/sound/atmel-classd.txt | 52 + Documentation/devicetree/bindings/sound/da7213.txt | 41 + Documentation/devicetree/bindings/sound/da7219.txt | 106 ++ .../devicetree/bindings/sound/fsl-asoc-card.txt | 10 +- .../devicetree/bindings/sound/nau8825.txt | 102 + .../devicetree/bindings/sound/renesas,rsnd.txt | 7 + .../devicetree/bindings/sound/rockchip-i2s.txt | 6 +- .../devicetree/bindings/sound/rockchip-spdif.txt | 40 + Documentation/devicetree/bindings/sound/rt5640.txt | 9 +- .../devicetree/bindings/sound/sun4i-codec.txt | 27 + .../devicetree/bindings/sound/tdm-slot.txt | 11 +- MAINTAINERS | 1 + drivers/spi/spi-atmel.c | 21 +- include/sound/da7213.h | 3 - include/sound/da7219-aad.h | 99 + include/sound/da7219.h | 55 + include/sound/designware_i2s.h | 2 + include/sound/pxa2xx-lib.h | 1 - include/sound/rt5640.h | 3 +- include/sound/rt5645.h | 2 + include/sound/simple_card.h | 2 + include/sound/soc-dai.h | 19 +- include/sound/soc-dapm.h | 3 + include/sound/soc.h | 27 +- include/uapi/sound/asoc.h | 76 +- sound/arm/pxa2xx-ac97.c | 13 +- sound/arm/pxa2xx-pcm-lib.c | 201 +- sound/arm/pxa2xx-pcm.c | 12 +- sound/arm/pxa2xx-pcm.h | 2 - sound/soc/Kconfig | 6 +- sound/soc/Makefile | 4 +- sound/soc/atmel/Kconfig | 9 + sound/soc/atmel/Makefile | 2 + sound/soc/atmel/atmel-classd.c | 679 +++++++ sound/soc/atmel/atmel-classd.h | 120 ++ sound/soc/atmel/atmel_wm8904.c | 1 + sound/soc/au1x/db1000.c | 10 +- sound/soc/au1x/db1200.c | 10 +- sound/soc/blackfin/bf5xx-ad1836.c | 11 +- sound/soc/blackfin/bfin-eval-adau1373.c | 12 +- sound/soc/blackfin/bfin-eval-adau1701.c | 12 +- sound/soc/blackfin/bfin-eval-adav80x.c | 12 +- sound/soc/codecs/Kconfig | 23 +- sound/soc/codecs/Makefile | 10 +- sound/soc/codecs/ad193x-i2c.c | 8 +- sound/soc/codecs/ad193x-spi.c | 16 +- sound/soc/codecs/ad193x.c | 128 +- sound/soc/codecs/ad193x.h | 9 +- sound/soc/codecs/ak4613.c | 497 +++++ sound/soc/codecs/ak4642.c | 153 +- sound/soc/codecs/arizona.c | 49 + sound/soc/codecs/arizona.h | 14 +- sound/soc/codecs/da7213.c | 190 +- sound/soc/codecs/da7213.h | 8 +- sound/soc/codecs/da7219-aad.c | 823 ++++++++ sound/soc/codecs/da7219-aad.h | 212 +++ sound/soc/codecs/da7219.c | 1955 ++++++++++++++++++++ sound/soc/codecs/da7219.h | 820 ++++++++ sound/soc/codecs/es8328.c | 2 +- sound/soc/codecs/hdmi.c | 109 -- sound/soc/codecs/nau8825.c | 1309 +++++++++++++ sound/soc/codecs/nau8825.h | 341 ++++ sound/soc/codecs/rl6347a.c | 19 +- sound/soc/codecs/rl6347a.h | 2 + sound/soc/codecs/rt286.c | 9 +- sound/soc/codecs/rt298.c | 11 +- sound/soc/codecs/rt5640.c | 22 +- sound/soc/codecs/rt5645.c | 172 +- sound/soc/codecs/rt5645.h | 30 +- sound/soc/codecs/ssm2518.c | 6 - sound/soc/codecs/tlv320aic3x.c | 30 +- sound/soc/codecs/wm2000.c | 4 +- sound/soc/codecs/wm5110.c | 187 +- sound/soc/codecs/wm8731.c | 2 +- sound/soc/codecs/wm8903.c | 2 +- sound/soc/codecs/wm8904.c | 2 +- sound/soc/codecs/wm8955.c | 2 +- sound/soc/codecs/wm8960.c | 2 +- sound/soc/codecs/wm8998.c | 1430 ++++++++++++++ sound/soc/codecs/wm8998.h | 23 + sound/soc/davinci/davinci-mcasp.c | 305 +-- sound/soc/dwc/designware_i2s.c | 123 +- sound/soc/fsl/fsl-asoc-card.c | 141 +- sound/soc/fsl/fsl_esai.c | 88 + sound/soc/fsl/fsl_sai.c | 38 +- sound/soc/fsl/fsl_spdif.c | 73 + sound/soc/fsl/fsl_ssi.c | 102 + sound/soc/fsl/imx-spdif.c | 1 + sound/soc/generic/simple-card.c | 8 +- sound/soc/intel/Kconfig | 15 + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 19 +- sound/soc/intel/boards/Makefile | 2 + sound/soc/intel/boards/broadwell.c | 9 +- sound/soc/intel/boards/skl_rt286.c | 259 +++ sound/soc/intel/common/Makefile | 6 +- sound/soc/intel/common/sst-dsp-priv.h | 1 + sound/soc/intel/common/sst-dsp.c | 2 + sound/soc/intel/common/sst-dsp.h | 2 + sound/soc/intel/common/sst-firmware.c | 10 +- sound/soc/intel/skylake/Makefile | 3 +- sound/soc/intel/skylake/skl-messages.c | 44 +- sound/soc/intel/skylake/skl-nhlt.c | 10 +- sound/soc/intel/skylake/skl-pcm.c | 176 +- sound/soc/intel/skylake/skl-sst-dsp.c | 7 +- sound/soc/intel/skylake/skl-sst-ipc.c | 12 + sound/soc/intel/skylake/skl-sst-ipc.h | 1 + sound/soc/intel/skylake/skl-sst.c | 56 +- sound/soc/intel/skylake/skl-topology.c | 1252 +++++++++++++ sound/soc/intel/skylake/skl-topology.h | 36 +- sound/soc/intel/skylake/skl-tplg-interface.h | 83 + sound/soc/intel/skylake/skl.c | 32 +- sound/soc/intel/skylake/skl.h | 17 +- sound/soc/jz4740/jz4740-i2s.c | 1 + sound/soc/kirkwood/armada-370-db.c | 1 + sound/soc/mediatek/mt8173-max98090.c | 11 +- sound/soc/mediatek/mt8173-rt5650-rt5676.c | 11 +- sound/soc/mxs/mxs-sgtl5000.c | 6 +- sound/soc/omap/rx51.c | 2 +- sound/soc/pxa/brownstone.c | 9 +- sound/soc/pxa/corgi.c | 11 +- sound/soc/pxa/e740_wm9705.c | 5 +- sound/soc/pxa/e750_wm9705.c | 5 +- sound/soc/pxa/e800_wm9712.c | 5 +- sound/soc/pxa/hx4700.c | 4 +- sound/soc/pxa/imote2.c | 11 +- sound/soc/pxa/mioa701_wm9713.c | 11 +- sound/soc/pxa/palm27x.c | 9 +- sound/soc/pxa/poodle.c | 11 +- sound/soc/pxa/pxa-ssp.c | 1 + sound/soc/pxa/pxa2xx-ac97.c | 49 +- sound/soc/pxa/pxa2xx-i2s.c | 3 + sound/soc/pxa/pxa2xx-pcm.c | 33 +- sound/soc/pxa/spitz.c | 5 +- sound/soc/pxa/tosa.c | 5 +- sound/soc/pxa/ttc-dkb.c | 12 +- sound/soc/qcom/lpass-cpu.c | 3 +- sound/soc/rockchip/Kconfig | 12 +- sound/soc/rockchip/Makefile | 6 +- sound/soc/rockchip/rockchip_i2s.c | 48 +- sound/soc/rockchip/rockchip_i2s.h | 16 + sound/soc/rockchip/rockchip_spdif.c | 405 ++++ sound/soc/rockchip/rockchip_spdif.h | 63 + sound/soc/samsung/h1940_uda1380.c | 5 +- sound/soc/samsung/rx1950_uda1380.c | 5 +- sound/soc/sh/Kconfig | 3 +- sound/soc/sh/rcar/adg.c | 306 ++- sound/soc/sh/rcar/core.c | 66 +- sound/soc/sh/rcar/ctu.c | 16 +- sound/soc/sh/rcar/dma.c | 2 +- sound/soc/sh/rcar/dvc.c | 16 +- sound/soc/sh/rcar/gen.c | 14 +- sound/soc/sh/rcar/mix.c | 16 +- {include/sound => sound/soc/sh/rcar}/rcar_snd.h | 1 - sound/soc/sh/rcar/rsnd.h | 29 +- sound/soc/sh/rcar/src.c | 27 +- sound/soc/sh/rcar/ssi.c | 113 +- sound/soc/sh/siu_dai.c | 85 +- sound/soc/soc-compress.c | 12 +- sound/soc/soc-core.c | 29 +- sound/soc/soc-dapm.c | 59 +- sound/soc/soc-ops.c | 8 +- sound/soc/soc-pcm.c | 49 + sound/soc/soc-topology.c | 4 +- sound/soc/sunxi/Kconfig | 11 + sound/soc/sunxi/Makefile | 2 + sound/soc/sunxi/sun4i-codec.c | 712 +++++++ sound/soc/ux500/mop500.c | 1 + sound/soc/ux500/ux500_msp_dai.c | 1 + 170 files changed, 14388 insertions(+), 1422 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/ak4613.txt create mode 100644 Documentation/devicetree/bindings/sound/atmel-classd.txt create mode 100644 Documentation/devicetree/bindings/sound/da7213.txt create mode 100644 Documentation/devicetree/bindings/sound/da7219.txt create mode 100644 Documentation/devicetree/bindings/sound/nau8825.txt create mode 100644 Documentation/devicetree/bindings/sound/rockchip-spdif.txt create mode 100644 Documentation/devicetree/bindings/sound/sun4i-codec.txt create mode 100644 include/sound/da7219-aad.h create mode 100644 include/sound/da7219.h create mode 100644 sound/soc/atmel/atmel-classd.c create mode 100644 sound/soc/atmel/atmel-classd.h create mode 100644 sound/soc/codecs/ak4613.c create mode 100644 sound/soc/codecs/da7219-aad.c create mode 100644 sound/soc/codecs/da7219-aad.h create mode 100644 sound/soc/codecs/da7219.c create mode 100644 sound/soc/codecs/da7219.h delete mode 100644 sound/soc/codecs/hdmi.c create mode 100644 sound/soc/codecs/nau8825.c create mode 100644 sound/soc/codecs/nau8825.h create mode 100644 sound/soc/codecs/wm8998.c create mode 100644 sound/soc/codecs/wm8998.h create mode 100644 sound/soc/intel/boards/skl_rt286.c create mode 100644 sound/soc/intel/skylake/skl-topology.c create mode 100644 sound/soc/rockchip/rockchip_spdif.c create mode 100644 sound/soc/rockchip/rockchip_spdif.h rename {include/sound => sound/soc/sh/rcar}/rcar_snd.h (98%) create mode 100644 sound/soc/sunxi/Kconfig create mode 100644 sound/soc/sunxi/Makefile create mode 100644 sound/soc/sunxi/sun4i-codec.c

2 1

Re: [alsa-devel] Delay issue in ALSA in connecting GSM call
by Srinivasan S 26 Oct '15

26 Oct '15

Dear Clemens, Am awaiting, Could you please provide your valuable guidance or inputs w.r.t the below issue Kindly do the needful as early as possible Many Thanks in advance ________________________________ From: Srinivasan S Sent: Friday, October 23, 2015 2:40 PM To: Clemens Ladisch Cc: alsa-devel(a)alsa-project.org; linux-audio-dev(a)lists.linuxaudio.org Subject: Delay issue in ALSA in connecting GSM call Dear Clemens, I am using the above ALSA application to connect GSM two way call, I see that there seems to be a delay of 3 seconds, when GSM call is made, that ie., it takes 3 seconds to hear on the speaker of our custom board when ever we talk from GSM & the delay is same when ever we talk from board MIC to speaker of GSM But I tried to do loopback using the below command instead of using the above attached ALSA application, but still the delay issue persists arecord -D VINL8 -f S16_LE | aplay -D VOUTR8 Could you please let me know how this delay issue can be resolved, Could you please provide any inputs or guidance w.r.t this issue Any help would be greatly appreciated Kindly do the needful as early as possible Many Thanks in advance

1 0

[alsa-devel] [PATCH] BAT: Change maximum number of channels from 2 to 64
by Caleb Crome 26 Oct '15

26 Oct '15

commit 23521f2e04df7ae39ccdbc7b4a9aa59220b56495 Author: Caleb Crome <ccrome(a)gmail.com> Date: Tue Oct 20 20:57:57 2015 +0000 Change maximum number of channels from 2 to 64. Added a round-robbin frequency assignment from the command line so that if you specify -F 100:200:250 on the command line, then all subsequent channels will get assigned frequencies like this first set. So by specifying -c 6 -F 100:200:250 the resulting frequencies for the 6 channels will be the same as if you specified -c 6 -F 100:200:250:100:200:250 diff --git a/bat/bat.c b/bat/bat.c index 56cfaf6..57c9db8 100644 --- a/bat/bat.c +++ b/bat/bat.c @@ -72,16 +72,31 @@ err_exit: static void get_sine_frequencies(struct bat *bat, char *freq) { - char *tmp1; - - tmp1 = strchr(freq, ':'); - if (tmp1 == NULL) { - bat->target_freq[1] = bat->target_freq[0] = atof(optarg); - } else { - *tmp1 = '\0'; - bat->target_freq[0] = atof(optarg); - bat->target_freq[1] = atof(tmp1 + 1); + char *tmp0, *tmp1; + int ncolons; + int nfreqs; + int i; + + ncolons = 0; + tmp1 = freq; + while ((tmp1 = strchr(tmp1, ':'))) { + tmp1++; + ncolons ++; } + nfreqs = ncolons+1; + + tmp0 = freq; + tmp1 = strchr(tmp0, ':'); + for (i = 0; i < MAX_CHANNELS && i < nfreqs; i++) { + if (i+1 < nfreqs) + *tmp1 = '\0'; + bat->target_freq[i] = atof(tmp0); + tmp0 = tmp1+1; + if (i+1 < nfreqs) + tmp1 = strchr(tmp0, ':'); + } + for (i = nfreqs; i < MAX_CHANNELS; i++) + bat->target_freq[i] = bat->target_freq[i % nfreqs]; } static void get_format(struct bat *bat, char *optarg) @@ -301,6 +316,7 @@ _("Usage: bat [-options]...\n" static void set_defaults(struct bat *bat) { + int i; memset(bat, 0, sizeof(struct bat)); /* Set default values */ @@ -312,8 +328,9 @@ static void set_defaults(struct bat *bat) bat->convert_float_to_sample = convert_float_to_int16; bat->convert_sample_to_double = convert_int16_to_double; bat->frames = bat->rate * 2; - bat->target_freq[0] = 997.0; - bat->target_freq[1] = 997.0; + for (i = 0; i < MAX_CHANNELS; i++) { + bat->target_freq[i] = 997.0; + } bat->sigma_k = 3.0; bat->playback.device = NULL; bat->capture.device = NULL; diff --git a/bat/common.h b/bat/common.h index c04452d..6d5e46e 100644 --- a/bat/common.h +++ b/bat/common.h @@ -30,7 +30,7 @@ #define WAV_DATA COMPOSE('d', 'a', 't', 'a') #define WAV_FORMAT_PCM 1 /* PCM WAVE file encoding */ -#define MAX_CHANNELS 2 +#define MAX_CHANNELS 64 #define MIN_CHANNELS 1 #define MAX_PEAKS 10 #define MAX_FRAMES (10 * 1024 * 1024)

3 4

[alsa-devel] [PATCH] ASoC: fsl_sai: fix Rx synchrounous mode
by Stefan Agner 26 Oct '15

26 Oct '15

When using the Rx clock for both, transmitter and receiver, the transmitter needs to be set to synchronous with receiver. This reverts 855675f6e6a6 ("ASoC: fsl_sai: Set SYNC bit of TCR2 to Asynchronous Mode"), which, judiging from the commit log, seems to mixed up between the two synchronous modes: The boolean sai->synchronous[TX] is indicating wheather the SAI should work in Rx synchronous mode (sync Tx with Rx), hence if the value is true, the SYNC field of TCR2 needs to be set to 0x1 ("Synchronous with receiver"). Signed-off-by: Stefan Agner <stefan(a)agner.ch> --- Hi Nicolin, I got this reported from a customer, he tried to use the device tree property "fsl,sai-synchronous-rx" according to the description but it failed. In a quick test, setting the SYNC field of TCR2 to 0x1 helped in his case. So I think this here is right. But given that you chaged the very same line can you review that again and give me a Ack/Nack? -- Stefan sound/soc/fsl/fsl_sai.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c index a18fd92..1f0e552 100644 --- a/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c @@ -454,7 +454,8 @@ static int fsl_sai_trigger(struct snd_pcm_substream *substream, int cmd, * Rx sync with Tx clocks: Clear SYNC for Tx, set it for Rx. * Tx sync with Rx clocks: Clear SYNC for Rx, set it for Tx. */ - regmap_update_bits(sai->regmap, FSL_SAI_TCR2, FSL_SAI_CR2_SYNC, 0); + regmap_update_bits(sai->regmap, FSL_SAI_TCR2, FSL_SAI_CR2_SYNC, + sai->synchronous[TX] ? FSL_SAI_CR2_SYNC : 0); regmap_update_bits(sai->regmap, FSL_SAI_RCR2, FSL_SAI_CR2_SYNC, sai->synchronous[RX] ? FSL_SAI_CR2_SYNC : 0); -- 2.6.1

3 2

[alsa-devel] [PATCH] ASoC: rt5645: Sort the order for register bit defines
by Axel Lin 26 Oct '15

26 Oct '15

So we have consistent order for register bit defines. Signed-off-by: Axel Lin <axel.lin(a)ingics.com> --- sound/soc/codecs/rt5645.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sound/soc/codecs/rt5645.h b/sound/soc/codecs/rt5645.h index 13ac732..093e46d 100644 --- a/sound/soc/codecs/rt5645.h +++ b/sound/soc/codecs/rt5645.h @@ -621,14 +621,14 @@ #define RT5645_G_OM_L_SM_L_SFT 6 #define RT5645_M_BST1_L_SM_L (0x1 << 5) #define RT5645_M_BST1_L_SM_L_SFT 5 +#define RT5645_M_BST3_L_SM_L (0x1 << 4) +#define RT5645_M_BST3_L_SM_L_SFT 4 #define RT5645_M_IN_L_SM_L (0x1 << 3) #define RT5645_M_IN_L_SM_L_SFT 3 -#define RT5645_M_DAC_L1_SM_L (0x1 << 1) -#define RT5645_M_DAC_L1_SM_L_SFT 1 #define RT5645_M_DAC_L2_SM_L (0x1 << 2) #define RT5645_M_DAC_L2_SM_L_SFT 2 -#define RT5645_M_BST3_L_SM_L (0x1 << 4) -#define RT5645_M_BST3_L_SM_L_SFT 4 +#define RT5645_M_DAC_L1_SM_L (0x1 << 1) +#define RT5645_M_DAC_L1_SM_L_SFT 1 /* SPK Right Mixer Control (0x47) */ #define RT5645_G_RM_R_SM_R_MASK (0x3 << 14) @@ -643,14 +643,14 @@ #define RT5645_G_OM_R_SM_R_SFT 6 #define RT5645_M_BST2_R_SM_R (0x1 << 5) #define RT5645_M_BST2_R_SM_R_SFT 5 +#define RT5645_M_BST3_R_SM_R (0x1 << 4) +#define RT5645_M_BST3_R_SM_R_SFT 4 #define RT5645_M_IN_R_SM_R (0x1 << 3) #define RT5645_M_IN_R_SM_R_SFT 3 -#define RT5645_M_DAC_R1_SM_R (0x1 << 1) -#define RT5645_M_DAC_R1_SM_R_SFT 1 #define RT5645_M_DAC_R2_SM_R (0x1 << 2) #define RT5645_M_DAC_R2_SM_R_SFT 2 -#define RT5645_M_BST3_R_SM_R (0x1 << 4) -#define RT5645_M_BST3_R_SM_R_SFT 4 +#define RT5645_M_DAC_R1_SM_R (0x1 << 1) +#define RT5645_M_DAC_R1_SM_R_SFT 1 /* SPOLMIX Control (0x48) */ #define RT5645_M_DAC_L1_SPM_L (0x1 << 15) @@ -675,12 +675,12 @@ #define RT5645_SPK_G_CLSD_SFT 0 /* Mono Output Mixer Control (0x4c) */ +#define RT5645_G_MONOMIX_MASK (0x1 << 10) +#define RT5645_G_MONOMIX_SFT 10 #define RT5645_M_OV_L_MM (0x1 << 9) #define RT5645_M_OV_L_MM_SFT 9 #define RT5645_M_DAC_L2_MA (0x1 << 8) #define RT5645_M_DAC_L2_MA_SFT 8 -#define RT5645_G_MONOMIX_MASK (0x1 << 10) -#define RT5645_G_MONOMIX_SFT 10 #define RT5645_M_BST2_MM (0x1 << 4) #define RT5645_M_BST2_MM_SFT 4 #define RT5645_M_DAC_R1_MM (0x1 << 3) -- 2.1.4

2 1

[alsa-devel] [PATCH] ASoC: fsl: Use #ifdef instead of #if for CONFIG_PM_SLEEP
by Nicolin Chen 26 Oct '15

26 Oct '15

Change them to #ifdef as CONFIG_PM_SLEEP might not be defined at all. Reported-by: kbuild test robot <fengguang.wu(a)intel.com> Signed-off-by: Nicolin Chen <nicoleotsuka(a)gmail.com> --- sound/soc/fsl/fsl_esai.c | 2 +- sound/soc/fsl/fsl_sai.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c index aab675a..59f234e 100644 --- a/sound/soc/fsl/fsl_esai.c +++ b/sound/soc/fsl/fsl_esai.c @@ -900,7 +900,7 @@ static const struct of_device_id fsl_esai_dt_ids[] = { }; MODULE_DEVICE_TABLE(of, fsl_esai_dt_ids); -#if CONFIG_PM_SLEEP +#ifdef CONFIG_PM_SLEEP static int fsl_esai_suspend(struct device *dev) { struct fsl_esai *esai = dev_get_drvdata(dev); diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c index f652f2e..15173e9 100644 --- a/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c @@ -807,7 +807,7 @@ static const struct of_device_id fsl_sai_ids[] = { }; MODULE_DEVICE_TABLE(of, fsl_sai_ids); -#if CONFIG_PM_SLEEP +#ifdef CONFIG_PM_SLEEP static int fsl_sai_suspend(struct device *dev) { struct fsl_sai *sai = dev_get_drvdata(dev); -- 1.9.1

2 1

Re: [alsa-devel] [PATCH 0/2] Remove .owner from spi_drivers
by Jonathan Cameron 25 Oct '15

25 Oct '15

1 0

[alsa-devel] [PATCH] ASoC: wm9713: convert to regmap
by Robert Jarzmik 24 Oct '15

24 Oct '15

Convert the Wolfson WM9713 to regmap API. This will leverage all the regmap functions (debug, registers update, etc ...). As a bonus, this will pave the path to gpio chip introduction, and devicetree support. Signed-off-by: Robert Jarzmik <robert.jarzmik(a)free.fr> --- sound/soc/codecs/Kconfig | 1 + sound/soc/codecs/wm9713.c | 284 ++++++++++++++++++++++++---------------------- 2 files changed, 147 insertions(+), 138 deletions(-) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 0c9733ecd17f..ba306f8f3717 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -879,6 +879,7 @@ config SND_SOC_WM9712 config SND_SOC_WM9713 tristate + select REGMAP_AC97 # Amp config SND_SOC_LM4857 diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c index 4083a5130cbd..18f371b2add5 100644 --- a/sound/soc/codecs/wm9713.c +++ b/sound/soc/codecs/wm9713.c @@ -19,6 +19,7 @@ #include <linux/slab.h> #include <linux/module.h> #include <linux/device.h> +#include <linux/regmap.h> #include <sound/core.h> #include <sound/pcm.h> #include <sound/ac97_codec.h> @@ -39,34 +40,6 @@ struct wm9713_priv { struct mutex lock; }; -static unsigned int ac97_read(struct snd_soc_codec *codec, - unsigned int reg); -static int ac97_write(struct snd_soc_codec *codec, - unsigned int reg, unsigned int val); - -/* - * WM9713 register cache - * Reg 0x3c bit 15 is used by touch driver. - */ -static const u16 wm9713_reg[] = { - 0x6174, 0x8080, 0x8080, 0x8080, - 0xc880, 0xe808, 0xe808, 0x0808, - 0x00da, 0x8000, 0xd600, 0xaaa0, - 0xaaa0, 0xaaa0, 0x0000, 0x0000, - 0x0f0f, 0x0040, 0x0000, 0x7f00, - 0x0405, 0x0410, 0xbb80, 0xbb80, - 0x0000, 0xbb80, 0x0000, 0x4523, - 0x0000, 0x2000, 0x7eff, 0xffff, - 0x0000, 0x0000, 0x0080, 0x0000, - 0x0000, 0x0000, 0xfffe, 0xffff, - 0x0000, 0x0000, 0x0000, 0xfffe, - 0x4000, 0x0000, 0x0000, 0x0000, - 0xb032, 0x3e00, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0006, - 0x0001, 0x0000, 0x574d, 0x4c13, -}; - #define HPL_MIXER 0 #define HPR_MIXER 1 @@ -220,18 +193,15 @@ static int wm9713_voice_shutdown(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) { struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); - u16 status, rate; if (WARN_ON(event != SND_SOC_DAPM_PRE_PMD)) return -EINVAL; /* Gracefully shut down the voice interface. */ - status = ac97_read(codec, AC97_EXTENDED_MID) | 0x1000; - rate = ac97_read(codec, AC97_HANDSET_RATE) & 0xF0FF; - ac97_write(codec, AC97_HANDSET_RATE, rate | 0x0200); + snd_soc_update_bits(codec, AC97_HANDSET_RATE, 0x0f00, 0x0200); schedule_timeout_interruptible(msecs_to_jiffies(1)); - ac97_write(codec, AC97_HANDSET_RATE, rate | 0x0F00); - ac97_write(codec, AC97_EXTENDED_MID, status); + snd_soc_update_bits(codec, AC97_HANDSET_RATE, 0x0f00, 0x0f00); + snd_soc_update_bits(codec, AC97_EXTENDED_MID, 0x1000, 0x1000); return 0; } @@ -674,39 +644,97 @@ static const struct snd_soc_dapm_route wm9713_audio_map[] = { {"Capture Mono Mux", "Right", "Right Capture Source"}, }; -static unsigned int ac97_read(struct snd_soc_codec *codec, - unsigned int reg) +static bool wm9713_readable_reg(struct device *dev, unsigned int reg) { - struct wm9713_priv *wm9713 = snd_soc_codec_get_drvdata(codec); - u16 *cache = codec->reg_cache; - - if (reg == AC97_RESET || reg == AC97_GPIO_STATUS || - reg == AC97_VENDOR_ID1 || reg == AC97_VENDOR_ID2 || - reg == AC97_CD) - return soc_ac97_ops->read(wm9713->ac97, reg); - else { - reg = reg >> 1; - - if (reg >= (ARRAY_SIZE(wm9713_reg))) - return -EIO; - - return cache[reg]; + switch (reg) { + case AC97_RESET ... AC97_PCM_SURR_DAC_RATE: + case AC97_PCM_LR_ADC_RATE: + case AC97_CENTER_LFE_MASTER: + case AC97_SPDIF ... AC97_LINE1_LEVEL: + case AC97_GPIO_CFG ... 0x5c: + case AC97_CODEC_CLASS_REV ... AC97_PCI_SID: + case 0x74 ... AC97_VENDOR_ID2: + return true; + default: + return false; } } -static int ac97_write(struct snd_soc_codec *codec, unsigned int reg, - unsigned int val) +static bool wm9713_writeable_reg(struct device *dev, unsigned int reg) { - struct wm9713_priv *wm9713 = snd_soc_codec_get_drvdata(codec); + switch (reg) { + case AC97_VENDOR_ID1: + case AC97_VENDOR_ID2: + return false; + default: + return wm9713_readable_reg(dev, reg); + } +} - u16 *cache = codec->reg_cache; - soc_ac97_ops->write(wm9713->ac97, reg, val); - reg = reg >> 1; - if (reg < (ARRAY_SIZE(wm9713_reg))) - cache[reg] = val; +static const struct reg_default wm9713_reg_defaults[] = { + { 0x02, 0x8080 }, /* Speaker Output Volume */ + { 0x04, 0x8080 }, /* Headphone Output Volume */ + { 0x06, 0x8080 }, /* Out3/OUT4 Volume */ + { 0x08, 0xc880 }, /* Mono Volume */ + { 0x0a, 0xe808 }, /* LINEIN Volume */ + { 0x0c, 0xe808 }, /* DAC PGA Volume */ + { 0x0e, 0x0808 }, /* MIC PGA Volume */ + { 0x10, 0x00da }, /* MIC Routing Control */ + { 0x12, 0x8000 }, /* Record PGA Volume */ + { 0x14, 0xd600 }, /* Record Routing */ + { 0x16, 0xaaa0 }, /* PCBEEP Volume */ + { 0x18, 0xaaa0 }, /* VxDAC Volume */ + { 0x1a, 0xaaa0 }, /* AUXDAC Volume */ + { 0x1c, 0x0000 }, /* Output PGA Mux */ + { 0x1e, 0x0000 }, /* DAC 3D control */ + { 0x20, 0x0f0f }, /* DAC Tone Control*/ + { 0x22, 0x0040 }, /* MIC Input Select & Bias */ + { 0x24, 0x0000 }, /* Output Volume Mapping & Jack */ + { 0x26, 0x7f00 }, /* Powerdown Ctrl/Stat*/ + { 0x28, 0x0405 }, /* Extended Audio ID */ + { 0x2a, 0x0410 }, /* Extended Audio Start/Ctrl */ + { 0x2c, 0xbb80 }, /* Audio DACs Sample Rate */ + { 0x2e, 0xbb80 }, /* AUXDAC Sample Rate */ + { 0x32, 0xbb80 }, /* Audio ADCs Sample Rate */ + { 0x36, 0x4523 }, /* PCM codec control */ + { 0x3a, 0x2000 }, /* SPDIF control */ + { 0x3c, 0xfdff }, /* Powerdown 1 */ + { 0x3e, 0xffff }, /* Powerdown 2 */ + { 0x40, 0x0000 }, /* General Purpose */ + { 0x42, 0x0000 }, /* Fast Power-Up Control */ + { 0x44, 0x0080 }, /* MCLK/PLL Control */ + { 0x46, 0x0000 }, /* MCLK/PLL Control */ + { 0x4c, 0xfffe }, /* GPIO Pin Configuration */ + { 0x4e, 0xffff }, /* GPIO Pin Polarity / Type */ + { 0x50, 0x0000 }, /* GPIO Pin Sticky */ + { 0x52, 0x0000 }, /* GPIO Pin Wake-Up */ + /* GPIO Pin Status */ + { 0x56, 0xfffe }, /* GPIO Pin Sharing */ + { 0x58, 0x4000 }, /* GPIO PullUp/PullDown */ + { 0x5a, 0x0000 }, /* Additional Functions 1 */ + { 0x5c, 0x0000 }, /* Additional Functions 2 */ + { 0x60, 0xb032 }, /* ALC Control */ + { 0x62, 0x3e00 }, /* ALC / Noise Gate Control */ + { 0x64, 0x0000 }, /* AUXDAC input control */ + { 0x74, 0x0000 }, /* Digitiser Reg 1 */ + { 0x76, 0x0006 }, /* Digitiser Reg 2 */ + { 0x78, 0x0001 }, /* Digitiser Reg 3 */ + { 0x7a, 0x0000 }, /* Digitiser Read Back */ +}; - return 0; -} +static const struct regmap_config wm9713_regmap_config = { + .reg_bits = 16, + .reg_stride = 2, + .val_bits = 16, + .max_register = 0x7e, + .cache_type = REGCACHE_RBTREE, + + .reg_defaults = wm9713_reg_defaults, + .num_reg_defaults = ARRAY_SIZE(wm9713_reg_defaults), + .volatile_reg = regmap_ac97_default_volatile, + .readable_reg = wm9713_readable_reg, + .writeable_reg = wm9713_writeable_reg, +}; /* PLL divisors */ struct _pll_div { @@ -793,10 +821,8 @@ static int wm9713_set_pll(struct snd_soc_codec *codec, /* turn PLL off ? */ if (freq_in == 0) { /* disable PLL power and select ext source */ - reg = ac97_read(codec, AC97_HANDSET_RATE); - ac97_write(codec, AC97_HANDSET_RATE, reg | 0x0080); - reg = ac97_read(codec, AC97_EXTENDED_MID); - ac97_write(codec, AC97_EXTENDED_MID, reg | 0x0200); + snd_soc_update_bits(codec, AC97_HANDSET_RATE, 0x0080, 0x0080); + snd_soc_update_bits(codec, AC97_EXTENDED_MID, 0x0200, 0x0200); wm9713->pll_in = 0; return 0; } @@ -806,7 +832,7 @@ static int wm9713_set_pll(struct snd_soc_codec *codec, if (pll_div.k == 0) { reg = (pll_div.n << 12) | (pll_div.lf << 11) | (pll_div.divsel << 9) | (pll_div.divctl << 8); - ac97_write(codec, AC97_LINE1_LEVEL, reg); + snd_soc_write(codec, AC97_LINE1_LEVEL, reg); } else { /* write the fractional k to the reg 0x46 pages */ reg2 = (pll_div.n << 12) | (pll_div.lf << 11) | (1 << 10) | @@ -814,33 +840,31 @@ static int wm9713_set_pll(struct snd_soc_codec *codec, /* K [21:20] */ reg = reg2 | (0x5 << 4) | (pll_div.k >> 20); - ac97_write(codec, AC97_LINE1_LEVEL, reg); + snd_soc_write(codec, AC97_LINE1_LEVEL, reg); /* K [19:16] */ reg = reg2 | (0x4 << 4) | ((pll_div.k >> 16) & 0xf); - ac97_write(codec, AC97_LINE1_LEVEL, reg); + snd_soc_write(codec, AC97_LINE1_LEVEL, reg); /* K [15:12] */ reg = reg2 | (0x3 << 4) | ((pll_div.k >> 12) & 0xf); - ac97_write(codec, AC97_LINE1_LEVEL, reg); + snd_soc_write(codec, AC97_LINE1_LEVEL, reg); /* K [11:8] */ reg = reg2 | (0x2 << 4) | ((pll_div.k >> 8) & 0xf); - ac97_write(codec, AC97_LINE1_LEVEL, reg); + snd_soc_write(codec, AC97_LINE1_LEVEL, reg); /* K [7:4] */ reg = reg2 | (0x1 << 4) | ((pll_div.k >> 4) & 0xf); - ac97_write(codec, AC97_LINE1_LEVEL, reg); + snd_soc_write(codec, AC97_LINE1_LEVEL, reg); reg = reg2 | (0x0 << 4) | (pll_div.k & 0xf); /* K [3:0] */ - ac97_write(codec, AC97_LINE1_LEVEL, reg); + snd_soc_write(codec, AC97_LINE1_LEVEL, reg); } /* turn PLL on and select as source */ - reg = ac97_read(codec, AC97_EXTENDED_MID); - ac97_write(codec, AC97_EXTENDED_MID, reg & 0xfdff); - reg = ac97_read(codec, AC97_HANDSET_RATE); - ac97_write(codec, AC97_HANDSET_RATE, reg & 0xff7f); + snd_soc_update_bits(codec, AC97_EXTENDED_MID, 0x0200, 0x0000); + snd_soc_update_bits(codec, AC97_HANDSET_RATE, 0x0080, 0x0000); wm9713->pll_in = freq_in; /* wait 10ms AC97 link frames for the link to stabilise */ @@ -863,10 +887,10 @@ static int wm9713_set_dai_tristate(struct snd_soc_dai *codec_dai, int tristate) { struct snd_soc_codec *codec = codec_dai->codec; - u16 reg = ac97_read(codec, AC97_CENTER_LFE_MASTER) & 0x9fff; if (tristate) - ac97_write(codec, AC97_CENTER_LFE_MASTER, reg); + snd_soc_update_bits(codec, AC97_CENTER_LFE_MASTER, + 0x6000, 0x0000); return 0; } @@ -879,36 +903,30 @@ static int wm9713_set_dai_clkdiv(struct snd_soc_dai *codec_dai, int div_id, int div) { struct snd_soc_codec *codec = codec_dai->codec; - u16 reg; switch (div_id) { case WM9713_PCMCLK_DIV: - reg = ac97_read(codec, AC97_HANDSET_RATE) & 0xf0ff; - ac97_write(codec, AC97_HANDSET_RATE, reg | div); + snd_soc_update_bits(codec, AC97_HANDSET_RATE, 0x0f00, div); break; case WM9713_CLKA_MULT: - reg = ac97_read(codec, AC97_HANDSET_RATE) & 0xfffd; - ac97_write(codec, AC97_HANDSET_RATE, reg | div); + snd_soc_update_bits(codec, AC97_HANDSET_RATE, 0x0002, div); break; case WM9713_CLKB_MULT: - reg = ac97_read(codec, AC97_HANDSET_RATE) & 0xfffb; - ac97_write(codec, AC97_HANDSET_RATE, reg | div); + snd_soc_update_bits(codec, AC97_HANDSET_RATE, 0x0004, div); break; case WM9713_HIFI_DIV: - reg = ac97_read(codec, AC97_HANDSET_RATE) & 0x8fff; - ac97_write(codec, AC97_HANDSET_RATE, reg | div); + snd_soc_update_bits(codec, AC97_HANDSET_RATE, 0x7000, div); break; case WM9713_PCMBCLK_DIV: - reg = ac97_read(codec, AC97_CENTER_LFE_MASTER) & 0xf1ff; - ac97_write(codec, AC97_CENTER_LFE_MASTER, reg | div); + snd_soc_update_bits(codec, AC97_CENTER_LFE_MASTER, 0x0e00, div); break; case WM9713_PCMCLK_PLL_DIV: - reg = ac97_read(codec, AC97_LINE1_LEVEL) & 0xff80; - ac97_write(codec, AC97_LINE1_LEVEL, reg | 0x60 | div); + snd_soc_update_bits(codec, AC97_LINE1_LEVEL, + 0x007f, div | 0x60); break; case WM9713_HIFI_PLL_DIV: - reg = ac97_read(codec, AC97_LINE1_LEVEL) & 0xff80; - ac97_write(codec, AC97_LINE1_LEVEL, reg | 0x70 | div); + snd_soc_update_bits(codec, AC97_LINE1_LEVEL, + 0x007f, div | 0x70); break; default: return -EINVAL; @@ -921,7 +939,7 @@ static int wm9713_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) { struct snd_soc_codec *codec = codec_dai->codec; - u16 gpio = ac97_read(codec, AC97_GPIO_CFG) & 0xffc5; + u16 gpio = snd_soc_read(codec, AC97_GPIO_CFG) & 0xffc5; u16 reg = 0x8000; /* clock masters */ @@ -974,8 +992,8 @@ static int wm9713_set_dai_fmt(struct snd_soc_dai *codec_dai, break; } - ac97_write(codec, AC97_GPIO_CFG, gpio); - ac97_write(codec, AC97_CENTER_LFE_MASTER, reg); + snd_soc_write(codec, AC97_GPIO_CFG, gpio); + snd_soc_write(codec, AC97_CENTER_LFE_MASTER, reg); return 0; } @@ -984,24 +1002,24 @@ static int wm9713_pcm_hw_params(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { struct snd_soc_codec *codec = dai->codec; - u16 reg = ac97_read(codec, AC97_CENTER_LFE_MASTER) & 0xfff3; + /* enable PCM interface in master mode */ switch (params_width(params)) { case 16: break; case 20: - reg |= 0x0004; + snd_soc_update_bits(codec, AC97_CENTER_LFE_MASTER, + 0x000c, 0x0004); break; case 24: - reg |= 0x0008; + snd_soc_update_bits(codec, AC97_CENTER_LFE_MASTER, + 0x000c, 0x0008); break; case 32: - reg |= 0x000c; + snd_soc_update_bits(codec, AC97_CENTER_LFE_MASTER, + 0x000c, 0x000c); break; } - - /* enable PCM interface in master mode */ - ac97_write(codec, AC97_CENTER_LFE_MASTER, reg); return 0; } @@ -1011,17 +1029,15 @@ static int ac97_hifi_prepare(struct snd_pcm_substream *substream, struct snd_soc_codec *codec = dai->codec; struct snd_pcm_runtime *runtime = substream->runtime; int reg; - u16 vra; - vra = ac97_read(codec, AC97_EXTENDED_STATUS); - ac97_write(codec, AC97_EXTENDED_STATUS, vra | 0x1); + snd_soc_update_bits(codec, AC97_EXTENDED_STATUS, 0x0001, 0x0001); if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) reg = AC97_PCM_FRONT_DAC_RATE; else reg = AC97_PCM_LR_ADC_RATE; - return ac97_write(codec, reg, runtime->rate); + return snd_soc_write(codec, reg, runtime->rate); } static int ac97_aux_prepare(struct snd_pcm_substream *substream, @@ -1029,17 +1045,14 @@ static int ac97_aux_prepare(struct snd_pcm_substream *substream, { struct snd_soc_codec *codec = dai->codec; struct snd_pcm_runtime *runtime = substream->runtime; - u16 vra, xsle; - vra = ac97_read(codec, AC97_EXTENDED_STATUS); - ac97_write(codec, AC97_EXTENDED_STATUS, vra | 0x1); - xsle = ac97_read(codec, AC97_PCI_SID); - ac97_write(codec, AC97_PCI_SID, xsle | 0x8000); + snd_soc_update_bits(codec, AC97_EXTENDED_STATUS, 0x0001, 0x0001); + snd_soc_update_bits(codec, AC97_PCI_SID, 0x8000, 0x8000); if (substream->stream != SNDRV_PCM_STREAM_PLAYBACK) return -ENODEV; - return ac97_write(codec, AC97_PCM_SURR_DAC_RATE, runtime->rate); + return snd_soc_write(codec, AC97_PCM_SURR_DAC_RATE, runtime->rate); } #define WM9713_RATES (SNDRV_PCM_RATE_8000 | \ @@ -1128,27 +1141,23 @@ static struct snd_soc_dai_driver wm9713_dai[] = { static int wm9713_set_bias_level(struct snd_soc_codec *codec, enum snd_soc_bias_level level) { - u16 reg; - switch (level) { case SND_SOC_BIAS_ON: /* enable thermal shutdown */ - reg = ac97_read(codec, AC97_EXTENDED_MID) & 0x1bff; - ac97_write(codec, AC97_EXTENDED_MID, reg); + snd_soc_update_bits(codec, AC97_EXTENDED_MID, 0xe400, 0x0000); break; case SND_SOC_BIAS_PREPARE: break; case SND_SOC_BIAS_STANDBY: /* enable master bias and vmid */ - reg = ac97_read(codec, AC97_EXTENDED_MID) & 0x3bff; - ac97_write(codec, AC97_EXTENDED_MID, reg); - ac97_write(codec, AC97_POWERDOWN, 0x0000); + snd_soc_update_bits(codec, AC97_EXTENDED_MID, 0xc400, 0x0000); + snd_soc_write(codec, AC97_POWERDOWN, 0x0000); break; case SND_SOC_BIAS_OFF: /* disable everything including AC link */ - ac97_write(codec, AC97_EXTENDED_MID, 0xffff); - ac97_write(codec, AC97_EXTENDED_MSTATUS, 0xffff); - ac97_write(codec, AC97_POWERDOWN, 0xffff); + snd_soc_write(codec, AC97_EXTENDED_MID, 0xffff); + snd_soc_write(codec, AC97_EXTENDED_MSTATUS, 0xffff); + snd_soc_write(codec, AC97_POWERDOWN, 0xffff); break; } return 0; @@ -1156,16 +1165,14 @@ static int wm9713_set_bias_level(struct snd_soc_codec *codec, static int wm9713_soc_suspend(struct snd_soc_codec *codec) { - u16 reg; - /* Disable everything except touchpanel - that will be handled * by the touch driver and left disabled if touch is not in * use. */ - reg = ac97_read(codec, AC97_EXTENDED_MID); - ac97_write(codec, AC97_EXTENDED_MID, reg | 0x7fff); - ac97_write(codec, AC97_EXTENDED_MSTATUS, 0xffff); - ac97_write(codec, AC97_POWERDOWN, 0x6f00); - ac97_write(codec, AC97_POWERDOWN, 0xffff); + snd_soc_update_bits(codec, AC97_EXTENDED_MID, 0x7fff, + 0x7fff); + snd_soc_write(codec, AC97_EXTENDED_MSTATUS, 0xffff); + snd_soc_write(codec, AC97_POWERDOWN, 0x6f00); + snd_soc_write(codec, AC97_POWERDOWN, 0xffff); return 0; } @@ -1203,16 +1210,23 @@ static int wm9713_soc_resume(struct snd_soc_codec *codec) static int wm9713_soc_probe(struct snd_soc_codec *codec) { struct wm9713_priv *wm9713 = snd_soc_codec_get_drvdata(codec); - int reg; + struct regmap *regmap; wm9713->ac97 = snd_soc_new_ac97_codec(codec, WM9713_VENDOR_ID, WM9713_VENDOR_ID_MASK); if (IS_ERR(wm9713->ac97)) return PTR_ERR(wm9713->ac97); + regmap = devm_regmap_init_ac97(wm9713->ac97, &wm9713_regmap_config); + if (IS_ERR(regmap)) { + snd_soc_free_ac97_codec(wm9713->ac97); + return PTR_ERR(regmap); + } + + snd_soc_codec_init_regmap(codec, regmap); + /* unmute the adc - move to kcontrol */ - reg = ac97_read(codec, AC97_CD) & 0x7fff; - ac97_write(codec, AC97_CD, reg); + snd_soc_update_bits(codec, AC97_CD, 0x7fff, 0x0000); return 0; } @@ -1230,13 +1244,7 @@ static struct snd_soc_codec_driver soc_codec_dev_wm9713 = { .remove = wm9713_soc_remove, .suspend = wm9713_soc_suspend, .resume = wm9713_soc_resume, - .read = ac97_read, - .write = ac97_write, .set_bias_level = wm9713_set_bias_level, - .reg_cache_size = ARRAY_SIZE(wm9713_reg), - .reg_word_size = sizeof(u16), - .reg_cache_step = 2, - .reg_cache_default = wm9713_reg, .controls = wm9713_snd_ac97_controls, .num_controls = ARRAY_SIZE(wm9713_snd_ac97_controls), -- 2.1.4

1 0

[alsa-devel] [PATCH 1/2] BAT: eliminate compiler warnings due to printf type mismatch
by Caleb Crome 24 Oct '15

24 Oct '15

Explict type cast to (size_t) to eliminate compiler warnings. Signed-off-by: Caleb Crome <caleb(a)crome.org> --- bat/alsa.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bat/alsa.c b/bat/alsa.c index 582c604..b2aa34b 100644 --- a/bat/alsa.c +++ b/bat/alsa.c @@ -161,7 +161,7 @@ static int set_snd_pcm_params(struct bat *bat, struct pcm_container *sndpcm) if (err < 0) { fprintf(bat->err, _("Get parameter from device error: ")); fprintf(bat->err, _("period size: %zd %s: %s(%d)\n"), - sndpcm->period_size, + (size_t) sndpcm->period_size, device_name, snd_strerror(err), err); return err; } @@ -170,7 +170,7 @@ static int set_snd_pcm_params(struct bat *bat, struct pcm_container *sndpcm) if (err < 0) { fprintf(bat->err, _("Get parameter from device error: ")); fprintf(bat->err, _("buffer size: %zd %s: %s(%d)\n"), - sndpcm->buffer_size, + (size_t) sndpcm->buffer_size, device_name, snd_strerror(err), err); return err; } @@ -178,7 +178,7 @@ static int set_snd_pcm_params(struct bat *bat, struct pcm_container *sndpcm) if (sndpcm->period_size == sndpcm->buffer_size) { fprintf(bat->err, _("Invalid parameters: can't use period ")); fprintf(bat->err, _("equal to buffer size (%zd)\n"), - sndpcm->period_size); + (size_t) sndpcm->period_size); return -EINVAL; } -- 2.6.1

2 4

[alsa-devel] [PATCH 0/9] ASoC: Intel: Skylake: Fixes and updates
by Vinod Koul 24 Oct '15

24 Oct '15

This series adds various fixes thru the driver. It also updates ssp node structure to latest FW interface. Last patch add support for static pin connections between modules, which is useful for intra pipe connections Jeeja KP (7): ASoC: Intel: Skylake: Fix return for pm_runtime_get_sync() ASoC: Intel: Skylake: Remove BE copier blob memcpy ASoC: Intel: Skylake: Update for ssp node index in copier cfg ASoC: Intel: Skylake: Add support to disable module notifications ASoC: Intel: Skylake: Fix to check return value of dsp init ASoC: Intel: Skylake: Fix to set Non gateway copier cfg ASoC: Intel: Skylake: Add support to topology for module static pin Subhransu S. Prusty (2): ASoC: Intel: Skylake: Fix to use correct macros for the path iteration ASoC: Intel: Skylake: Fix to fill all sink/source pipe params sound/soc/intel/skylake/skl-messages.c | 44 +++++++++++++++-- sound/soc/intel/skylake/skl-pcm.c | 2 +- sound/soc/intel/skylake/skl-topology.c | 74 +++++++++++++++++----------- sound/soc/intel/skylake/skl-topology.h | 8 ++- sound/soc/intel/skylake/skl-tplg-interface.h | 7 ++- 5 files changed, 95 insertions(+), 40 deletions(-) -- 1.9.1

2 20

[alsa-devel] [PATCH 1/2] BAT: Add missing locale.h header
by Caleb Crome 24 Oct '15

24 Oct '15

Missing include became apparent when -O3 was not specified. Added the header to remove error messages during debug compile. Signed-off-by: Caleb Crome <caleb(a)crome.org> --- bat/bat.c | 1 + 1 file changed, 1 insertion(+) diff --git a/bat/bat.c b/bat/bat.c index 56cfaf6..086b9fa 100644 --- a/bat/bat.c +++ b/bat/bat.c @@ -23,6 +23,7 @@ #include <getopt.h> #include <math.h> #include <limits.h> +#include <locale.h> #include "aconfig.h" #include "gettext.h" -- 2.6.1

2 2

[alsa-devel] [PATCH 0/2] ALSA: fireworks: refactoring of substream counting
by Takashi Sakamoto 24 Oct '15

24 Oct '15

Hi, This patchset is for refactoring of substream counting. Currently the counting has atomic_t type. When utilizing lock by mutex in snd_efw structure, the counting can have simpler type, unsigned int. Takashi Sakamoto (2): fireworks: move mutex from function callees to callers fireworks: change type of substream counter from atomic_t to unsigned int sound/firewire/fireworks/fireworks.h | 4 ++-- sound/firewire/fireworks/fireworks_midi.c | 16 +++++++++++---- sound/firewire/fireworks/fireworks_pcm.c | 28 +++++++++++++++++-------- sound/firewire/fireworks/fireworks_stream.c | 32 +++++++++++------------------ 4 files changed, 46 insertions(+), 34 deletions(-) -- 2.1.4

1 2

[alsa-devel] [PATCH 0/8] Add ASoC support for AMD APUs [v4]
by Alex Deucher 24 Oct '15

24 Oct '15

This patch set implements support for i2s audio and new AMD GPUs. The i2s codec is fed by a DMA engine on the GPU. To handle this we create mfd cells which we hang the i2s codec and DMA engine on. Because of this, this patch set covers two subsystems: drm and alsa. The drm patches add support for the ACP hw block which provides the DMA engine for the i2s codec. The alsa patches add the ASoC driver for the i2s codec. Since the alsa changes depend on the drm changes in this patch set as well as some other drm changes queued for 4.3, I'd like to take the alsa patches in via the drm tree. V2 changes: - Use the MFD subsystem rather than adding our own bus - Squash all sub-feature patches together - fix comments mentioned in previous review V3 changes: - Update the designware driver to handle slave mode, amd specific features - Use the designware driver directly for i2s - Move the DMA handling from the GPU driver into the AMD ASoC driver - Change the license on the ASoC driver to GPL v4 changes: - patch "ASoC : dwc : support dw i2s in slave mode" accepted - Add a _dai_fmt() operation that checks to make sure that the mode we're setting corresponds to what we read back from the hardware. - Split specific quirks into separate patches - Set the specific quirks that apply to AMD chips in the acp driver Patch 7 adds the register headers for the ACP block which is a pretty big patch so I've excluded it from email. The entire patch set can be viewed here: http://cgit.freedesktop.org/~agd5f/linux/log/?h=acp-upstream5 Thanks, Alex Maruthi Bayyavarapu (1): drm/amd: add ACP driver support Maruthi Srinivas Bayyavarapu (7): ASoC : dwc : add check for master/slave format ASoC : dwc : add different playback/capture base ASoC : dwc : add quirk for dwc controller instances ASoC : dwc : add quirk for different register offset ASoC : dwc : reconfigure dwc in 'resume' from 'suspend' ASoC : AMD : add ACP 2.2 register headers ASoC: AMD: add AMD ASoC ACP-I2S driver drivers/gpu/drm/Kconfig | 2 + drivers/gpu/drm/amd/acp/Kconfig | 10 + drivers/gpu/drm/amd/acp/Makefile | 9 + drivers/gpu/drm/amd/acp/acp_hw.c | 127 ++ drivers/gpu/drm/amd/acp/include/acp_gfx_if.h | 49 + drivers/gpu/drm/amd/amdgpu/Makefile | 13 +- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 12 + drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 275 +++ drivers/gpu/drm/amd/amdgpu/amdgpu_acp.h | 41 + drivers/gpu/drm/amd/amdgpu/vi.c | 12 + drivers/gpu/drm/amd/include/amd_shared.h | 1 + include/linux/mfd/amd_acp.h | 43 + include/sound/designware_i2s.h | 6 + sound/soc/Kconfig | 1 + sound/soc/Makefile | 1 + sound/soc/amd/Kconfig | 4 + sound/soc/amd/Makefile | 3 + sound/soc/amd/acp-pcm-dma.c | 518 ++++++ sound/soc/amd/acp.c | 736 +++++++++ sound/soc/amd/acp.h | 147 ++ sound/soc/amd/include/acp_2_2_d.h | 609 +++++++ sound/soc/amd/include/acp_2_2_enum.h | 1068 ++++++++++++ sound/soc/amd/include/acp_2_2_sh_mask.h | 2292 ++++++++++++++++++++++++++ sound/soc/dwc/designware_i2s.c | 206 ++- 24 files changed, 6121 insertions(+), 64 deletions(-) create mode 100644 drivers/gpu/drm/amd/acp/Kconfig create mode 100644 drivers/gpu/drm/amd/acp/Makefile create mode 100644 drivers/gpu/drm/amd/acp/acp_hw.c create mode 100644 drivers/gpu/drm/amd/acp/include/acp_gfx_if.h create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_acp.h create mode 100644 include/linux/mfd/amd_acp.h create mode 100644 sound/soc/amd/Kconfig create mode 100644 sound/soc/amd/Makefile create mode 100644 sound/soc/amd/acp-pcm-dma.c create mode 100644 sound/soc/amd/acp.c create mode 100644 sound/soc/amd/acp.h create mode 100644 sound/soc/amd/include/acp_2_2_d.h create mode 100644 sound/soc/amd/include/acp_2_2_enum.h create mode 100644 sound/soc/amd/include/acp_2_2_sh_mask.h -- 1.8.3.1

4 24

[alsa-devel] [RESEND PATCH 1/8] ASoC: dwc: add check for master/slave format
by Alex Deucher 24 Oct '15

24 Oct '15

From: Maruthi Srinivas Bayyavarapu <Maruthi.Bayyavarapu(a)amd.com> DW i2s controller's master/slave config can be read from a read-only register. Machine driver can try to set a master/slave format on cpu-dai using 'set_fmt' of dai ops. A check is added to verify codec is master when dwc is slave and vice-versa. Signed-off-by: Maruthi Bayyavarapu <maruthi.bayyavarapu(a)amd.com> Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com> --- sound/soc/dwc/designware_i2s.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/sound/soc/dwc/designware_i2s.c b/sound/soc/dwc/designware_i2s.c index 3a52f82..f427325 100644 --- a/sound/soc/dwc/designware_i2s.c +++ b/sound/soc/dwc/designware_i2s.c @@ -341,12 +341,43 @@ static int dw_i2s_trigger(struct snd_pcm_substream *substream, return ret; } +static int dw_i2s_set_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt) +{ + struct dw_i2s_dev *dev = snd_soc_dai_get_drvdata(cpu_dai); + int ret = 0; + + switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { + case SND_SOC_DAIFMT_CBM_CFM: + if (dev->capability & DW_I2S_SLAVE) + ret = 0; + else + ret = -EINVAL; + break; + case SND_SOC_DAIFMT_CBS_CFS: + if (dev->capability & DW_I2S_MASTER) + ret = 0; + else + ret = -EINVAL; + break; + case SND_SOC_DAIFMT_CBM_CFS: + case SND_SOC_DAIFMT_CBS_CFM: + ret = -EINVAL; + break; + default: + dev_dbg(dev->dev, "dwc : Invalid master/slave format\n"); + ret = -EINVAL; + break; + } + return ret; +} + static struct snd_soc_dai_ops dw_i2s_dai_ops = { .startup = dw_i2s_startup, .shutdown = dw_i2s_shutdown, .hw_params = dw_i2s_hw_params, .prepare = dw_i2s_prepare, .trigger = dw_i2s_trigger, + .set_fmt = dw_i2s_set_fmt, }; static const struct snd_soc_component_driver dw_i2s_component = { -- 1.8.3.1

1 0

[alsa-devel] [PATCH] ASoC: rt5645: Add the HWEQ for the speaker output
by Oder Chiou 23 Oct '15

23 Oct '15

The patch adds the HWEQ function for the speaker output. User can set the HWEQ parameters using the ALSA binary control byte-by-byte. We use the following struct array to store the HWEQ parameters for implementing as simple as possible. struct rt5645_eq_param_s { unsigned short reg; unsigned short val; }; It supports the variant length of the HWEQ parameters that are required. We add the validating function in the function "rt5645_hweq_put" of the ALSA binary control to avoid the user that puts the invalid parameters. In the HWEQ enable function of speaker event, we also add the validating function to prevent that the invalid parameters are applied to codec. The HWEQ parameters should be controlled by DAPM for a specific sequence, so the parameters will be applied to the codec in the speaker power up event of DAPM, and will be disabled in the speaker power down event of DAPM. Signed-off-by: Oder Chiou <oder_chiou(a)realtek.com> --- sound/soc/codecs/rt5645.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index 9d9797c..2813237 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -42,6 +42,8 @@ #define RT5645_PR_BASE (RT5645_PR_RANGE_BASE + (0 * RT5645_PR_SPACING)) +#define RT5645_HWEQ_NUM 57 + static const struct regmap_range_cfg rt5645_ranges[] = { { .name = "PR", @@ -224,6 +226,11 @@ static const struct reg_default rt5645_reg[] = { { 0xff, 0x6308 }, }; +struct rt5645_eq_param_s { + unsigned short reg; + unsigned short val; +}; + static const char *const rt5645_supply_names[] = { "avdd", "cpvdd", @@ -240,6 +247,7 @@ struct rt5645_priv { struct snd_soc_jack *btn_jack; struct delayed_work jack_detect_work; struct regulator_bulk_data supplies[ARRAY_SIZE(rt5645_supply_names)]; + struct rt5645_eq_param_s *eq_param; int codec_type; int sysclk; @@ -477,6 +485,86 @@ static const DECLARE_TLV_DB_RANGE(spk_clsd_tlv, 7, 7, TLV_DB_SCALE_ITEM(228, 0, 0) ); +static int rt5645_hweq_info(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + uinfo->type = SNDRV_CTL_ELEM_TYPE_BYTES; + uinfo->count = RT5645_HWEQ_NUM * sizeof(struct rt5645_eq_param_s); + + return 0; +} + +static int rt5645_hweq_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); + struct rt5645_priv *rt5645 = snd_soc_component_get_drvdata(component); + struct rt5645_eq_param_s *eq_param = + (struct rt5645_eq_param_s *)ucontrol->value.bytes.data; + int i; + + for (i = 0; i < RT5645_HWEQ_NUM; i++) { + eq_param[i].reg = cpu_to_be16(rt5645->eq_param[i].reg); + eq_param[i].val = cpu_to_be16(rt5645->eq_param[i].val); + } + + return 0; +} + +static bool rt5645_validate_hweq(unsigned short reg) +{ + if ((reg >= 0x1a4 && reg <= 0x1cd) | (reg >= 0x1e5 && reg <= 0x1f8) | + (reg == RT5645_EQ_CTRL2)) + return true; + + return false; +} + +static int rt5645_hweq_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); + struct rt5645_priv *rt5645 = snd_soc_component_get_drvdata(component); + struct rt5645_eq_param_s *eq_param = + (struct rt5645_eq_param_s *)ucontrol->value.bytes.data; + int i; + + for (i = 0; i < RT5645_HWEQ_NUM; i++) { + eq_param[i].reg = be16_to_cpu(eq_param[i].reg); + eq_param[i].val = be16_to_cpu(eq_param[i].val); + } + + /* The final setting of the table should be RT5645_EQ_CTRL2 */ + for (i = RT5645_HWEQ_NUM - 1; i >= 0; i--) { + if (eq_param[i].reg == 0) + continue; + else if (eq_param[i].reg != RT5645_EQ_CTRL2) + return 0; + else + break; + } + + for (i = 0; i < RT5645_HWEQ_NUM; i++) { + if (!rt5645_validate_hweq(eq_param[i].reg) && + eq_param[i].reg != 0) + return 0; + else if (eq_param[i].reg == 0) + break; + } + + memcpy(rt5645->eq_param, eq_param, + RT5645_HWEQ_NUM * sizeof(struct rt5645_eq_param_s)); + + return 0; +} + +#define RT5645_HWEQ(xname) \ +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ + .info = rt5645_hweq_info, \ + .get = rt5645_hweq_get, \ + .put = rt5645_hweq_put \ +} + static const struct snd_kcontrol_new rt5645_snd_controls[] = { /* Speaker Output Volume */ SOC_DOUBLE("Speaker Channel Switch", RT5645_SPK_VOL, @@ -541,6 +629,7 @@ static const struct snd_kcontrol_new rt5645_snd_controls[] = { /* I2S2 function select */ SOC_SINGLE("I2S2 Func Switch", RT5645_GPIO_CTRL1, RT5645_I2S2_SEL_SFT, 1, 1), + RT5645_HWEQ("Speaker HWEQ"), }; /** @@ -631,6 +720,22 @@ static int is_using_asrc(struct snd_soc_dapm_widget *source, } +static int rt5645_enable_hweq(struct snd_soc_codec *codec) +{ + struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec); + int i; + + for (i = 0; i < RT5645_HWEQ_NUM; i++) { + if (rt5645_validate_hweq(rt5645->eq_param[i].reg)) + regmap_write(rt5645->regmap, rt5645->eq_param[i].reg, + rt5645->eq_param[i].val); + else + break; + } + + return 0; +} + /** * rt5645_sel_asrc_clk_src - select ASRC clock source for a set of filters * @codec: SoC audio codec device. @@ -1535,6 +1640,7 @@ static int rt5645_spk_event(struct snd_soc_dapm_widget *w, switch (event) { case SND_SOC_DAPM_POST_PMU: + rt5645_enable_hweq(codec); snd_soc_update_bits(codec, RT5645_PWR_DIG1, RT5645_PWR_CLS_D | RT5645_PWR_CLS_D_R | RT5645_PWR_CLS_D_L, @@ -1543,6 +1649,7 @@ static int rt5645_spk_event(struct snd_soc_dapm_widget *w, break; case SND_SOC_DAPM_PRE_PMD: + snd_soc_write(codec, RT5645_EQ_CTRL2, 0); snd_soc_update_bits(codec, RT5645_PWR_DIG1, RT5645_PWR_CLS_D | RT5645_PWR_CLS_D_R | RT5645_PWR_CLS_D_L, 0); @@ -3060,6 +3167,9 @@ static int rt5645_probe(struct snd_soc_codec *codec) snd_soc_dapm_sync(dapm); } + rt5645->eq_param = devm_kzalloc(codec->dev, + RT5645_HWEQ_NUM * sizeof(struct rt5645_eq_param_s), GFP_KERNEL); + return 0; } -- 1.8.1.1.439.g50a6b54

2 1

[alsa-devel] [PATCH 1/2] BAT: Add missing locale.h header
by Caleb Crome 23 Oct '15

23 Oct '15

Missing include became apparent when -O3 was not specified. Added the header to remove error messages during debug compile. Signed-off-by: Caleb Crome <caleb(a)crome.org> --- bat/bat.c | 1 + 1 file changed, 1 insertion(+) diff --git a/bat/bat.c b/bat/bat.c index 56cfaf6..086b9fa 100644 --- a/bat/bat.c +++ b/bat/bat.c @@ -23,6 +23,7 @@ #include <getopt.h> #include <math.h> #include <limits.h> +#include <locale.h> #include "aconfig.h" #include "gettext.h" -- 2.6.1

1 1

[alsa-devel] [PATCH v4 0/2] ASoC: nau8825: Add FLL config and device property debug
by Ben Zhang 23 Oct '15

23 Oct '15

This patch series adds the codec FLL configuration code to allow different input MCLK frequencies, and prints out the received device properties to make debugging easier with multiple versions of ACPI _DSD blob. Changes in v2: - Changed function/struct prefix from nau88xx_ to nau8825_ to match with the rest of the driver. Changes in v3: - Changed the implicit unsigned 64-bit divide to div_u64() to fix build errors on 32-bit arch. Changes in v4: - v2 and v3 updated only patch 1/2, not 2/2. The posted partial patch series makes code review confusing. v4 updates both patches in this series to the latest version. Ben Zhang (2): ASoC: nau8825: Add FLL configuration ASoC: nau8825: Show device properties sound/soc/codecs/nau8825.c | 193 +++++++++++++++++++++++++++++++++++++++++++++ sound/soc/codecs/nau8825.h | 28 +++++-- 2 files changed, 216 insertions(+), 5 deletions(-) -- 2.6.0.rc2.230.g3dd15c0

2 5

[alsa-devel] I/O errors, snd_pcm_hw_params_get_ functions don't deliver values and system freezes on drop/drain/close
by Bommes, Michael 23 Oct '15

23 Oct '15

Hello, I am trying to develop an audio capture application for an SoC (ASC8852A with a TW2866 Audio Codec). I have SSH access to the SoC and the operating system was set up by someone else. Libraries and drivers were precompiled by the manufacturer, as well as a demo system for a video capturing server. Unfortunately I'm not that familiar with operating systems, driver programming and linux in special (although I know some basics regularly used in high-level development). I'm not sure whether I installed ALSA libraries and drivers correctly. Currently I have: - loaded in kernel (output printed to terminal): Advanced Linux Sound Architecture Driver Version 1.0.18rc3. ASoC version 0.13.2 ALSA device list: No soundcards found. - loaded by /etc/modules and modprobe.conf TW2866_AUDIO CodecNum=2 i2c-gpio bus_num=2 scl0=6 sda0=7 scl1=12 sda1=13 - performed after system startup: snddevices script delivered in the SDK of the SoC. sh snddevices The script is placed in the same folder as the TW2866_AUDIO.ko - alsa.conf was placed in /etc/ALSA/alsa.conf because that place is used in the reference OS and some install script, too. After that I have performed some cat and ls commands: /dev/snd/ is created and holds entries (in the demo system there is another timer entry which is missing in my OS): controlC0 pcmC0D0c pcmC0D0p pcmC0D1c pcmC0D2c pcmC0D3c pcmC0D4c cat /proc/asound/devices 0: [ 0] : control 17: [ 0- 1]: digital audio playback 24: [ 0- 0]: digital audio capture 25: [ 0- 1]: digital audio capture 33: : timer and cat /proc/asound/cards 0 [VPL_AUDIO ]: VPL AUDIO - VPL Audio TW2866 Driver VPL Audio Codec Driver, TW2866. Now I have no idea whether the drivers and stuff were installed correctly. I tried to program a little sample program, but once I get pcm device to state SND_PCM_STATE_RUNNING the system freezes if I try to drain, drop or close the application, including all other ssh connections to the SoC so that a hard reset is necessary. Errors on readi occur before (10 seconds between each readi call and the error message), but none of the errors mentioned in the documentation (-EPIPE etc) but a -EIO error (Input/Output). But I'm not 100% sure whether the number of periods and buffer sizes were chosen correctly, so it might be possible that it's another user error (wrong buffer sizes delivered to driver could lead to freezes?). So I've reduced the code to setting hardware parameters and found out that snd_pcm_hw_params_get_ calls don't return errors but some of them always return 0 or don't change the output parameter. Here's sample source code and terminal output: ---------------------------------------------------------------------------------------------------------------- /* Use the newer ALSA API */ #define ALSA_PCM_NEW_HW_PARAMS_API #include <alsa/asoundlib.h> void testError(const char* task, int rc) { if (rc < 0) { fprintf(stderr,"ERROR: %s: %s\n", task, snd_strerror(rc)); exit(1); } } int main() { long loops; int rc; int size; snd_pcm_t *handle; snd_pcm_hw_params_t *params; unsigned int val; int dir; snd_pcm_uframes_t frames; char *buffer; /* Open PCM device for recording (capture). */ rc = snd_pcm_open(&handle, "hw:0,0", SND_PCM_STREAM_CAPTURE, 0); testError("snd_pcm_open",rc); /* Allocate a hardware parameters object. */ // snd_pcm_hw_params_alloca(params); snd_pcm_hw_params_malloc(&params); /* Fill it in with default values. */ rc = snd_pcm_hw_params_any(handle, params); testError("snd_pcm_hw_params_any", rc); /* Set the desired hardware parameters. */ /* Interleaved mode */ rc = snd_pcm_hw_params_set_access(handle, params,SND_PCM_ACCESS_RW_INTERLEAVED); testError("snd_pcm_hw_params_set_access", rc); // test whether _set_access was applied snd_pcm_access_t access = SND_PCM_ACCESS_RW_NONINTERLEAVED; snd_pcm_hw_params_get_access (params, &access); if(access != SND_PCM_ACCESS_RW_INTERLEAVED) printf("ERROR! not SND_PCM_ACCESS_RW_INTERLEAVED\n"); /* Signed 16-bit little-endian format */ rc = snd_pcm_hw_params_set_format(handle, params,SND_PCM_FORMAT_S16_LE); // non-16 bit formats fail to be set testError("snd_pcm_hw_params_set_format", rc); snd_pcm_format_t gottenFormat = SND_PCM_FORMAT_S8; snd_pcm_hw_params_get_format (params, &gottenFormat); if(gottenFormat != SND_PCM_FORMAT_S16_LE) { printf ("ERROR! not SND_PCM_FORMAT_S16_LE ... %i instead\n", gottenFormat); switch(gottenFormat) { case SND_PCM_FORMAT_S16_LE: printf("SND_PCM_FORMAT_S16_LE\n"); break; case SND_PCM_FORMAT_UNKNOWN: printf("SND_PCM_FORMAT_UNKNOWN\n"); break; default: break; //printf("%ld\n",gottenFormat); } } /* Two channels (stereo) */ rc = snd_pcm_hw_params_set_channels(handle, params, 2); testError("snd_pcm_hw_params_set_channels", rc); /* 44100 bits/second sampling rate (CD quality) */ unsigned int rate = 8000; //snd_pcm_hw_params_set_rate_near(handle, params,&val, &dir); rc = snd_pcm_hw_params_set_rate_near(handle, params,&rate, &dir); testError("snd_pcm_hw_params_set_rate_near", rc); printf("applied rate (return value): %i\n", (int)rate); unsigned int usedRate; rc = snd_pcm_hw_params_get_rate (params, &usedRate, &dir); testError("snd_pcm_hw_params_get_rate", rc); printf("used rate (getter value): %i\n", usedRate); unsigned int usedPeriods; snd_pcm_hw_params_get_periods(params, &usedPeriods, &dir); testError("", rc); printf("default periods: %i\n", usedPeriods); unsigned int periods = 8; // Set number of periods. Periods used to be called fragments. rc = snd_pcm_hw_params_set_periods(handle, params, periods, 0); testError("snd_pcm_hw_params_set_periods", rc); printf("Chosen number of periods (return value): %i\n", periods); rc = snd_pcm_hw_params_get_periods(params, &usedPeriods, &dir); testError("snd_pcm_hw_params_get_periods", rc); printf("used periods (getter value): %i\n", usedPeriods); /* Set period size to 32 frames. */ frames = 32; // snd_pcm_hw_params_set_period_size_near(handle,params, &frames, &dir); snd_pcm_hw_params_set_period_size_near(handle,params, &frames, &dir); testError("snd_pcm_hw_params_set_period_size_near", rc); printf("frames per period tried to set (return value): %ld\n", frames); printf("write to driver\n"); /* Write the parameters to the driver */ rc = snd_pcm_hw_params(handle, params); testError("snd_pcm_hw_params", rc); printf("written to driver\n"); snd_pcm_uframes_t maxSize; snd_pcm_hw_params_get_period_size_max(params, &maxSize, &dir); printf("max period size: %i\n", (int)maxSize); /* Use a buffer large enough to hold one period */ rc = snd_pcm_hw_params_get_period_size(params, &frames, &dir); testError("snd_pcm_hw_params_get_period_size", rc); size = frames * 4; /* 2 bytes/sample, 2 channels */ buffer = (char *) malloc(size); /* We want to loop for 5 seconds */ rc = snd_pcm_hw_params_get_period_time(params, &val, &dir); testError("snd_pcm_hw_params_get_period_time", rc); loops = 5000000 / val; printf("frames per period: %ld\n", frames); // ERROR: here: size will be 0, so loops will be performed but nothing is copied... while (loops > 0) { loops--; rc = snd_pcm_readi(handle, buffer, frames); if (rc == -EPIPE) { /* EPIPE means overrun */ fprintf(stderr, "overrun occurred\n"); snd_pcm_prepare(handle); } else if (rc < 0) { fprintf(stderr, "error from read: %s\n", snd_strerror(rc)); } else if (rc != (int)frames) { fprintf(stderr, "short read, read %d frames\n", rc); } rc = write(1, buffer, size); if (rc != size) fprintf(stderr, "short write: wrote %d bytes\n", rc); } snd_pcm_drain(handle); snd_pcm_close(handle); free(buffer); printf("finished\n"); return 0; } ------------------------------------------------------------------------------------------------------------------ with output: ERROR! not SND_PCM_FORMAT_S16_LE ... 0 instead applied rate (return value): 8000 used rate (getter value): 8000 default periods: 0 Chosen number of periods (return value): 8 (comment: output parameter meant here) used periods (getter value): 0 frames per period tried to set (return value): 32 (comment: output parameter meant here) write to driver hello, alsa~. written to driver max period size: 0 frames per period: 0 finished This code doesn't freeze but getter functions "return" (where I mean the output parameter) 0 for periods and framesPerPeriod and format-getter doesn't return the expected, while sample-rate getter works. I'm a but confused about the "hello, alsa~." output, is that normal behaviour for the driver or might it be some kind of debug output in library or driver? System freeze looks like driver issue, or might this only be a wrong usage of the driver? Is there a way to check which parts of the ALSA installation (library, driver, codecs) do or don't work? How can I be certain that snddevices script and .conf files are sufficient? Thank you very much in advance, Michael

2 1

[alsa-devel] [PATCH] BAT: fix missing header
by Caleb Crome 23 Oct '15

23 Oct '15

There was no warning when compiling with -O3, but gave a warning without it. commit a19fa1f7dff40e56dc4327c5e5fdde9e15bd8a55 Author: Caleb Crome <ccrome(a)gmail.com> Date: Tue Oct 20 20:59:50 2015 +0000 Add missing locale.h header. diff --git a/bat/bat.c b/bat/bat.c index 57c9db8..14666b2 100644 --- a/bat/bat.c +++ b/bat/bat.c @@ -23,6 +23,7 @@ #include <getopt.h> #include <math.h> #include <limits.h> +#include <locale.h> #include "aconfig.h" #include "gettext.h"

2 1

[alsa-devel] [PATCH] ASoC: fsl_sai: fix no frame clk in master mode
by Zidan Wang 23 Oct '15

23 Oct '15

After several open/close sai test with ctrl+c, there will be I/O error. The SAI can't work anymore, can't recover. There will be no frame clock. With adding the software reset in trigger stop, the issue can be fixed. Signed-off-by: Zidan Wang <zidan.wang(a)freescale.com> --- sound/soc/fsl/fsl_sai.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c index 5c737f1..6a947dc 100644 --- a/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c @@ -504,6 +504,13 @@ static int fsl_sai_trigger(struct snd_pcm_substream *substream, int cmd, FSL_SAI_CSR_FR, FSL_SAI_CSR_FR); regmap_update_bits(sai->regmap, FSL_SAI_RCSR, FSL_SAI_CSR_FR, FSL_SAI_CSR_FR); + + /* Software Reset for both Tx and Rx */ + regmap_write(sai->regmap, FSL_SAI_TCSR, FSL_SAI_CSR_SR); + regmap_write(sai->regmap, FSL_SAI_RCSR, FSL_SAI_CSR_SR); + /* Clear SR bit to finish the reset */ + regmap_write(sai->regmap, FSL_SAI_TCSR, 0); + regmap_write(sai->regmap, FSL_SAI_RCSR, 0); } break; default: -- 1.9.1

2 7

[alsa-devel] [GIT PULL] ASoC updates for v4.3
by Mark Brown 23 Oct '15

23 Oct '15

The following changes since commit 7379047d5585187d1288486d4627873170d0005a: Linux 4.3-rc6 (2015-10-18 16:08:42 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-fix-v4.3-rc6 for you to fetch changes up to f69eccc4b248ce53b1b830034babd0a795d5763c: Merge remote-tracking branches 'asoc/fix/rt298', 'asoc/fix/sx', 'asoc/fix/wm8904' and 'asoc/fix/wm8962' into asoc-linus (2015-10-23 08:44:14 +0900) ---------------------------------------------------------------- ASoC: Fixes for v4.3 A bunch of driver fixes plus one core fix which fixes problems with misreporting values from _SX controls following a recent refactoring. This had gone unnoticed as such controls are quite rare. ---------------------------------------------------------------- Bard Liao (2): ASoC: rt298: correct index default value ASoC: rt298: fix wrong setting of gpio2_en Charles Keepax (2): ASoC: Add info callback for SX_TLV controls ASoC: wm8904: Correct number of EQ registers Jiada Wang (1): ASoC: wm8962: mark cache_dirty flag after software reset in pm_resume Mark Brown (3): Merge remote-tracking branch 'asoc/fix/rt5645' into asoc-fix-rt5645 Merge remote-tracking branch 'asoc/fix/rt5645' into asoc-linus Merge remote-tracking branches 'asoc/fix/rt298', 'asoc/fix/sx', 'asoc/fix/wm8904' and 'asoc/fix/wm8962' into asoc-linus include/sound/soc.h | 6 ++++-- include/sound/wm8904.h | 2 +- sound/soc/codecs/rt298.c | 26 +++++++++++++------------- sound/soc/codecs/wm8962.c | 2 ++ sound/soc/soc-ops.c | 28 ++++++++++++++++++++++++++++ 5 files changed, 48 insertions(+), 16 deletions(-)

2 1

[alsa-devel] [PATCH 1/3] ASoC: h1940_uda1380: Constify rate constraints
by Lars-Peter Clausen 23 Oct '15

23 Oct '15

The rate constraints in this board driver are not modified at runtime, so make them const. While we are at it also remove the unnecessary 0 initializer for the mask field. Signed-off-by: Lars-Peter Clausen <lars(a)metafoo.de> --- sound/soc/samsung/h1940_uda1380.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sound/soc/samsung/h1940_uda1380.c b/sound/soc/samsung/h1940_uda1380.c index c72e9fb..5f5825f 100644 --- a/sound/soc/samsung/h1940_uda1380.c +++ b/sound/soc/samsung/h1940_uda1380.c @@ -26,16 +26,15 @@ #include <mach/gpio-samsung.h> #include "s3c24xx-i2s.h" -static unsigned int rates[] = { +static const unsigned int rates[] = { 11025, 22050, 44100, }; -static struct snd_pcm_hw_constraint_list hw_rates = { +static const struct snd_pcm_hw_constraint_list hw_rates = { .count = ARRAY_SIZE(rates), .list = rates, - .mask = 0, }; static struct snd_soc_jack hp_jack; -- 2.1.4

3 6

[alsa-devel] [PATCH 0/9] ASoC: rsnd: tidyup patch set
by Kuninori Morimoto 23 Oct '15

23 Oct '15

Hi Mark Renesas R-Car sound driver will have mod base common method on SSIU/CMD/AudioDMAC/AudioDMACpp/SSIparent soon. These are not directly related it, but cleanup/fixup/tidyup patch set. Kuninori Morimoto (9): ASoC: rsnd: fixup print debug message after read ASoC: rsnd: fixup struct rsnd_gen::res array size ASoC: rsnd: fixup devm_request_irq() option on ssi.c ASoC: rsnd: fixup rsnd_mod_call() behavior for debug ASoC: rsnd: fixup rsnd_dai_call() behavior for unimplemented method ASoC: rsnd: fixup rsnd_dai_call() behavior for .stop/.quit ASoC: rsnd: rename rsnd_mod_hw_start/stop to rsnd_mod_power_on/off ASoC: rsnd: remove unused rsnd_dma_to_ssi() macro ASoC: rsnd: remove duplicate parameter from rsnd_ssi_xxx() sound/soc/sh/rcar/adg.c | 3 +-- sound/soc/sh/rcar/core.c | 35 ++++++++++------------------------- sound/soc/sh/rcar/ctu.c | 4 ++-- sound/soc/sh/rcar/dma.c | 2 +- sound/soc/sh/rcar/dvc.c | 4 ++-- sound/soc/sh/rcar/gen.c | 14 +++++++++----- sound/soc/sh/rcar/mix.c | 4 ++-- sound/soc/sh/rcar/rsnd.h | 11 +++++++---- sound/soc/sh/rcar/src.c | 6 +++--- sound/soc/sh/rcar/ssi.c | 18 +++++++++--------- 10 files changed, 46 insertions(+), 55 deletions(-) Best regards --- Kuninori Morimoto

2 18

[alsa-devel] [PATCH 1/2] ASoC: rt5640: Revise the input pin name of IN1 and IN2 in document of the devicetree
by Oder Chiou 23 Oct '15

23 Oct '15

Signed-off-by: Oder Chiou <oder_chiou(a)realtek.com> --- Documentation/devicetree/bindings/sound/rt5640.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/rt5640.txt b/Documentation/devicetree/bindings/sound/rt5640.txt index bac4d9a..5d062a5 100644 --- a/Documentation/devicetree/bindings/sound/rt5640.txt +++ b/Documentation/devicetree/bindings/sound/rt5640.txt @@ -24,9 +24,9 @@ Pins on the device (for linking into audio routes) for RT5639/RT5640: * DMIC2 * MICBIAS1 * IN1P - * IN1R + * IN1N * IN2P - * IN2R + * IN2N * HPOL * HPOR * LOUTL -- 1.8.1.1.439.g50a6b54

2 3

[alsa-devel] [patch] ASoC: wm8904: harmless underflow in wm8904_put_deemph()
by Dan Carpenter 23 Oct '15

23 Oct '15

We try to check that "deemph" is zero or one, but because of an underflow bug, it can also be negative. It's fine, negative values are handled as non-zero. But it's messy and static checkers complain so let's fix it. Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c index b783743..2aa23f1 100644 --- a/sound/soc/codecs/wm8904.c +++ b/sound/soc/codecs/wm8904.c @@ -534,7 +534,7 @@ static int wm8904_put_deemph(struct snd_kcontrol *kcontrol, { struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct wm8904_priv *wm8904 = snd_soc_codec_get_drvdata(codec); - int deemph = ucontrol->value.integer.value[0]; + unsigned int deemph = ucontrol->value.integer.value[0]; if (deemph > 1) return -EINVAL;

3 2

[alsa-devel] [patch] ASoC: wm8731: harmless underflow in wm8731_put_deemph()
by Dan Carpenter 23 Oct '15

23 Oct '15

The code tries to verify that "deemph" is zero or one, but it fails to account for that it can be negative. It's harmless because negatives are treated the same as one, but we should fix it just to silence the static checker warning. Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c index ace8645..07cf1bd 100644 --- a/sound/soc/codecs/wm8731.c +++ b/sound/soc/codecs/wm8731.c @@ -132,7 +132,7 @@ static int wm8731_put_deemph(struct snd_kcontrol *kcontrol, { struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec); - int deemph = ucontrol->value.integer.value[0]; + unsigned int deemph = ucontrol->value.integer.value[0]; int ret = 0; if (deemph > 1)

3 2

[alsa-devel] [patch] ASoC: wm8960: harmless underflow in wm8960_put_deemph()
by Dan Carpenter 23 Oct '15

23 Oct '15

We should only accept "deemph" values of zero and one, but by mistake we accept negatives as well. It's harmless but let's clean it up anyway. Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c index e3b7d0c..dc47c2f 100644 --- a/sound/soc/codecs/wm8960.c +++ b/sound/soc/codecs/wm8960.c @@ -201,7 +201,7 @@ static int wm8960_put_deemph(struct snd_kcontrol *kcontrol, { struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec); - int deemph = ucontrol->value.integer.value[0]; + unsigned int deemph = ucontrol->value.integer.value[0]; if (deemph > 1) return -EINVAL;

3 2

[alsa-devel] [patch] ASoC: wm8903: harmless underflow in wm8903_put_deemph()
by Dan Carpenter 23 Oct '15

23 Oct '15

Valid values for "deemph" are zero and one, but we accidentally allow negative values as well. It's harmless, but static checkers complain and we may as well clean it up. Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c index b011253..e4cc41e 100644 --- a/sound/soc/codecs/wm8903.c +++ b/sound/soc/codecs/wm8903.c @@ -452,7 +452,7 @@ static int wm8903_put_deemph(struct snd_kcontrol *kcontrol, { struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct wm8903_priv *wm8903 = snd_soc_codec_get_drvdata(codec); - int deemph = ucontrol->value.integer.value[0]; + unsigned int deemph = ucontrol->value.integer.value[0]; int ret = 0; if (deemph > 1)

3 2

[alsa-devel] [patch] ASoC: wm8955: harmless underflow in wm8955_put_deemph()
by Dan Carpenter 23 Oct '15

23 Oct '15

Valid values for "deemph" are zero and one, but we mistakenly allow negative values as well. It's harmless but we may as well clean it up. Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/sound/soc/codecs/wm8955.c b/sound/soc/codecs/wm8955.c index 12e4435..9db00d5 100644 --- a/sound/soc/codecs/wm8955.c +++ b/sound/soc/codecs/wm8955.c @@ -402,7 +402,7 @@ static int wm8955_put_deemph(struct snd_kcontrol *kcontrol, { struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct wm8955_priv *wm8955 = snd_soc_codec_get_drvdata(codec); - int deemph = ucontrol->value.integer.value[0]; + unsigned int deemph = ucontrol->value.integer.value[0]; if (deemph > 1) return -EINVAL;

3 2

[alsa-devel] [patch] ASoC: wm2000: a couple harmless underflows
by Dan Carpenter 23 Oct '15

23 Oct '15

We want these to be zero or one, but by mistake we also accept negative values. It's harmless but we should still clean it up. Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/sound/soc/codecs/wm2000.c b/sound/soc/codecs/wm2000.c index 786abd0..a67ea10 100644 --- a/sound/soc/codecs/wm2000.c +++ b/sound/soc/codecs/wm2000.c @@ -620,7 +620,7 @@ static int wm2000_anc_mode_put(struct snd_kcontrol *kcontrol, { struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct wm2000_priv *wm2000 = dev_get_drvdata(codec->dev); - int anc_active = ucontrol->value.integer.value[0]; + unsigned int anc_active = ucontrol->value.integer.value[0]; int ret; if (anc_active > 1) @@ -653,7 +653,7 @@ static int wm2000_speaker_put(struct snd_kcontrol *kcontrol, { struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct wm2000_priv *wm2000 = dev_get_drvdata(codec->dev); - int val = ucontrol->value.integer.value[0]; + unsigned int val = ucontrol->value.integer.value[0]; int ret; if (val > 1)

3 2

[alsa-devel] [PATCH v2] ASoC: Intel: sst: only use sst-firmware when DW DMAC is available
by Jie Yang 23 Oct '15

23 Oct '15

Currentlly, we use Synopsys DesignWare DMA Controller for baytrail/haswell/broadwell ADSP firmware loading, but for skylake, we don't use it, compiling sst-firmware.c may introduce error when CONFIG_DW_DMAC_CORE is not enabled: sound/built-in.o: In function `sst_dma_new': (.text+0xd7b38): undefined reference to `dw_dma_probe' sound/built-in.o: In function `sst_dma_free': (.text+0xd7c0a): undefined reference to `dw_dma_remove' Here we only compile sst-firmware when CONFIG_DW_DMAC_CORE is selected, to fix the linking error issue. Reported-by: Randy Dunlap <rdunlap(a)infradead.org> Signed-off-by: Jie Yang <yang.jie(a)intel.com> --- sound/soc/intel/common/Makefile | 6 +++++- sound/soc/intel/common/sst-dsp.c | 2 ++ sound/soc/intel/common/sst-dsp.h | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/sound/soc/intel/common/Makefile b/sound/soc/intel/common/Makefile index f24154c..d910558 100644 --- a/sound/soc/intel/common/Makefile +++ b/sound/soc/intel/common/Makefile @@ -1,7 +1,11 @@ -snd-soc-sst-dsp-objs := sst-dsp.o sst-firmware.o +snd-soc-sst-dsp-objs := sst-dsp.o snd-soc-sst-acpi-objs := sst-acpi.o snd-soc-sst-ipc-objs := sst-ipc.o +ifneq ($(CONFIG_DW_DMAC_CORE),) +snd-soc-sst-dsp-objs += sst-firmware.o +endif + obj-$(CONFIG_SND_SOC_INTEL_SST) += snd-soc-sst-dsp.o snd-soc-sst-ipc.o obj-$(CONFIG_SND_SOC_INTEL_SST_ACPI) += snd-soc-sst-acpi.o diff --git a/sound/soc/intel/common/sst-dsp.c b/sound/soc/intel/common/sst-dsp.c index a627236..c9452e0 100644 --- a/sound/soc/intel/common/sst-dsp.c +++ b/sound/soc/intel/common/sst-dsp.c @@ -420,6 +420,7 @@ void sst_dsp_inbox_read(struct sst_dsp *sst, void *message, size_t bytes) } EXPORT_SYMBOL_GPL(sst_dsp_inbox_read); +#if IS_ENABLED(CONFIG_DW_DMAC_CORE) struct sst_dsp *sst_dsp_new(struct device *dev, struct sst_dsp_device *sst_dev, struct sst_pdata *pdata) { @@ -484,6 +485,7 @@ void sst_dsp_free(struct sst_dsp *sst) sst_dma_free(sst->dma); } EXPORT_SYMBOL_GPL(sst_dsp_free); +#endif /* Module information */ MODULE_AUTHOR("Liam Girdwood"); diff --git a/sound/soc/intel/common/sst-dsp.h b/sound/soc/intel/common/sst-dsp.h index 1f45f18..859f0de 100644 --- a/sound/soc/intel/common/sst-dsp.h +++ b/sound/soc/intel/common/sst-dsp.h @@ -216,10 +216,12 @@ struct sst_pdata { void *dsp; }; +#if IS_ENABLED(CONFIG_DW_DMAC_CORE) /* Initialization */ struct sst_dsp *sst_dsp_new(struct device *dev, struct sst_dsp_device *sst_dev, struct sst_pdata *pdata); void sst_dsp_free(struct sst_dsp *sst); +#endif /* SHIM Read / Write */ void sst_dsp_shim_write(struct sst_dsp *sst, u32 offset, u32 value); -- 2.1.4

2 1

[alsa-devel] Applied "ASoC: Intel: switch from ioremap_cache to memremap" to the asoc tree
by Mark Brown 23 Oct '15

23 Oct '15

The patch ASoC: Intel: switch from ioremap_cache to memremap has been applied to the asoc tree at git://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 ba40a854ea4f9d81368dc023bd25ac4073058039 Mon Sep 17 00:00:00 2001 From: Dan Williams <dan.j.williams(a)intel.com> Date: Fri, 9 Oct 2015 18:16:36 -0400 Subject: [PATCH] ASoC: Intel: switch from ioremap_cache to memremap In preparation for deprecating ioremap_cache() convert its usage in skl-nhlt to memremap. Signed-off-by: Dan Williams <dan.j.williams(a)intel.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/intel/skylake/skl-nhlt.c | 10 +++++----- sound/soc/intel/skylake/skl.h | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sound/soc/intel/skylake/skl-nhlt.c b/sound/soc/intel/skylake/skl-nhlt.c index 13036b1..b0c7bd1 100644 --- a/sound/soc/intel/skylake/skl-nhlt.c +++ b/sound/soc/intel/skylake/skl-nhlt.c @@ -25,7 +25,7 @@ static u8 OSC_UUID[16] = {0x6E, 0x88, 0x9F, 0xA6, 0xEB, 0x6C, 0x94, 0x45, #define DSDT_NHLT_PATH "\\_SB.PCI0.HDAS" -void __iomem *skl_nhlt_init(struct device *dev) +void *skl_nhlt_init(struct device *dev) { acpi_handle handle; union acpi_object *obj; @@ -40,17 +40,17 @@ void __iomem *skl_nhlt_init(struct device *dev) if (obj && obj->type == ACPI_TYPE_BUFFER) { nhlt_ptr = (struct nhlt_resource_desc *)obj->buffer.pointer; - return ioremap_cache(nhlt_ptr->min_addr, nhlt_ptr->length); + return memremap(nhlt_ptr->min_addr, nhlt_ptr->length, + MEMREMAP_WB); } dev_err(dev, "device specific method to extract NHLT blob failed\n"); return NULL; } -void skl_nhlt_free(void __iomem *addr) +void skl_nhlt_free(void *addr) { - iounmap(addr); - addr = NULL; + memunmap(addr); } static struct nhlt_specific_cfg *skl_get_specific_cfg( diff --git a/sound/soc/intel/skylake/skl.h b/sound/soc/intel/skylake/skl.h index e980d78..dd2e79a 100644 --- a/sound/soc/intel/skylake/skl.h +++ b/sound/soc/intel/skylake/skl.h @@ -62,7 +62,7 @@ struct skl { unsigned int init_failed:1; /* delayed init failed */ struct platform_device *dmic_dev; - void __iomem *nhlt; /* nhlt ptr */ + void *nhlt; /* nhlt ptr */ struct skl_sst *skl_sst; /* sst skl ctx */ struct skl_dsp_resource resource; @@ -83,8 +83,8 @@ struct skl_dma_params { int skl_platform_unregister(struct device *dev); int skl_platform_register(struct device *dev); -void __iomem *skl_nhlt_init(struct device *dev); -void skl_nhlt_free(void __iomem *addr); +void *skl_nhlt_init(struct device *dev); +void skl_nhlt_free(void *addr); struct nhlt_specific_cfg *skl_get_ep_blob(struct skl *skl, u32 instance, u8 link_type, u8 s_fmt, u8 no_ch, u32 s_rate, u8 dirn); -- 2.6.1

1 0

[alsa-devel] [PATCH v2 0/3] ASoC: dapm: add PGA kcontrol, dai_link enhancement &
by Vinod Koul 23 Oct '15

23 Oct '15

This adds few small patches in DAPM which we require for Intel DSPs First adds support for having kcontrol on PGAs. This is required for modules which are modelled as PGA but can be user configurable. Next is new callback on snd_soc_dai_link_events(). Lastly a macro to return widget associated with a kcontrol Jeeja KP (2): ASoC: dapm: Add kcontrol support for PGAs ASoC: dapm: Add startup & shutdown for dai_links Mythri P K (1): ASoC: dapm: Add snd_soc_dapm_kcontrol_widget() include/sound/soc-dapm.h | 3 +++ sound/soc/soc-dapm.c | 59 +++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 56 insertions(+), 6 deletions(-) -- 1.9.1

2 4

[alsa-devel] [PATCH 0/3] ASoC: dapm: add PGA kcontrol, dai_link enhancement &
by Vinod Koul 23 Oct '15

23 Oct '15

This adds few small patches in DAPM which we require for Intel DSPs Firsts adds support for having kcontrol on PGAs. This is required for modules which are modelled as PGA but cna be user configurable. Next is new callback on snd_soc_dai_link_events(). Lastly a macro to return widget associated with a kcontrol Jeeja KP (2): ASoC: dapm: Add kcontrol support for PGAs ASoC: dapm: Add startup & shutdown for dai_links Mythri P K (1): ASoC: dapm: Add snd_soc_dapm_kcontrol_widget() include/sound/soc-dapm.h | 3 +++ sound/soc/soc-dapm.c | 64 ++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 60 insertions(+), 7 deletions(-) -- 1.9.1

3 7

[alsa-devel] [PATCH 1/2] ASoC: nau8825: Add FLL configuration
by Ben Zhang 23 Oct '15

23 Oct '15

snd_soc_codec_driver.set_pll is implemented to configure the FLL. The codec internal SYSCLK can be from either the MCLK pin directly, or the FLL. This is configured by snd_soc_codec_driver.set_pll. Signed-off-by: Ben Zhang <benzh(a)chromium.org> --- sound/soc/codecs/nau8825.c | 162 +++++++++++++++++++++++++++++++++++++++++++++ sound/soc/codecs/nau8825.h | 28 ++++++-- 2 files changed, 185 insertions(+), 5 deletions(-) diff --git a/sound/soc/codecs/nau8825.c b/sound/soc/codecs/nau8825.c index 5c1badf..010f50b 100644 --- a/sound/soc/codecs/nau8825.c +++ b/sound/soc/codecs/nau8825.c @@ -29,6 +29,58 @@ #include "nau8825.h" +#define NAU_FREF_MAX 13500000 +#define NAU_FVCO_MAX 100000000 +#define NAU_FVCO_MIN 90000000 + +struct nau88xx_fll { + int mclk_src; + int ratio; + int fll_frac; + int fll_int; + int clk_ref_div; +}; + +struct nau88xx_fll_attr { + unsigned int param; + unsigned int val; +}; + +/* scaling for mclk from sysclk_src output */ +static const struct nau88xx_fll_attr mclk_src_scaling[] = { + { 1, 0x0 }, + { 2, 0x2 }, + { 4, 0x3 }, + { 8, 0x4 }, + { 16, 0x5 }, + { 32, 0x6 }, + { 3, 0x7 }, + { 6, 0xa }, + { 12, 0xb }, + { 24, 0xc }, + { 48, 0xd }, + { 96, 0xe }, + { 5, 0xf }, +}; + +/* ratio for input clk freq */ +static const struct nau88xx_fll_attr fll_ratio[] = { + { 512000, 0x01 }, + { 256000, 0x02 }, + { 128000, 0x04 }, + { 64000, 0x08 }, + { 32000, 0x10 }, + { 8000, 0x20 }, + { 4000, 0x40 }, +}; + +static const struct nau88xx_fll_attr fll_pre_scalar[] = { + { 1, 0x0 }, + { 2, 0x1 }, + { 4, 0x2 }, + { 8, 0x3 }, +}; + static const struct reg_default nau8825_reg_defaults[] = { { NAU8825_REG_ENA_CTRL, 0x00ff }, { NAU8825_REG_CLK_DIVIDER, 0x0050 }, @@ -808,6 +860,115 @@ static int nau8825_codec_probe(struct snd_soc_codec *codec) return 0; } +/** + * nau88xx_calc_fll_param - Calculate FLL parameters. + * @fll_in: external clock provided to codec. + * @fs: sampling rate. + * @fll_param: Pointer to structure of FLL parameters. + * + * Calculate FLL parameters to configure codec. + * + * Returns 0 for success or negative error code. + */ +static int nau88xx_calc_fll_param(unsigned int fll_in, unsigned int fs, + struct nau88xx_fll *fll_param) +{ + u64 fref, fvco, fll_input; + int i; + + /* Ensure the reference clock frequency (FREF) is <= 13.5MHz by dividing + * freq_in by 1, 2, 4, or 8 using FLL pre-scalar. + * FREF = freq_in / NAU8825_FLL_REF_DIV_MASK + */ + for (i = 0; i < ARRAY_SIZE(fll_pre_scalar); i++) { + fref = fll_in / fll_pre_scalar[i].param; + if (fref <= NAU_FREF_MAX) + break; + } + if (i == ARRAY_SIZE(fll_pre_scalar)) + return -EINVAL; + fll_param->clk_ref_div = fll_pre_scalar[i].val; + + /* Choose the FLL ratio based on FREF */ + for (i = 0; i < ARRAY_SIZE(fll_ratio); i++) { + if (fref >= fll_ratio[i].param) + break; + } + if (i == ARRAY_SIZE(fll_ratio)) + return -EINVAL; + fll_param->ratio = fll_ratio[i].val; + + /* Calculate the frequency of DCO (FDCO) given freq_out = 256 * Fs. + * FDCO must be within the 90MHz - 100MHz or the FFL cannot be + * guaranteed across the full range of operation. + * FDCO = freq_out * 2 * mclk_src_scaling + */ + for (i = 0; i < ARRAY_SIZE(mclk_src_scaling); i++) { + fvco = 256 * fs * 2 * mclk_src_scaling[i].param; + if (NAU_FVCO_MIN < fvco && fvco < NAU_FVCO_MAX) + break; + } + if (i == ARRAY_SIZE(mclk_src_scaling)) + return -EINVAL; + fll_param->mclk_src = mclk_src_scaling[i].val; + + /* Calculate the FLL 10-bit integer input and the FLL 16-bit fractional + * input based on FDCO, FREF and FLL ratio. + */ + fll_input = (fvco << 16) / (fref * fll_param->ratio); + fll_param->fll_int = fll_input >> 16; + fll_param->fll_frac = fll_input & 0xFFFF; + return 0; +} + +static void nau88xx_fll_apply(struct nau8825 *nau8825, + struct nau88xx_fll *fll_param) +{ + regmap_update_bits(nau8825->regmap, NAU8825_REG_CLK_DIVIDER, + NAU8825_CLK_MCLK_SRC_MASK, fll_param->mclk_src); + regmap_update_bits(nau8825->regmap, NAU8825_REG_FLL1, + NAU8825_FLL_RATIO_MASK, fll_param->ratio); + /* FLL 16-bit fractional input */ + regmap_write(nau8825->regmap, NAU8825_REG_FLL2, fll_param->fll_frac); + /* FLL 10-bit integer input */ + regmap_update_bits(nau8825->regmap, NAU8825_REG_FLL3, + NAU8825_FLL_INTEGER_MASK, fll_param->fll_int); + /* FLL pre-scaler */ + regmap_update_bits(nau8825->regmap, NAU8825_REG_FLL4, + NAU8825_FLL_REF_DIV_MASK, fll_param->clk_ref_div); + /* select divided VCO input */ + regmap_update_bits(nau8825->regmap, NAU8825_REG_FLL5, + NAU8825_FLL_FILTER_SW_MASK, 0x0000); + /* FLL sigma delta modulator enable */ + regmap_update_bits(nau8825->regmap, NAU8825_REG_FLL6, + NAU8825_SDM_EN_MASK, NAU8825_SDM_EN); +} + +/* freq_out must be 256*Fs in order to achieve the best performance */ +static int nau8825_set_pll(struct snd_soc_codec *codec, int pll_id, int source, + unsigned int freq_in, unsigned int freq_out) +{ + struct nau8825 *nau8825 = snd_soc_codec_get_drvdata(codec); + struct nau88xx_fll fll_param; + int ret, fs; + + fs = freq_out / 256; + ret = nau88xx_calc_fll_param(freq_in, fs, &fll_param); + if (ret < 0) { + dev_err(codec->dev, "Unsupported input clock %d\n", freq_in); + return ret; + } + dev_dbg(codec->dev, "mclk_src=%x ratio=%x fll_frac=%x fll_int=%x clk_ref_div=%x\n", + fll_param.mclk_src, fll_param.ratio, fll_param.fll_frac, + fll_param.fll_int, fll_param.clk_ref_div); + + nau88xx_fll_apply(nau8825, &fll_param); + mdelay(2); + regmap_update_bits(nau8825->regmap, NAU8825_REG_CLK_DIVIDER, + NAU8825_CLK_SRC_MASK, NAU8825_CLK_SRC_VCO); + return 0; +} + static int nau8825_configure_sysclk(struct nau8825 *nau8825, int clk_id, unsigned int freq) { @@ -920,6 +1081,7 @@ static int nau8825_set_bias_level(struct snd_soc_codec *codec, static struct snd_soc_codec_driver nau8825_codec_driver = { .probe = nau8825_codec_probe, .set_sysclk = nau8825_set_sysclk, + .set_pll = nau8825_set_pll, .set_bias_level = nau8825_set_bias_level, .suspend_bias_off = true, diff --git a/sound/soc/codecs/nau8825.h b/sound/soc/codecs/nau8825.h index 8774923..dff8edb 100644 --- a/sound/soc/codecs/nau8825.h +++ b/sound/soc/codecs/nau8825.h @@ -101,13 +101,31 @@ #define NAU8825_ENABLE_SAR_SFT 1 /* CLK_DIVIDER (0x3) */ -#define NAU8825_CLK_SRC_SFT 15 -#define NAU8825_CLK_SRC_MASK (1 << NAU8825_CLK_SRC_SFT) -#define NAU8825_CLK_SRC_VCO (1 << NAU8825_CLK_SRC_SFT) -#define NAU8825_CLK_SRC_MCLK (0 << NAU8825_CLK_SRC_SFT) +#define NAU8825_CLK_SRC_SFT 15 +#define NAU8825_CLK_SRC_MASK (1 << NAU8825_CLK_SRC_SFT) +#define NAU8825_CLK_SRC_VCO (1 << NAU8825_CLK_SRC_SFT) +#define NAU8825_CLK_SRC_MCLK (0 << NAU8825_CLK_SRC_SFT) +#define NAU8825_CLK_MCLK_SRC_MASK (0xf << 0) + +/* FLL1 (0x04) */ +#define NAU8825_FLL_RATIO_MASK (0x7f << 0) + +/* FLL3 (0x06) */ +#define NAU8825_FLL_INTEGER_MASK (0x3ff << 0) + +/* FLL4 (0x07) */ +#define NAU8825_FLL_REF_DIV_MASK (0x3 << 10) + +/* FLL5 (0x08) */ +#define NAU8825_FLL_FILTER_SW_MASK (0x1 << 14) /* FLL6 (0x9) */ -#define NAU8825_DCO_EN (1 << 15) +#define NAU8825_DCO_EN_MASK (0x1 << 15) +#define NAU8825_DCO_EN (0x1 << 15) +#define NAU8825_DCO_DIS (0x0 << 15) +#define NAU8825_SDM_EN_MASK (0x1 << 14) +#define NAU8825_SDM_EN (0x1 << 14) +#define NAU8825_SDM_DIS (0x0 << 14) /* HSD_CTRL (0xc) */ #define NAU8825_HSD_AUTO_MODE (1 << 6) -- 2.6.0.rc2.230.g3dd15c0

3 7

[alsa-devel] [PATCH] ASoC: Document DAI signal polarity
by Anatol Pomozov 23 Oct '15

23 Oct '15

Currently there is no clear definition of what FSYNC polarity is. Different drivers use its own definition of what is "normal" and what is "inverted" fsync. This leads to compatibility problems between drivers. For example TegraX1 driver assumes that DSP-A format with frames starting at rising FSYNC edge has "inverted" polarity, while RT5677 assumes it is "normal" polarity. Explicitly specify meaning of BCLK/FSYNC polarity to avoid future compatibility problems. Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> --- include/sound/soc-dai.h | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index 2df96b1..91e2e61 100644 --- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h @@ -48,10 +48,25 @@ struct snd_compr_stream; #define SND_SOC_DAIFMT_GATED (0 << 4) /* clock is gated */ /* - * DAI hardware signal inversions. + * DAI hardware signal polarity. * * Specifies whether the DAI can also support inverted clocks for the specified * format. + * + * BCLK: + * - "normal" polarity means signal is available at rising edge of BCLK + * - "inverted" polarity means signal is available at falling edge of BCLK + * + * FSYNC "normal" polarity depends on the frame format: + * - I2S: frame consists of left then right channel data. Left channel starts + * with falling FSYNC edge, right channel starts with rising FSYNC edge. + * - Left/Right Justified: frame consists of left then right channel data. + * Left channel starts with rising FSYNC edge, right channel starts with + * falling FSYNC edge. + * - DSP A/B: Frame starts with rising FSYNC edge. + * - AC97: Frame starts with rising FSYNC edge. + * + * "Negative" FSYNC polarity is the one opposite of "normal" polarity. */ #define SND_SOC_DAIFMT_NB_NF (0 << 8) /* normal bit clock + frame */ #define SND_SOC_DAIFMT_NB_IF (2 << 8) /* normal BCLK + inv FRM */ -- 2.6.0.rc2.230.g3dd15c0

3 2

[alsa-devel] Applied "ASoC: fsl-asoc-card: add AC'97 support" to the asoc tree
by Mark Brown 23 Oct '15

23 Oct '15

The patch ASoC: fsl-asoc-card: add AC'97 support has been applied to the asoc tree at git://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 50760cad9de969fe85b24465afe6396b8bbc6a3f Mon Sep 17 00:00:00 2001 From: "Maciej S. Szmigiero" <mail(a)maciej.szmigiero.name> Date: Sat, 19 Sep 2015 02:00:25 +0200 Subject: [PATCH] ASoC: fsl-asoc-card: add AC'97 support Add AC'97 support to fsl-asoc-card using generic ASoC AC'97 CODEC. The SSI controller will silently enable any TX AC'97 slots that have their bits set in SLOTREQ received from CODEC and then will redirect some of playback samples there. That's why it is important to make sure that any of CODEC playback slots that can pull samples are set to slots 3/4 (standard PCM playback slots). Currently, this applies to S/PDIF slots as they were seen to pull samples sometimes even with S/PDIF output being disabled. Signed-off-by: Maciej Szmigiero <mail(a)maciej.szmigiero.name> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- .../devicetree/bindings/sound/fsl-asoc-card.txt | 10 +- sound/soc/fsl/fsl-asoc-card.c | 140 ++++++++++++++++----- 2 files changed, 116 insertions(+), 34 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/fsl-asoc-card.txt b/Documentation/devicetree/bindings/sound/fsl-asoc-card.txt index a96774c..ce55c0a 100644 --- a/Documentation/devicetree/bindings/sound/fsl-asoc-card.txt +++ b/Documentation/devicetree/bindings/sound/fsl-asoc-card.txt @@ -13,13 +13,15 @@ So having this generic sound card allows all Freescale SoC users to benefit from the simplification of a new card support and the capability of the wide sample rates support through ASRC. -Note: The card is initially designed for those sound cards who use I2S and - PCM DAI formats. However, it'll be also possible to support those non - I2S/PCM type sound cards, such as S/PDIF audio and HDMI audio, as long - as the driver has been properly upgraded. +Note: The card is initially designed for those sound cards who use AC'97, I2S + and PCM DAI formats. However, it'll be also possible to support those non + AC'97/I2S/PCM type sound cards, such as S/PDIF audio and HDMI audio, as + long as the driver has been properly upgraded. The compatible list for this generic sound card currently: + "fsl,imx-audio-ac97" + "fsl,imx-audio-cs42888" "fsl,imx-audio-wm8962" diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c index 5aeb6ed..33628a0 100644 --- a/sound/soc/fsl/fsl-asoc-card.c +++ b/sound/soc/fsl/fsl-asoc-card.c @@ -14,6 +14,9 @@ #include <linux/i2c.h> #include <linux/module.h> #include <linux/of_platform.h> +#if IS_ENABLED(CONFIG_SND_AC97_CODEC) +#include <sound/ac97_codec.h> +#endif #include <sound/pcm_params.h> #include <sound/soc.h> @@ -115,6 +118,11 @@ static const struct snd_soc_dapm_widget fsl_asoc_card_dapm_widgets[] = { SND_SOC_DAPM_MIC("DMIC", NULL), }; +static bool fsl_asoc_card_is_ac97(struct fsl_asoc_card_priv *priv) +{ + return priv->dai_fmt == SND_SOC_DAIFMT_AC97; +} + static int fsl_asoc_card_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { @@ -133,7 +141,9 @@ static int fsl_asoc_card_hw_params(struct snd_pcm_substream *substream, * set_bias_level(), bypass the remaining settings in hw_params(). * Note: (dai_fmt & CBM_CFM) includes CBM_CFM and CBM_CFS. */ - if (priv->card.set_bias_level && priv->dai_fmt & SND_SOC_DAIFMT_CBM_CFM) + if ((priv->card.set_bias_level && + priv->dai_fmt & SND_SOC_DAIFMT_CBM_CFM) || + fsl_asoc_card_is_ac97(priv)) return 0; /* Specific configurations of DAIs starts from here */ @@ -300,7 +310,7 @@ static int fsl_asoc_card_audmux_init(struct device_node *np, ext_port--; /* - * Use asynchronous mode (6 wires) for all cases. + * Use asynchronous mode (6 wires) for all cases except AC97. * If only 4 wires are needed, just set SSI into * synchronous mode and enable 4 PADs in IOMUX. */ @@ -346,15 +356,30 @@ static int fsl_asoc_card_audmux_init(struct device_node *np, IMX_AUDMUX_V2_PTCR_TCLKDIR; break; default: - return -EINVAL; + if (!fsl_asoc_card_is_ac97(priv)) + return -EINVAL; + } + + if (fsl_asoc_card_is_ac97(priv)) { + int_ptcr = IMX_AUDMUX_V2_PTCR_SYN | + IMX_AUDMUX_V2_PTCR_TCSEL(ext_port) | + IMX_AUDMUX_V2_PTCR_TCLKDIR; + ext_ptcr = IMX_AUDMUX_V2_PTCR_SYN | + IMX_AUDMUX_V2_PTCR_TFSEL(int_port) | + IMX_AUDMUX_V2_PTCR_TFSDIR; } /* Asynchronous mode can not be set along with RCLKDIR */ - ret = imx_audmux_v2_configure_port(int_port, 0, - IMX_AUDMUX_V2_PDCR_RXDSEL(ext_port)); - if (ret) { - dev_err(dev, "audmux internal port setup failed\n"); - return ret; + if (!fsl_asoc_card_is_ac97(priv)) { + unsigned int pdcr = + IMX_AUDMUX_V2_PDCR_RXDSEL(ext_port); + + ret = imx_audmux_v2_configure_port(int_port, 0, + pdcr); + if (ret) { + dev_err(dev, "audmux internal port setup failed\n"); + return ret; + } } ret = imx_audmux_v2_configure_port(int_port, int_ptcr, @@ -364,11 +389,16 @@ static int fsl_asoc_card_audmux_init(struct device_node *np, return ret; } - ret = imx_audmux_v2_configure_port(ext_port, 0, - IMX_AUDMUX_V2_PDCR_RXDSEL(int_port)); - if (ret) { - dev_err(dev, "audmux external port setup failed\n"); - return ret; + if (!fsl_asoc_card_is_ac97(priv)) { + unsigned int pdcr = + IMX_AUDMUX_V2_PDCR_RXDSEL(int_port); + + ret = imx_audmux_v2_configure_port(ext_port, 0, + pdcr); + if (ret) { + dev_err(dev, "audmux external port setup failed\n"); + return ret; + } } ret = imx_audmux_v2_configure_port(ext_port, ext_ptcr, @@ -389,6 +419,23 @@ static int fsl_asoc_card_late_probe(struct snd_soc_card *card) struct device *dev = card->dev; int ret; + if (fsl_asoc_card_is_ac97(priv)) { +#if IS_ENABLED(CONFIG_SND_AC97_CODEC) + struct snd_soc_codec *codec = card->rtd[0].codec; + struct snd_ac97 *ac97 = snd_soc_codec_get_drvdata(codec); + + /* + * Use slots 3/4 for S/PDIF so SSI won't try to enable + * other slots and send some samples there + * due to SLOTREQ bits for S/PDIF received from codec + */ + snd_ac97_update_bits(ac97, AC97_EXTENDED_STATUS, + AC97_EA_SPSA_SLOT_MASK, AC97_EA_SPSA_3_4); +#endif + + return 0; + } + ret = snd_soc_dai_set_sysclk(codec_dai, codec_priv->mclk_id, codec_priv->mclk_freq, SND_SOC_CLOCK_IN); if (ret) { @@ -407,7 +454,6 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) struct platform_device *cpu_pdev; struct fsl_asoc_card_priv *priv; struct i2c_client *codec_dev; - struct clk *codec_clk; const char *codec_dai_name; u32 width; int ret; @@ -420,9 +466,8 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) /* Give a chance to old DT binding */ if (!cpu_np) cpu_np = of_parse_phandle(np, "ssi-controller", 0); - codec_np = of_parse_phandle(np, "audio-codec", 0); - if (!cpu_np || !codec_np) { - dev_err(&pdev->dev, "phandle missing or invalid\n"); + if (!cpu_np) { + dev_err(&pdev->dev, "CPU phandle missing or invalid\n"); ret = -EINVAL; goto fail; } @@ -434,22 +479,24 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) goto fail; } - codec_dev = of_find_i2c_device_by_node(codec_np); - if (!codec_dev) { - dev_err(&pdev->dev, "failed to find codec platform device\n"); - ret = -EINVAL; - goto fail; - } + codec_np = of_parse_phandle(np, "audio-codec", 0); + if (codec_np) + codec_dev = of_find_i2c_device_by_node(codec_np); + else + codec_dev = NULL; asrc_np = of_parse_phandle(np, "audio-asrc", 0); if (asrc_np) asrc_pdev = of_find_device_by_node(asrc_np); /* Get the MCLK rate only, and leave it controlled by CODEC drivers */ - codec_clk = clk_get(&codec_dev->dev, NULL); - if (!IS_ERR(codec_clk)) { - priv->codec_priv.mclk_freq = clk_get_rate(codec_clk); - clk_put(codec_clk); + if (codec_dev) { + struct clk *codec_clk = clk_get(&codec_dev->dev, NULL); + + if (!IS_ERR(codec_clk)) { + priv->codec_priv.mclk_freq = clk_get_rate(codec_clk); + clk_put(codec_clk); + } } /* Default sample rate and format, will be updated in hw_params() */ @@ -486,11 +533,21 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) priv->codec_priv.fll_id = WM8960_SYSCLK_AUTO; priv->codec_priv.pll_id = WM8960_SYSCLK_AUTO; priv->dai_fmt |= SND_SOC_DAIFMT_CBM_CFM; + } else if (of_device_is_compatible(np, "fsl,imx-audio-ac97")) { + codec_dai_name = "ac97-hifi"; + priv->card.set_bias_level = NULL; + priv->dai_fmt = SND_SOC_DAIFMT_AC97; } else { dev_err(&pdev->dev, "unknown Device Tree compatible\n"); return -EINVAL; } + if (!fsl_asoc_card_is_ac97(priv) && !codec_dev) { + dev_err(&pdev->dev, "failed to find codec device\n"); + ret = -EINVAL; + goto asrc_fail; + } + /* Common settings for corresponding Freescale CPU DAI driver */ if (strstr(cpu_np->name, "ssi")) { /* Only SSI needs to configure AUDMUX */ @@ -507,7 +564,9 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) priv->cpu_priv.sysclk_id[0] = FSL_SAI_CLK_MAST1; } - sprintf(priv->name, "%s-audio", codec_dev->name); + snprintf(priv->name, sizeof(priv->name), "%s-audio", + fsl_asoc_card_is_ac97(priv) ? "ac97" : + codec_dev->name); /* Initialize sound card */ priv->pdev = pdev; @@ -531,8 +590,26 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) /* Normal DAI Link */ priv->dai_link[0].cpu_of_node = cpu_np; - priv->dai_link[0].codec_of_node = codec_np; priv->dai_link[0].codec_dai_name = codec_dai_name; + + if (!fsl_asoc_card_is_ac97(priv)) + priv->dai_link[0].codec_of_node = codec_np; + else { + u32 idx; + + ret = of_property_read_u32(cpu_np, "cell-index", &idx); + if (ret) { + dev_err(&pdev->dev, + "cannot get CPU index property\n"); + goto asrc_fail; + } + + priv->dai_link[0].codec_name = + devm_kasprintf(&pdev->dev, GFP_KERNEL, + "ac97-codec.%u", + (unsigned int)idx); + } + priv->dai_link[0].platform_of_node = cpu_np; priv->dai_link[0].dai_fmt = priv->dai_fmt; priv->card.num_links = 1; @@ -543,6 +620,8 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) priv->dai_link[1].platform_of_node = asrc_np; priv->dai_link[2].codec_dai_name = codec_dai_name; priv->dai_link[2].codec_of_node = codec_np; + priv->dai_link[2].codec_name = + priv->dai_link[0].codec_name; priv->dai_link[2].cpu_of_node = cpu_np; priv->dai_link[2].dai_fmt = priv->dai_fmt; priv->card.num_links = 3; @@ -578,14 +657,15 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) asrc_fail: of_node_put(asrc_np); -fail: of_node_put(codec_np); +fail: of_node_put(cpu_np); return ret; } static const struct of_device_id fsl_asoc_card_dt_ids[] = { + { .compatible = "fsl,imx-audio-ac97", }, { .compatible = "fsl,imx-audio-cs42888", }, { .compatible = "fsl,imx-audio-sgtl5000", }, { .compatible = "fsl,imx-audio-wm8962", }, -- 2.6.1

1 0

[alsa-devel] [PATCH] ASoC: rt5645: Add dmi "Google Reks" for chrome
by John Lin 23 Oct '15

23 Oct '15

Signed-off-by: John Lin <john.lin(a)realtek.com> --- sound/soc/codecs/rt5645.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index b0d96b6..84c5261 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -3212,6 +3212,13 @@ static const struct dmi_system_id dmi_platform_intel_braswell[] = { DMI_MATCH(DMI_PRODUCT_NAME, "Ultima"), }, }, + { + .ident = "Google Reks", + .callback = strago_quirk_cb, + .matches = { + DMI_MATCH(DMI_PRODUCT_NAME, "Reks"), + }, + }, { } }; -- 1.8.1.1.439.g50a6b54

2 3

[alsa-devel] [RESEND PATCH v3 0/2] ASoC: atmel-classd: add driver for Atmel CLASSD
by Songjun Wu 23 Oct '15

23 Oct '15

The Audio Class D Amplifier driver includes two parts. 1) Driver code to implement the Audio Class D Amplifier function. 2) Device tree binding document, it describes how to add the Audio Class D Amplifier in device tree. Changes in v3: - Remove '.owner' field in variable 'atmel_classd_driver', since the core will do it. - Correct 'IS_ERR(dd->aclk)' to 'IS_ERR(dd->gclk)', when geting the clock 'dd->gclk'. Changes in v2: - Change the "Mono", "Swap" and "Deemphasis" controls to "Mono Switch", "Swap Switch" and "Deemphasis Switch". - Merge "EQ Bass", "EQ Medium" and "EQ Treble" controls into one "EQ" control. - Change the "single-ended" and "differential" to "Single ended", "Differential". - Merge separate left and right controls into one single stereo control. - Add a warning if the user trys to specify an invalid value in function "atmel_classd_codec_probe". - Use the "dev_get_regmap()" in function "atmel_classd_codec_get_remap". - Check for errors when invoking the "clk_prepare_enable". - Remove the "dev_info" in function "atmel_classd_probe". - Add some code to create a sound card in function "atmel_classd_probe". - Remove the DT node "Sound" and the related code. - Delete the device node "Sound" in dts. Songjun Wu (2): ASoC: atmel-classd: add the Audio Class D Amplifier ASoC: atmel-classd: DT binding for Class D audio amplifier driver .../devicetree/bindings/sound/atmel-classd.txt | 52 ++ sound/soc/atmel/Kconfig | 9 + sound/soc/atmel/Makefile | 2 + sound/soc/atmel/atmel-classd.c | 679 ++++++++++++++++++++ sound/soc/atmel/atmel-classd.h | 120 ++++ 5 files changed, 862 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/atmel-classd.txt create mode 100644 sound/soc/atmel/atmel-classd.c create mode 100644 sound/soc/atmel/atmel-classd.h -- 1.7.9.5

2 2

[alsa-devel] Applied "ASoC: atmel-classd: DT binding for Class D audio amplifier driver" to the asoc tree
by Mark Brown 23 Oct '15

23 Oct '15

The patch ASoC: atmel-classd: DT binding for Class D audio amplifier driver has been applied to the asoc tree at git://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 391ac3ef50b9ec575c4d5c6f055efe5096ac1957 Mon Sep 17 00:00:00 2001 From: Songjun Wu <songjun.wu(a)atmel.com> Date: Thu, 8 Oct 2015 18:13:32 +0800 Subject: [PATCH] ASoC: atmel-classd: DT binding for Class D audio amplifier driver DT binding documentation for this new ASoC driver. Signed-off-by: Songjun Wu <songjun.wu(a)atmel.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- .../devicetree/bindings/sound/atmel-classd.txt | 52 ++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/atmel-classd.txt diff --git a/Documentation/devicetree/bindings/sound/atmel-classd.txt b/Documentation/devicetree/bindings/sound/atmel-classd.txt new file mode 100644 index 0000000..0018451 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/atmel-classd.txt @@ -0,0 +1,52 @@ +* Atmel ClassD driver under ALSA SoC architecture + +Required properties: +- compatible + Should be "atmel,sama5d2-classd". +- reg + Should contain ClassD registers location and length. +- interrupts + Should contain the IRQ line for the ClassD. +- dmas + One DMA specifiers as described in atmel-dma.txt and dma.txt files. +- dma-names + Must be "tx". +- clock-names + Tuple listing input clock names. + Required elements: "pclk", "gclk" and "aclk". +- clocks + Please refer to clock-bindings.txt. + +Optional properties: +- pinctrl-names, pinctrl-0 + Please refer to pinctrl-bindings.txt. +- atmel,model + The user-visible name of this sound complex. + The default value is "CLASSD". +- atmel,pwm-type + PWM modulation type, "single" or "diff". + The default value is "single". +- atmel,non-overlap-time + Set non-overlapping time, the unit is nanosecond(ns). + There are four values, + <5>, <10>, <15>, <20>, the default value is <10>. + Non-overlapping will be disabled if not specified. + +Example: +classd: classd@fc048000 { + compatible = "atmel,sama5d2-classd"; + reg = <0xfc048000 0x100>; + interrupts = <59 IRQ_TYPE_LEVEL_HIGH 7>; + dmas = <&dma0 + (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) + | AT91_XDMAC_DT_PERID(47))>; + dma-names = "tx"; + clocks = <&classd_clk>, <&classd_gclk>, <&audio_pll_pmc>; + clock-names = "pclk", "gclk", "aclk"; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_classd_default>; + atmel,model = "classd @ SAMA5D2-Xplained"; + atmel,pwm-type = "diff"; + atmel,non-overlap-time = <10>; +}; -- 2.6.1

1 0

[alsa-devel] [PATCH v2] ASoC: Intel: Skylake: Convert to devm_snd_soc_register_card
by Axel Lin 23 Oct '15

23 Oct '15

Signed-off-by: Axel Lin <axel.lin(a)ingics.com> --- sound/soc/intel/boards/skl_rt286.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/sound/soc/intel/boards/skl_rt286.c b/sound/soc/intel/boards/skl_rt286.c index 488c98e..a73a431 100644 --- a/sound/soc/intel/boards/skl_rt286.c +++ b/sound/soc/intel/boards/skl_rt286.c @@ -240,18 +240,11 @@ static int skylake_audio_probe(struct platform_device *pdev) { skylake_rt286.dev = &pdev->dev; - return snd_soc_register_card(&skylake_rt286); -} - -static int skylake_audio_remove(struct platform_device *pdev) -{ - snd_soc_unregister_card(&skylake_rt286); - return 0; + return devm_snd_soc_register_card(&pdev->dev, &skylake_rt286); } static struct platform_driver skylake_audio = { .probe = skylake_audio_probe, - .remove = skylake_audio_remove, .driver = { .name = "skl_alc286s_i2s", }, -- 2.1.4

2 1

[alsa-devel] NULL pointer deref when reloading snd_soc_simple_card
by Felipe Balbi 22 Oct '15

22 Oct '15

Hi, I just triggered a NULL point deref with the following commands running on AM437x SK board. This is with v4.3-rc6: modprobe -r snd_soc_simple_card sleep 1 modprobe snd_soc_simple_card sleep 1 details below: [ 228.020921] Unable to handle kernel NULL pointer dereference at virtual address 000000f8 [ 228.029546] pgd = ed4bc000 [ 228.032375] [000000f8] *pgd=00000000 [ 228.036154] Internal error: Oops: 5 [#1] SMP ARM [ 228.040968] Modules linked in: snd_soc_simple_card(+) matrix_keypad matrix_keymap pwm_bl xhci_plat_hcd xhci_hcd usbcore joydev m25p80 spi_nor lis3lv02d_i2c lis3lv02d input_polldev cpufreq_dt thermal_sys hwmon dwc3_omap extcon tps65218_pwrbutton omap_wdt spi_ti_qspi evdev rtc_omap leds_gpio led_class dwc3 udc_core usb_common omapfb cfbfillrect cfbimgblt cfbcopyarea panel_dpi snd_soc_tlv320aic3x snd_soc_davinci_mcasp snd_soc_edma snd_soc_omap snd_soc_core omapdss snd_compress snd_pcm_dmaengine snd_pcm pwm_tiecap snd_timer snd soundcore phy_omap_usb2 autofs4 [last unloaded: snd_soc_simple_card] [ 228.096008] CPU: 0 PID: 710 Comm: modprobe Not tainted 4.3.0-rc6-00001-gada6475ae6e4 #97 [ 228.104436] Hardware name: Generic AM43 (Flattened Device Tree) [ 228.110608] task: ed4b9140 ti: ed52e000 task.ti: ed52e000 [ 228.116370] PC is at dapm_wcache_lookup+0x50/0x7c [snd_soc_core] [ 228.122664] LR is at dapm_wcache_lookup+0x38/0x7c [snd_soc_core] [ 228.128922] pc : [<bf16dd2c>] lr : [<bf16dd14>] psr: a0070013 [ 228.128922] sp : ed52fba8 ip : 00000005 fp : 00000000 [ 228.140883] r10: bf17d238 r9 : bf1f138c r8 : bf1f616c [ 228.146327] r7 : bf1f138c r6 : bf1f616c r5 : ee6f5158 r4 : 000000f4 [ 228.153126] r3 : 00000100 r2 : 00000052 r1 : ed1057c1 r0 : ffffffff [ 228.159925] Flags: NzCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment none [ 228.167354] Control: 10c5387d Table: ad4bc059 DAC: 00000051 [ 228.173339] Process modprobe (pid: 710, stack limit = 0xed52e218) [ 228.179689] Stack: (0xed52fba8 to 0xed530000) [ 228.184233] fba0: 00000000 ee7c58c0 bf1f6050 bf16f244 00000000 ed52fc28 [ 228.192765] fbc0: ee577800 c1014a44 00000000 c06430d8 00000001 00000000 ee6c6e90 ee6f50a0 [ 228.201294] fbe0: 00000000 00000000 00000000 c09c3354 60070013 c00943bc ed4b9700 00000004 [ 228.209835] fc00: 00000004 ed4b9140 00000006 bf1f138c bf1ef834 c0091884 c063f37c ed4b9140 [ 228.218365] fc20: 00000001 c118a28c ed4b9140 c00919e8 ee6f506c 60070013 ee6f5070 c063f37c [ 228.226899] fc40: 00000001 00000000 bf16f430 00000003 00000004 ed4b9140 00000006 00000000 [ 228.235417] fc60: bf1ef834 c0091884 c0641060 bf1f138c 00000000 ee7c58c0 00000004 0000001b [ 228.243938] fc80: bf1f138c bf17d238 00000000 bf16f468 00000000 00000012 ee7c58c0 ee7c58c0 [ 228.252463] fca0: ee6c6e90 ee6c6e90 00000004 ee6c6ec0 00000000 bf1ef834 00000000 bf1efcec [ 228.260989] fcc0: ee7c5828 00000000 ee7c5810 ee6f5010 ee7c58c0 ee7c5858 ed496010 bf169ef4 [ 228.269506] fce0: ee6f5180 00000002 00000634 ee6f5010 00000000 00000000 00000000 00000000 [ 228.278029] fd00: ed440e0c bf16cb2c 00000000 ee6f5020 ee6f5180 bf17fd60 00000001 ee6f5028 [ 228.286547] fd20: ee6f5168 60070013 00000000 00000000 eeee3304 00000000 ee178410 ee6f5010 [ 228.295065] fd40: ed105c90 ee6f5010 ee178410 ee178410 ee178400 00000001 12f9f228 bf17968c [ 228.303583] fd60: ee6f5010 fffffdfb 00000001 eeee87d8 ee178410 bf0faa38 00000000 ee178410 [ 228.312108] fd80: ee178410 ee178410 ee178410 bf0fb28c fffffdfb 0000004e ed060e00 c03dff28 [ 228.320626] fda0: ee178410 c11be018 bf0fb28c 00000000 0000004e c03de5dc ee178410 bf0fb28c [ 228.329143] fdc0: ee178444 c098df20 00000000 c03de76c 00000000 bf0fb28c c03de6d8 c03dca40 [ 228.337666] fde0: ee0362a4 ee179f10 bf0fb28c ed462ec0 00000000 c03ddba4 bf0fb080 c09123a0 [ 228.346188] fe00: ed060d40 bf0fb28c c09123a0 ed060d40 bf0fd000 c03defb0 c09123a0 c09123a0 [ 228.354713] fe20: ed060d40 c0009804 60070093 00000000 00000000 00000000 0000000f 00000000 [ 228.363240] fe40: ef7c4464 40000000 0000002e c0091ccc ed060e40 000000d0 000000d0 c0162850 [ 228.371760] fe60: ed52ff58 c0091ccc c090e108 ee0000c0 a0070013 bf0fb300 bf0fb300 c09c34a8 [ 228.380285] fe80: ed060e40 bf0fb300 bf0fb348 00000001 12f9f228 c011b55c ed060e08 bf0fb300 [ 228.388815] fea0: ed52ff58 c09c34a8 ed060e08 c00cc6cc bf0fb30c 00007fff 00000000 c00c9e60 [ 228.397340] fec0: c119bfa4 bf0fb458 c090e990 bf0fb51c f07fa7bc bf0fb30c 00000000 c064c2c0 [ 228.405863] fee0: f07cd000 0002d80c 02e60649 00000000 0000000f 00000000 00000000 00000000 [ 228.414388] ff00: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 [ 228.422911] ff20: 00000000 00000000 00000000 00000000 00000170 00000000 00000003 7f606ddc [ 228.431432] ff40: 0000017b c000f8e4 ed52e000 00000000 7f61a2e8 c00ccf24 f07cd000 0002d80c [ 228.439952] ff60: f07fa0dc f07eebe5 f07ef600 00001690 000019d0 00000000 00000000 00000000 [ 228.448475] ff80: 0000002c 0000002d 00000014 00000018 0000000f 00000000 7f607a28 00000000 [ 228.457000] ffa0: 1c7d6500 c000f740 7f607a28 00000000 00000003 7f606ddc 00000000 7f607d10 [ 228.465523] ffc0: 7f607a28 00000000 1c7d6500 0000017b 00040000 00000000 00000000 7f61a2e8 [ 228.474050] ffe0: bed179b0 bed179a0 7f5fd4bb b6f18852 80070030 00000003 185b0001 05000135 [ 228.482659] [<bf16dd2c>] (dapm_wcache_lookup [snd_soc_core]) from [<bf16f244>] (snd_soc_dapm_add_route+0x74/0x23c [snd_soc_core]) [ 228.494875] [<bf16f244>] (snd_soc_dapm_add_route [snd_soc_core]) from [<bf16f468>] (snd_soc_dapm_add_routes+0x5c/0xbc [snd_soc_core]) [ 228.507428] [<bf16f468>] (snd_soc_dapm_add_routes [snd_soc_core]) from [<bf1efcec>] (aic3x_probe+0x41c/0x57c [snd_soc_tlv320aic3x]) [ 228.519797] [<bf1efcec>] (aic3x_probe [snd_soc_tlv320aic3x]) from [<bf169ef4>] (soc_probe_component+0x208/0x348 [snd_soc_core]) [ 228.531812] [<bf169ef4>] (soc_probe_component [snd_soc_core]) from [<bf16cb2c>] (snd_soc_register_card+0x8d8/0x10f4 [snd_soc_core]) [ 228.544204] [<bf16cb2c>] (snd_soc_register_card [snd_soc_core]) from [<bf17968c>] (devm_snd_soc_register_card+0x2c/0x68 [snd_soc_core]) [ 228.556948] [<bf17968c>] (devm_snd_soc_register_card [snd_soc_core]) from [<bf0faa38>] (asoc_simple_card_probe+0x1f4/0x434 [snd_soc_simple_card]) [ 228.570587] [<bf0faa38>] (asoc_simple_card_probe [snd_soc_simple_card]) from [<c03dff28>] (platform_drv_probe+0x44/0xac) [ 228.581921] [<c03dff28>] (platform_drv_probe) from [<c03de5dc>] (driver_probe_device+0x1f4/0x2f0) [ 228.591170] [<c03de5dc>] (driver_probe_device) from [<c03de76c>] (__driver_attach+0x94/0x98) [ 228.599962] [<c03de76c>] (__driver_attach) from [<c03dca40>] (bus_for_each_dev+0x6c/0xa0) [ 228.608485] [<c03dca40>] (bus_for_each_dev) from [<c03ddba4>] (bus_add_driver+0x18c/0x214) [ 228.617100] [<c03ddba4>] (bus_add_driver) from [<c03defb0>] (driver_register+0x78/0xf8) [ 228.625451] [<c03defb0>] (driver_register) from [<c0009804>] (do_one_initcall+0x80/0x1dc) [ 228.633985] [<c0009804>] (do_one_initcall) from [<c011b55c>] (do_init_module+0x5c/0x1d0) [ 228.642421] [<c011b55c>] (do_init_module) from [<c00cc6cc>] (load_module+0x1a4c/0x20c0) [ 228.650769] [<c00cc6cc>] (load_module) from [<c00ccf24>] (SyS_finit_module+0x7c/0x90) [ 228.658936] [<c00ccf24>] (SyS_finit_module) from [<c000f740>] (ret_fast_syscall+0x0/0x1c) [ 228.667457] Code: e594300c e1550003 e243400c 0a000006 (e5131008) [ 228.673935] ---[ end trace d70ffb1b3028bdb3 ]--- -- balbi

1 0

[alsa-devel] ALSA DMA ping-pong
by Ran Shalit 22 Oct '15

22 Oct '15

Hello, I hope someone can help me understand the concept of ping-pong dma with ALSA. I am using davinci soc: /sound/soc/davinci/davinci_pcm.c But I am not sure if it using ping-pong dma or not. In the header of "davinci_pcm_enqueue_dma" function it states "Not used with ping/pong", but inside I see that it use period parameter in order to set the offset inside the dma buffer which is used. So, does it mean that ping-pong is used or not ? /* * Not used with ping/pong */ static void davinci_pcm_enqueue_dma(struct snd_pcm_substream *substream) ..... period_size = snd_pcm_lib_period_bytes(substream); dma_offset = prtd->period * period_size; dma_pos = runtime->dma_addr + dma_offset; .... acnt = prtd->params->acnt; edma_set_src(link, src, INCR, W8BIT); edma_set_dest(link, dst, INCR, W8BIT); ...... } Regards, Ran

1 0

[alsa-devel] [PATCH v2 0/3] ASoC: rockchip: i2s: add 8 channels capture support and share lrck
by Sugar Zhang 22 Oct '15

22 Oct '15

support 8 channels capture support. share lrck tx/rx when symmetric_rates enabled. Sugar Zhang (3): ASoC: rockchip: i2s: add 8 channels capture support Documentation: DT bindings: rockchip-i2s: add capture property ASoC: rockchip: i2s: share tx/rx lrck when symmetric_rates enabled .../devicetree/bindings/sound/rockchip-i2s.txt | 2 + sound/soc/rockchip/rockchip_i2s.c | 48 +++++++++++++++++++++- sound/soc/rockchip/rockchip_i2s.h | 16 ++++++++ 3 files changed, 64 insertions(+), 2 deletions(-) -- 2.3.6

3 9

[alsa-devel] [PATCH] ALSA: Remove transfer_ack_{begin, end} callbacks from struct snd_pcm_runtime
by Lars-Peter Clausen 22 Oct '15

22 Oct '15

While there is nothing wrong with the transfer_ack_begin and transfer_ack_end callbacks per-se, the last documented user was part of the alsa-driver 0.5.12a package, which was released 14 years ago and even predates the upstream integration of the ALSA core and has subsequently been superseded by newer alsa-driver releases. This seems to indicate that there is no need for having these callbacks and they are just cruft that can be removed. Signed-off-by: Lars-Peter Clausen <lars(a)metafoo.de> --- Documentation/DocBook/writing-an-alsa-driver.tmpl | 19 ++----------------- include/sound/pcm.h | 4 ---- sound/core/pcm_lib.c | 5 ----- 3 files changed, 2 insertions(+), 26 deletions(-) diff --git a/Documentation/DocBook/writing-an-alsa-driver.tmpl b/Documentation/DocBook/writing-an-alsa-driver.tmpl index 84ef6a9..a27ab9f5 100644 --- a/Documentation/DocBook/writing-an-alsa-driver.tmpl +++ b/Documentation/DocBook/writing-an-alsa-driver.tmpl @@ -2181,10 +2181,6 @@ struct _snd_pcm_runtime { struct snd_pcm_hardware hw; struct snd_pcm_hw_constraints hw_constraints; - /* -- interrupt callbacks -- */ - void (*transfer_ack_begin)(struct snd_pcm_substream *substream); - void (*transfer_ack_end)(struct snd_pcm_substream *substream); - /* -- timer -- */ unsigned int timer_resolution; /* timer resolution */ @@ -2209,9 +2205,8 @@ struct _snd_pcm_runtime { For the operators (callbacks) of each sound driver, most of these records are supposed to be read-only. Only the PCM middle-layer changes / updates them. The exceptions are - the hardware description (hw), interrupt callbacks - (transfer_ack_xxx), DMA buffer information, and the private - data. Besides, if you use the standard buffer allocation + the hardware description (hw) DMA buffer information and the + private data. Besides, if you use the standard buffer allocation method via <function>snd_pcm_lib_malloc_pages()</function>, you don't need to set the DMA buffer information by yourself. </para> @@ -2538,16 +2533,6 @@ struct _snd_pcm_runtime { </para> </section> - <section id="pcm-interface-runtime-intr"> - <title>Interrupt Callbacks</title> - <para> - The field <structfield>transfer_ack_begin</structfield> and - <structfield>transfer_ack_end</structfield> are called at - the beginning and at the end of - <function>snd_pcm_period_elapsed()</function>, respectively. - </para> - </section> - </section> <section id="pcm-interface-operators"> diff --git a/include/sound/pcm.h b/include/sound/pcm.h index 2882ddd..3e0ffd2 100644 --- a/include/sound/pcm.h +++ b/include/sound/pcm.h @@ -402,10 +402,6 @@ struct snd_pcm_runtime { struct snd_pcm_hardware hw; struct snd_pcm_hw_constraints hw_constraints; - /* -- interrupt callbacks -- */ - void (*transfer_ack_begin)(struct snd_pcm_substream *substream); - void (*transfer_ack_end)(struct snd_pcm_substream *substream); - /* -- timer -- */ unsigned int timer_resolution; /* timer resolution */ int tstamp_type; /* timestamp type */ diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index 6dc4277..05a3ca9 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c @@ -1875,9 +1875,6 @@ void snd_pcm_period_elapsed(struct snd_pcm_substream *substream) return; runtime = substream->runtime; - if (runtime->transfer_ack_begin) - runtime->transfer_ack_begin(substream); - snd_pcm_stream_lock_irqsave(substream, flags); if (!snd_pcm_running(substream) || snd_pcm_update_hw_ptr0(substream, 1) < 0) @@ -1889,8 +1886,6 @@ void snd_pcm_period_elapsed(struct snd_pcm_substream *substream) #endif _end: snd_pcm_stream_unlock_irqrestore(substream, flags); - if (runtime->transfer_ack_end) - runtime->transfer_ack_end(substream); kill_fasync(&runtime->fasync, SIGIO, POLL_IN); } -- 2.1.4

2 1

[alsa-devel] [PATCH] ASoC: rt5645: Add the HWEQ for the customized speaker output
by Oder Chiou 22 Oct '15

22 Oct '15

The patch adds the HWEQ function for the customized speaker output that is in order to the customer's requirement. The customer can enable the HWEQ in the platform data, and set the parameters of the HWEQ in the ALSA binary control byte-by-byte. Signed-off-by: Oder Chiou <oder_chiou(a)realtek.com> --- include/sound/rt5645.h | 2 + sound/soc/codecs/rt5645.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 111 insertions(+) diff --git a/include/sound/rt5645.h b/include/sound/rt5645.h index a5cf615..efa9f08 100644 --- a/include/sound/rt5645.h +++ b/include/sound/rt5645.h @@ -23,6 +23,8 @@ struct rt5645_platform_data { unsigned int jd_mode; /* Invert JD when jack insert */ bool jd_invert; + /* Speaker HWEQ */ + bool hweq; }; #endif diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index 4d54999..f26f08b 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -42,6 +42,8 @@ #define RT5645_PR_BASE (RT5645_PR_RANGE_BASE + (0 * RT5645_PR_SPACING)) +#define RT5645_HWEQ_NUM 57 + static const struct regmap_range_cfg rt5645_ranges[] = { { .name = "PR", @@ -224,6 +226,11 @@ static const struct reg_default rt5645_reg[] = { { 0xff, 0x6308 }, }; +struct rt5645_eq_param_s { + unsigned short reg; + unsigned short val; +}; + static const char *const rt5645_supply_names[] = { "avdd", "cpvdd", @@ -240,6 +247,7 @@ struct rt5645_priv { struct snd_soc_jack *btn_jack; struct delayed_work jack_detect_work; struct regulator_bulk_data supplies[ARRAY_SIZE(rt5645_supply_names)]; + struct rt5645_eq_param_s *eq_param; int codec_type; int sysclk; @@ -477,6 +485,80 @@ static const DECLARE_TLV_DB_RANGE(spk_clsd_tlv, 7, 7, TLV_DB_SCALE_ITEM(228, 0, 0) ); +static int rt5645_hweq_info(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + uinfo->type = SNDRV_CTL_ELEM_TYPE_BYTES; + uinfo->count = RT5645_HWEQ_NUM * sizeof(struct rt5645_eq_param_s); + + return 0; +} + +static int rt5645_hweq_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); + struct rt5645_priv *rt5645 = snd_soc_component_get_drvdata(component); + struct rt5645_eq_param_s *eq_param = + (struct rt5645_eq_param_s *)ucontrol->value.bytes.data; + + if (rt5645->pdata.hweq) + memcpy(eq_param, rt5645->eq_param, + RT5645_HWEQ_NUM * sizeof(struct rt5645_eq_param_s)); + + return 0; +} + +static bool rt5645_validate_hweq(unsigned short reg) +{ + if ((reg >= 0x1a4 && reg <= 0x1cd) | (reg >= 0x1e5 && reg <= 0x1f8) | + (reg == RT5645_EQ_CTRL2)) + return true; + + return false; +} + +static int rt5645_hweq_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); + struct rt5645_priv *rt5645 = snd_soc_component_get_drvdata(component); + struct rt5645_eq_param_s *eq_param = + (struct rt5645_eq_param_s *)ucontrol->value.bytes.data; + int i; + + if (rt5645->pdata.hweq) { + /* The final setting of the table should be RT5645_EQ_CTRL2 */ + for (i = RT5645_HWEQ_NUM - 1; i >= 0; i--) { + if (eq_param[i].reg == 0) + continue; + else if (eq_param[i].reg != RT5645_EQ_CTRL2) + return 0; + else + break; + } + + for (i = 0; i < RT5645_HWEQ_NUM; i++) { + if (!rt5645_validate_hweq(eq_param[i].reg) && + eq_param[i].reg != 0) + return 0; + else if (eq_param[i].reg == 0) + break; + } + + memcpy(rt5645->eq_param, eq_param, + RT5645_HWEQ_NUM * sizeof(struct rt5645_eq_param_s)); + } + + return 0; +} + +#define RT5645_HWEQ(xname) \ +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ + .info = rt5645_hweq_info, \ + .get = rt5645_hweq_get,\ + .put = rt5645_hweq_put } + static const struct snd_kcontrol_new rt5645_snd_controls[] = { /* Speaker Output Volume */ SOC_DOUBLE("Speaker Channel Switch", RT5645_SPK_VOL, @@ -541,6 +623,7 @@ static const struct snd_kcontrol_new rt5645_snd_controls[] = { /* I2S2 function select */ SOC_SINGLE("I2S2 Func Switch", RT5645_GPIO_CTRL1, RT5645_I2S2_SEL_SFT, 1, 1), + RT5645_HWEQ("Speaker HWEQ"), }; /** @@ -631,6 +714,22 @@ static int is_using_asrc(struct snd_soc_dapm_widget *source, } +static int rt5645_enable_hweq(struct snd_soc_codec *codec) +{ + struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec); + int i; + + for (i = 0; i < RT5645_HWEQ_NUM; i++) { + if (rt5645_validate_hweq(rt5645->eq_param[i].reg)) + regmap_write(rt5645->regmap, rt5645->eq_param[i].reg, + rt5645->eq_param[i].val); + else + break; + } + + return 0; +} + /** * rt5645_sel_asrc_clk_src - select ASRC clock source for a set of filters * @codec: SoC audio codec device. @@ -1532,9 +1631,12 @@ static int rt5645_spk_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) { struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); + struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec); switch (event) { case SND_SOC_DAPM_POST_PMU: + if (rt5645->pdata.hweq) + rt5645_enable_hweq(codec); snd_soc_update_bits(codec, RT5645_PWR_DIG1, RT5645_PWR_CLS_D | RT5645_PWR_CLS_D_R | RT5645_PWR_CLS_D_L, @@ -1543,6 +1645,8 @@ static int rt5645_spk_event(struct snd_soc_dapm_widget *w, break; case SND_SOC_DAPM_PRE_PMD: + if (rt5645->pdata.hweq) + snd_soc_write(codec, RT5645_EQ_CTRL2, 0); snd_soc_update_bits(codec, RT5645_PWR_DIG1, RT5645_PWR_CLS_D | RT5645_PWR_CLS_D_R | RT5645_PWR_CLS_D_L, 0); @@ -3060,6 +3164,11 @@ static int rt5645_probe(struct snd_soc_codec *codec) snd_soc_dapm_sync(dapm); } + if (rt5645->pdata.hweq) + rt5645->eq_param = devm_kzalloc(codec->dev, + RT5645_HWEQ_NUM * sizeof(struct rt5645_eq_param_s), + GFP_KERNEL); + return 0; } -- 1.8.1.1.439.g50a6b54

2 3

[alsa-devel] [patch] ASoC: es8328: harmless underflow in es8328_put_deemph()
by Dan Carpenter 22 Oct '15

22 Oct '15

Valid values for "deemph" are zero and one but we accidentally allow negative values as well. It's harmless but it causes static checker warnings and we may as well clean it up. Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/sound/soc/codecs/es8328.c b/sound/soc/codecs/es8328.c index 6a09101..969e337 100644 --- a/sound/soc/codecs/es8328.c +++ b/sound/soc/codecs/es8328.c @@ -129,7 +129,7 @@ static int es8328_put_deemph(struct snd_kcontrol *kcontrol, { struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct es8328_priv *es8328 = snd_soc_codec_get_drvdata(codec); - int deemph = ucontrol->value.integer.value[0]; + unsigned int deemph = ucontrol->value.integer.value[0]; int ret; if (deemph > 1)

2 2

[alsa-devel] [patch] ASoC: wm8960: harmless underflow in wm8960_put_deemph()
by Dan Carpenter 22 Oct '15

22 Oct '15

Valid values of "deemph" are zero and one, but we accidentally allow negative values as well. It's harmless but we may as well fix it. Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c index e3b7d0c..dc47c2f 100644 --- a/sound/soc/codecs/wm8960.c +++ b/sound/soc/codecs/wm8960.c @@ -201,7 +201,7 @@ static int wm8960_put_deemph(struct snd_kcontrol *kcontrol, { struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec); - int deemph = ucontrol->value.integer.value[0]; + unsigned int deemph = ucontrol->value.integer.value[0]; if (deemph > 1) return -EINVAL;

2 1

[alsa-devel] [PATCH v4] ASoC: soc-compress: add config item for soc-compress to make it compiled only when needed
by Jie Yang 22 Oct '15

22 Oct '15

We don't always need soc-compress in soc, here add a config item SND_SOC_COMPRESS, when nobody select it, the soc-compress will not be compiled. Here also change Kconfig to 'select SND_SOC_COMPRESS' for drivers that needed soc-compress. Signed-off-by: Jie Yang <yang.jie(a)intel.com> --- include/sound/soc-dai.h | 2 +- include/sound/soc.h | 4 +++- sound/soc/Kconfig | 5 ++++- sound/soc/Makefile | 3 ++- sound/soc/intel/Kconfig | 1 + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 2 +- sound/soc/soc-compress.c | 12 ++++++++++-- sound/soc/soc-core.c | 4 ++-- 8 files changed, 24 insertions(+), 9 deletions(-) diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index 2df96b1..238200f 100644 --- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h @@ -214,7 +214,7 @@ struct snd_soc_dai_driver { int (*suspend)(struct snd_soc_dai *dai); int (*resume)(struct snd_soc_dai *dai); /* compress dai */ - bool compress_dai; + int (*compress_new)(struct snd_soc_pcm_runtime *rtd, int num); /* DAI is also used for the control bus */ bool bus_control; diff --git a/include/sound/soc.h b/include/sound/soc.h index 98e080b..10b7802 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -459,7 +459,9 @@ int snd_soc_platform_read(struct snd_soc_platform *platform, int snd_soc_platform_write(struct snd_soc_platform *platform, unsigned int reg, unsigned int val); int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num); -int soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num); +#ifdef CONFIG_SND_SOC_COMPRESS +int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num); +#endif struct snd_pcm_substream *snd_soc_get_dai_substream(struct snd_soc_card *card, const char *dai_link, int stream); diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig index 7de792b..7ff7d88 100644 --- a/sound/soc/Kconfig +++ b/sound/soc/Kconfig @@ -9,7 +9,6 @@ menuconfig SND_SOC select SND_JACK if INPUT=y || INPUT=SND select REGMAP_I2C if I2C select REGMAP_SPI if SPI_MASTER - select SND_COMPRESS_OFFLOAD ---help--- If you want ASoC support, you should say Y here and also to the @@ -30,6 +29,10 @@ config SND_SOC_GENERIC_DMAENGINE_PCM bool select SND_DMAENGINE_PCM +config SND_SOC_COMPRESS + bool + select SND_COMPRESS_OFFLOAD + config SND_SOC_TOPOLOGY bool diff --git a/sound/soc/Makefile b/sound/soc/Makefile index af0a571..8eb06db 100644 --- a/sound/soc/Makefile +++ b/sound/soc/Makefile @@ -1,5 +1,6 @@ snd-soc-core-objs := soc-core.o soc-dapm.o soc-jack.o soc-cache.o soc-utils.o -snd-soc-core-objs += soc-pcm.o soc-compress.o soc-io.o soc-devres.o soc-ops.o +snd-soc-core-objs += soc-pcm.o soc-io.o soc-devres.o soc-ops.o +snd-soc-core-$(CONFIG_SND_SOC_COMPRESS) += soc-compress.o ifneq ($(CONFIG_SND_SOC_TOPOLOGY),) snd-soc-core-objs += soc-topology.o diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig index 664df1f..aaafb13 100644 --- a/sound/soc/intel/Kconfig +++ b/sound/soc/intel/Kconfig @@ -12,6 +12,7 @@ config SND_MFLD_MACHINE config SND_SST_MFLD_PLATFORM tristate + select SND_SOC_COMPRESS config SND_SST_IPC tristate diff --git a/sound/soc/intel/atom/sst-mfld-platform-pcm.c b/sound/soc/intel/atom/sst-mfld-platform-pcm.c index 5e9c316..0487cfa 100644 --- a/sound/soc/intel/atom/sst-mfld-platform-pcm.c +++ b/sound/soc/intel/atom/sst-mfld-platform-pcm.c @@ -512,7 +512,7 @@ static struct snd_soc_dai_driver sst_platform_dai[] = { }, { .name = "compress-cpu-dai", - .compress_dai = 1, + .compress_new = snd_soc_new_compress, .ops = &sst_compr_dai_ops, .playback = { .stream_name = "Compress Playback", diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c index 025c38f..12a9820 100644 --- a/sound/soc/soc-compress.c +++ b/sound/soc/soc-compress.c @@ -612,8 +612,15 @@ static struct snd_compr_ops soc_compr_dyn_ops = { .get_codec_caps = soc_compr_get_codec_caps }; -/* create a new compress */ -int soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num) +/** + * snd_soc_new_compress - create a new compress. + * + * @rtd: The runtime for which we will create compress + * @num: the device index number (zero based - shared with normal PCMs) + * + * Return: 0 for success, else error. + */ +int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num) { struct snd_soc_codec *codec = rtd->codec; struct snd_soc_platform *platform = rtd->platform; @@ -703,3 +710,4 @@ compr_err: kfree(compr); return ret; } +EXPORT_SYMBOL_GPL(snd_soc_new_compress); diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 3b471f9..24b0960 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1370,9 +1370,9 @@ static int soc_probe_link_dais(struct snd_soc_card *card, int num, int order) soc_dpcm_debugfs_add(rtd); #endif - if (cpu_dai->driver->compress_dai) { + if (cpu_dai->driver->compress_new) { /*create compress_device"*/ - ret = soc_new_compress(rtd, num); + ret = cpu_dai->driver->compress_new(rtd, num); if (ret < 0) { dev_err(card->dev, "ASoC: can't create compress %s\n", dai_link->stream_name); -- 1.9.1

4 6

[alsa-devel] [PATCH] ASoC: Let snd_soc_limit_volume() take a snd_soc_card
by Lars-Peter Clausen 22 Oct '15

22 Oct '15

snd_soc_limit_volume() operates on a card and the CODEC that is passed in is only used to look up the card. Let it directly take the card instead. This makes it possible to use it when no snd_soc_codec is available. Signed-off-by: Lars-Peter Clausen <lars(a)metafoo.de> --- include/sound/soc.h | 2 +- sound/soc/omap/rx51.c | 2 +- sound/soc/soc-ops.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index bd85564..8b06678 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -612,7 +612,7 @@ int snd_soc_put_volsw_range(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol); int snd_soc_get_volsw_range(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol); -int snd_soc_limit_volume(struct snd_soc_codec *codec, +int snd_soc_limit_volume(struct snd_soc_card *card, const char *name, int max); int snd_soc_bytes_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo); diff --git a/sound/soc/omap/rx51.c b/sound/soc/omap/rx51.c index 3bebfb1..9953890 100644 --- a/sound/soc/omap/rx51.c +++ b/sound/soc/omap/rx51.c @@ -297,7 +297,7 @@ static int rx51_aic34_init(struct snd_soc_pcm_runtime *rtd) dev_err(card->dev, "Failed to add TPA6130A2 controls\n"); return err; } - snd_soc_limit_volume(codec, "TPA6130A2 Headphone Playback Volume", 42); + snd_soc_limit_volume(card, "TPA6130A2 Headphone Playback Volume", 42); err = omap_mcbsp_st_add_controls(rtd, 2); if (err < 0) { diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c index 05977ae..ecd38e5 100644 --- a/sound/soc/soc-ops.c +++ b/sound/soc/soc-ops.c @@ -588,16 +588,16 @@ EXPORT_SYMBOL_GPL(snd_soc_get_volsw_range); /** * snd_soc_limit_volume - Set new limit to an existing volume control. * - * @codec: where to look for the control + * @card: where to look for the control * @name: Name of the control * @max: new maximum limit * * Return 0 for success, else error. */ -int snd_soc_limit_volume(struct snd_soc_codec *codec, +int snd_soc_limit_volume(struct snd_soc_card *card, const char *name, int max) { - struct snd_card *card = codec->component.card->snd_card; + struct snd_card *snd_card = card->snd_card; struct snd_kcontrol *kctl; struct soc_mixer_control *mc; int found = 0; @@ -607,7 +607,7 @@ int snd_soc_limit_volume(struct snd_soc_codec *codec, if (unlikely(!name || max <= 0)) return -EINVAL; - list_for_each_entry(kctl, &card->controls, list) { + list_for_each_entry(kctl, &snd_card->controls, list) { if (!strncmp(kctl->id.name, name, sizeof(kctl->id.name))) { found = 1; break; -- 2.1.4

3 3

[alsa-devel] [PATCH v2 0/2] *** wm8962 regmap related fix ***
by Jiada Wang 22 Oct '15

22 Oct '15

This patch set aims to fix issues in wm8962 codec driver related to regmap, currently any attempt to read from ALC Coefficient register will fail when wm8962 is in suspend mode. As ALC2 register is volatile register, it can't be read when cache_only flag is set. Another issue is, if wm8962's regulator is set to 'regulator-always-on' mode, then after wm8962 is resumed from suspend, wm8962 codec is reset, but cache_dirty flag isn't set, this cause difference between actual wm8962 HW and regmap cache. Changeset: -------------- v1 -> v2 * removed comment before regcache_mark_dirty Jiada Wang (2): ASoC: WM8962: mark cache_dirty flag after software reset in pm_resume ASoC: Codec: wm8962: declare ALC Coefficients as 4 separate registers sound/soc/codecs/wm8962.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -- 2.4.5

3 6

[alsa-devel] Fwd: Re: Gmail thinks most alsa-devel mail is spam
by A. C. Censi 22 Oct '15

22 Oct '15

-- A C Censi accensi @ gmail . com accensi @ montreal . com . br ---------- Forwarded message ---------- From: "A. C. Censi" <accensi(a)gmail.com> Date: Oct 21, 2015 22:50 Subject: Re: [alsa-devel] Gmail thinks most alsa-devel mail is spam To: "Timur Tabi" <timur(a)tabi.org> Cc: I have the same problem and not only with gmail, but my company server does the same check Probably the misclassification is due to: - Keep valid reverse DNS records for the IP address(es) from which you send mail, pointing to your domain. >From the source one email misclassified: Received: by 10.107.154.1 with SMTP id c1csp256822ioe; Wed, 21 Oct 2015 13:55:10 -0700 (PDT) X-Received: by 10.194.216.228 with SMTP id ot4mr13139641wjc.156.1445460910180; Wed, 21 Oct 2015 13:55:10 -0700 (PDT) Return-Path: <alsa-devel-bounces(a)alsa-project.org> Received: from alsa0.perex.cz ([2002:4d30:e0f1:1:5054:ff:fe8b:a8f0]) by mx.google.com with ESMTP id kb1si14026248wjc.16.2015.10.21.13.55.09; Wed, 21 Oct 2015 13:55:10 -0700 (PDT) Received-SPF: neutral (google.com: 2002:4d30:e0f1:1:5054:ff:fe8b:a8f0 is neither permitted nor denied by best guess record for domain of alsa-devel-bounces(a)alsa-project.org) client-ip=2002:4d30:e0f1:1:5054:ff:fe8b:a8f0; Authentication-Results: mx.google.com; spf=neutral (google.com: 2002:4d30:e0f1:1:5054:ff:fe8b:a8f0 is neither permitted nor denied by best guess record for domain of alsa-devel-bounces(a)alsa-project.org) smtp.mailfrom=alsa-devel-bounces(a)alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 782D52667C3; Wed, 21 Oct 2015 22:55:09 +0200 (CEST) An correct email fom linux-fs-devel list: Received: by 10.107.154.1 with SMTP id c1csp276010ioe; Wed, 21 Oct 2015 14:43:58 -0700 (PDT) X-Received: by 10.66.147.74 with SMTP id ti10mr13215193pab.88.1445463838506; Wed, 21 Oct 2015 14:43:58 -0700 (PDT) Return-Path: <linux-fsdevel-owner(a)vger.kernel.org> Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id qp7si1236731pbc.93.2015.10.21.14.43.44; Wed, 21 Oct 2015 14:43:58 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-fsdevel-owner(a)vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-fsdevel-owner(a)vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-fsdevel-owner(a)vger.kernel.org To solve adjust the DNS for the reverse entry and PTR record. ACC On Wed, Oct 21, 2015 at 8:53 PM, Timur Tabi <timur(a)tabi.org> wrote: > On Wed, Oct 21, 2015 at 2:32 PM, Caleb Crome <caleb(a)crome.org> wrote: > > > In gmail go to > > > > settings->Filters and blocked Addresses->Create New Filter > > > > Subject = [alsa-devel] > > > > Then, "Create Filter With This Search" > > > > Then "Apply The Label" = alsa > > and tick the box that says, "Never send it to Spam" > > All that does is disable the spam filter completely for alsa-devel, > which means I'll get more spam. Then I will have to scan my > alsa-devel folder to remove actual spam, which is more difficult than > fishing out legitimate mail from the spam folder. > _______________________________________________ > Alsa-devel mailing list > Alsa-devel(a)alsa-project.org > http://mailman.alsa-project.org/mailman/listinfo/alsa-devel > -- A. C. Censi accensi [em] gmail [ponto] com accensi [em] montreal [ponto] com [ponto] br

2 1

[alsa-devel] HDMI codec, way forward?
by Jyri Sarha 22 Oct '15

22 Oct '15

After reading the ELCE Audio mini conf minutes [1] I gather that HDMI audio was not discussed after all. My conclusion from the Lars-Peter's latest mail [2] related to the subject is that the wind is currently blowing slightly in favour of my version of the hdmi codec [3], or at least not in favour of Arnaud's version [4]. So how should we proceed? Are we still waiting for some feedback from DRM/video side? There was not too many clear suggestions to my latest patch series [3], so I do not see too much point in sending yet another version of that series. Arnaud, if I'd try to make a patch series that would implement sti HDMI audio with my HDMI codec, would you be willing try that out? Best regards, Jyri [1] http://mailman.alsa-project.org/pipermail/alsa-devel/2015-October/098847.ht… [2] http://mailman.alsa-project.org/pipermail/alsa-devel/2015-October/098564.ht… [3] http://mailman.alsa-project.org/pipermail/alsa-devel/2015-September/097667.… [4] http://mailman.alsa-project.org/pipermail/alsa-devel/2015-October/098275.ht…

9 40

[alsa-devel] Gmail thinks most alsa-devel mail is spam
by Timur Tabi 22 Oct '15

22 Oct '15

Hi, I use gmail to subscribe to Linux mailing lists, and most of the mail to alsa-devel ends up in the spam folder. According to gmail, the reason is: "Why is this message in Spam? It is in violation of Google's recommended email sender guidelines." and then it tell me to look here: https://support.google.com/mail/answer/81126?hl=en#authentication Is this something that can be fixed? It's really annoying have to check my spam folder every day to fish out messages from alsa-devel.

3 4

Re: [alsa-devel] ASoC: Intel: Skylake: Add SKL DSP initialization
by Dan Carpenter 21 Oct '15

21 Oct '15

Hello Subhransu S. Prusty, The patch a750ba5f5a56: "ASoC: Intel: Skylake: Add SKL DSP initialization" from Jul 10, 2015, leads to the following static checker warning: sound/soc/intel/skylake/skl-sst.c:270 skl_sst_dsp_init() info: ignoring unreachable code. sound/soc/intel/skylake/skl-sst.c 252 sst->dsp_ops = dsp_ops; 253 sst->fw_ops = skl_fw_ops; 254 255 ret = skl_ipc_init(dev, skl); 256 if (ret) 257 return ret; 258 259 ret = sst->fw_ops.load_fw(sst); 260 if (ret < 0) { 261 dev_err(dev, "Load base fw failed : %d", ret); 262 return ret; Presumably this should be a "goto free_ipc;" here? 263 } 264 265 if (dsp) 266 *dsp = skl; 267 268 return 0; 269 270 skl_ipc_free(&skl->ipc); ^^^^^^^^^^^^^^^^^^^^^^^ Unreachable. 271 return ret; 272 } 273 EXPORT_SYMBOL_GPL(skl_sst_dsp_init); regards, dan carpenter

1 0

Re: [alsa-devel] ASoC: Intel: Add Skylake HDA platform driver
by Dan Carpenter 21 Oct '15

21 Oct '15

Hello Jeeja KP, This is a semi-automatic email about new static checker warnings. The patch a40e693c7f5e: "ASoC: Intel: Add Skylake HDA platform driver" from Jul 9, 2015, leads to the following Smatch complaint: sound/soc/intel/skylake/skl-pcm.c:802 skl_get_position() warn: variable dereferenced before check 'substream->runtime' (see line 792) sound/soc/intel/skylake/skl-pcm.c 791 struct snd_pcm_substream *substream = hstr->substream; 792 struct hdac_ext_bus *ebus = get_bus_ctx(substream); ^^^^^^^^^^^^^^^^^^^^^^ Dereference inside function. 793 unsigned int pos; 794 int delay; 795 796 /* use the position buffer as default */ 797 pos = snd_hdac_stream_get_pos_posbuf(hdac_stream(hstream)); 798 799 if (pos >= hdac_stream(hstream)->bufsize) 800 pos = 0; 801 802 if (substream->runtime) { ^^^^^^^^^^^^^^^^^^ Checked too late. 803 delay = skl_get_delay_from_lpib(ebus, hstream, pos) 804 + codec_delay; regards, dan carpenter

1 0

[alsa-devel] No sound after suspend-to-ram
by George Gugulea 21 Oct '15

21 Oct '15

After a fresh reboot, the sound works ok but if I put the computer to sleep (pm-suspend), after it wakes up there is no sound anymore. I did try 'alsa force-reload' after suspend but still no sound. After 'pm-hibernate' sound is back again. I found an old thread here: https://bugzilla.kernel.org/show_bug.cgi?id=49421 where Michael seems to have the same problem which is still unsolved; maybe I can help with more info. I attached the 'alsa-info.sh' output before and after suspend: 'alsa-info.txt.before' and 'alsa-info.txt.after' The PC is here: http://www.dell.com/us/p/xps-27-2720-aio/pd?ref=PD_OC, but the 2y older version with no touch If I boot into windows (8.1) everything works great, including sound (even after suspend) -- gg

1 0

[alsa-devel] Hot to properly output DSD silence pattern before/after playback?
by Martin Pietryka 21 Oct '15

21 Oct '15

Hello Guys, I have already asked the question last week, but the thing got a bit more complicated. So we need to achieve the following when playing back DSD audio: 1.) Start outputting the DSD silence pattern (0x69) for ~40ms 2.) After ~10ms unset a mute GPIO 3.) Start outputting DSD data after silence is over and after DSD playback is finished a similar procedure: 1.) Start outputting the DSD silence pattern (0x69) for ~40ms 2.) After ~10ms set a mute GPIO 3.) (let silence run out) In addition to that, we also have the need to toggle the mute GPIO from an appropriate place at an appropriate time, the timing does not have to be exact but we need to be sure that the actual hardware already started outputting the silence samples. We have figured out three possibilities where to add the silence: 1.) Inside our application: We are using GStreamer and for various reasons we currently can't do it here without a significant effort. 2.) Inside alsa-lib: The idea here is to inject a snd_pcm_writei() call on the first call of snd_pcm_writei() and inside snd_pcm_drain(). This is really ugly, but doable, I already have a simple proof of concept working. But here I think the GPIO stuff will get really complicated. 3.) Inside the kernel: Modify the soc driver to output the silence pattern before and after playback. So what do you guys think would be the best approach to this problem, are there any other possibilities? I would imagine someone has had to do something similar before, but I couldn't find anything with Google, so if you know something regarding this, please let me know. Thanks, Martin

1 0

[alsa-devel] [PATCH] ASoC: dt-bindings: Drop unneeded properties rockchip i2s/spdif bindings
by Sjoerd Simons 21 Oct '15

21 Oct '15

Neither the rockchip i2s nor the rockchip spdif binding support child devices so #address-cells and #size-cells properties aren't required. Remove these from the bindings. Signed-off-by: Sjoerd Simons <sjoerd.simons(a)collabora.co.uk> --- This patch is on top of the ASoC tree Documentation/devicetree/bindings/sound/rockchip-i2s.txt | 4 ---- Documentation/devicetree/bindings/sound/rockchip-spdif.txt | 4 ---- 2 files changed, 8 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/rockchip-i2s.txt b/Documentation/devicetree/bindings/sound/rockchip-i2s.txt index 9b82c20..085e0bc 100644 --- a/Documentation/devicetree/bindings/sound/rockchip-i2s.txt +++ b/Documentation/devicetree/bindings/sound/rockchip-i2s.txt @@ -12,8 +12,6 @@ Required properties: - reg: physical base address of the controller and length of memory mapped region. - interrupts: should contain the I2S interrupt. -- #address-cells: should be 1. -- #size-cells: should be 0. - dmas: DMA specifiers for tx and rx dma. See the DMA client binding, Documentation/devicetree/bindings/dma/dma.txt - dma-names: should include "tx" and "rx". @@ -28,8 +26,6 @@ i2s@ff890000 { compatible = "rockchip,rk3288-i2s", "rockchip,rk3066-i2s"; reg = <0xff890000 0x10000>; interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>; - #address-cells = <1>; - #size-cells = <0>; dmas = <&pdma1 0>, <&pdma1 1>; dma-names = "tx", "rx"; clock-names = "i2s_hclk", "i2s_clk"; diff --git a/Documentation/devicetree/bindings/sound/rockchip-spdif.txt b/Documentation/devicetree/bindings/sound/rockchip-spdif.txt index 33dd82c..e64dbde 100644 --- a/Documentation/devicetree/bindings/sound/rockchip-spdif.txt +++ b/Documentation/devicetree/bindings/sound/rockchip-spdif.txt @@ -12,8 +12,6 @@ Required properties: - reg: physical base address of the controller and length of memory mapped region. - interrupts: should contain the SPDIF interrupt. -- #address-cells: should be 1. -- #size-cells: should be 0. - dmas: DMA specifiers for tx dma. See the DMA client binding, Documentation/devicetree/bindings/dma/dma.txt - dma-names: should be "tx" @@ -33,8 +31,6 @@ spdif: spdif@0x1011e000 { compatible = "rockchip,rk3188-spdif", "rockchip,rk3066-spdif"; reg = <0x1011e000 0x2000>; interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>; - #address-cells = <1>; - #size-cells = <0>; dmas = <&dmac1_s 8>; dma-names = "tx"; clock-names = "hclk", "mclk"; -- 2.6.1

2 2

[alsa-devel] [PATCH RFT] ASoC: da7219: Fix da7219->alc_en state when enabling ALC
by Axel Lin 21 Oct '15

21 Oct '15

Signed-off-by: Axel Lin <axel.lin(a)ingics.com> --- sound/soc/codecs/da7219.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/da7219.c b/sound/soc/codecs/da7219.c index 86c528a..e36a7b7 100644 --- a/sound/soc/codecs/da7219.c +++ b/sound/soc/codecs/da7219.c @@ -402,7 +402,7 @@ static int da7219_alc_sw_put(struct snd_kcontrol *kcontrol, /* Force ALC offset calibration if enabling ALC */ if ((ucontrol->value.integer.value[0]) && (!da7219->alc_en)) { da7219_alc_calib(codec); - da7219->alc_en = false; + da7219->alc_en = true; } else { da7219->alc_en = false; } -- 2.1.4

3 3

[alsa-devel] [PATCH] ASoC: Intel: sst: only use sst-firmware when DW DMAC is available
by Jie Yang 21 Oct '15

21 Oct '15

Currentlly, we use Synopsys DesignWare DMA Controller for baytrail/haswell/broadwell ADSP firmware loading, but for skylake, we don't use it, compiling sst-firmware.c may introduce error when CONFIG_DW_DMAC_CORE is not enabled: sound/built-in.o: In function `sst_dma_new': (.text+0xd7b38): undefined reference to `dw_dma_probe' sound/built-in.o: In function `sst_dma_free': (.text+0xd7c0a): undefined reference to `dw_dma_remove' Here we only compile sst-firmware when CONFIG_DW_DMAC_CORE is selected, to fix the linking error issue. Reported-by: Randy Dunlap <rdunlap(a)infradead.org> Signed-off-by: Jie Yang <yang.jie(a)intel.com> --- sound/soc/intel/common/Makefile | 3 ++- sound/soc/intel/common/sst-dsp.c | 2 ++ sound/soc/intel/common/sst-dsp.h | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/sound/soc/intel/common/Makefile b/sound/soc/intel/common/Makefile index f24154c..55342a1 100644 --- a/sound/soc/intel/common/Makefile +++ b/sound/soc/intel/common/Makefile @@ -1,4 +1,5 @@ -snd-soc-sst-dsp-objs := sst-dsp.o sst-firmware.o +snd-soc-sst-dsp-objs := sst-dsp.o +snd-soc-sst-dsp-$(CONFIG_DW_DMAC_CORE) += sst-firmware.o snd-soc-sst-acpi-objs := sst-acpi.o snd-soc-sst-ipc-objs := sst-ipc.o diff --git a/sound/soc/intel/common/sst-dsp.c b/sound/soc/intel/common/sst-dsp.c index a627236..b5bbdf4 100644 --- a/sound/soc/intel/common/sst-dsp.c +++ b/sound/soc/intel/common/sst-dsp.c @@ -420,6 +420,7 @@ void sst_dsp_inbox_read(struct sst_dsp *sst, void *message, size_t bytes) } EXPORT_SYMBOL_GPL(sst_dsp_inbox_read); +#ifdef CONFIG_DW_DMAC_CORE struct sst_dsp *sst_dsp_new(struct device *dev, struct sst_dsp_device *sst_dev, struct sst_pdata *pdata) { @@ -484,6 +485,7 @@ void sst_dsp_free(struct sst_dsp *sst) sst_dma_free(sst->dma); } EXPORT_SYMBOL_GPL(sst_dsp_free); +#endif /* Module information */ MODULE_AUTHOR("Liam Girdwood"); diff --git a/sound/soc/intel/common/sst-dsp.h b/sound/soc/intel/common/sst-dsp.h index 1f45f18..0b84c71 100644 --- a/sound/soc/intel/common/sst-dsp.h +++ b/sound/soc/intel/common/sst-dsp.h @@ -216,10 +216,12 @@ struct sst_pdata { void *dsp; }; +#ifdef CONFIG_DW_DMAC_CORE /* Initialization */ struct sst_dsp *sst_dsp_new(struct device *dev, struct sst_dsp_device *sst_dev, struct sst_pdata *pdata); void sst_dsp_free(struct sst_dsp *sst); +#endif /* SHIM Read / Write */ void sst_dsp_shim_write(struct sst_dsp *sst, u32 offset, u32 value); -- 2.1.4

1 0

Re: [alsa-devel] linux-next: Tree for Oct 20 (sound/soc/intel)
by Randy Dunlap 21 Oct '15

21 Oct '15

On 10/19/15 22:26, Stephen Rothwell wrote: > Hi all, > > Changes since 20151019: > on x86_64: when CONFIG_DW_DMAC is not enabled. sound/built-in.o: In function `sst_dma_new': (.text+0xd7b38): undefined reference to `dw_dma_probe' sound/built-in.o: In function `sst_dma_free': (.text+0xd7c0a): undefined reference to `dw_dma_remove' Full randconfig file is attached. -- ~Randy

2 1

[alsa-devel] [PATCH 00/18] ALSA: Add helper function to add single value constraint
by Lars-Peter Clausen 21 Oct '15

21 Oct '15

Apologies if you got this series twice, forgot to Cc the mailinglist on the first try. This series introduces a new helper function which can be used to constrain a configuration parameter to a single. So far the recommended and most efficient way to do this was to set a min-max constraint with the same value for minimum and maximum. It is not necessarily immediately obvious though that this is the right way to do things and some driver have come up with different ways to achieve the same effect, e.g. by installing a list constraint with a single item. This is less efficient since list constraints are dynamic constraints which needed to be re-evaluated multiple times at runtime while a min-max constraint is a static constraint. The function introduced in this patch series is called snd_pcm_hw_constraint_single() which hopefully is semantically more expressive and makes it clear that this is the function to use when setting a single value constraint. All existing drivers that want to set a single value constraint are update to use the new helper function. - Lars Lars-Peter Clausen (18): ALSA: Add helper function to add single value constraint ALSA: korg1212: Use snd_pcm_hw_constraint_single() ALAA: lx6464es: Use snd_pcm_hw_constraint_single() ALSA: rme32: Use snd_pcm_hw_constraint_single() ALSA: rme96: Use snd_pcm_hw_constraint_single() ALSA: rme9652: Use snd_pcm_hw_constraint_single() ASoC: adav80x: Use snd_pcm_hw_constraint_single() ASoC: twl4030: Use snd_pcm_hw_constraint_single() ASoC: uda134x: Use snd_pcm_hw_constraint_single() ASoC: wl1273: Use snd_pcm_hw_constraint_single() ASoC: n810: Use snd_pcm_hw_constraint_single() ASoC: rx51: Use snd_pcm_hw_constraint_single() ASoC: pcm: Use snd_pcm_hw_constraint_single() ASoC: ux500: Use snd_pcm_hw_constraint_single() ASoC: bytcr_rt5640: Use snd_pcm_hw_constraint_single() ASoC: cht_bsw_max98090: Use snd_pcm_hw_constraint_single() ASoC: cht_bsw_rt5645: Use snd_pcm_hw_constraint_single() ASoC: cht_bsw_rt5672: Use snd_pcm_hw_constraint_single() include/sound/pcm.h | 16 ++++++++++++++++ sound/pci/korg1212/korg1212.c | 8 +++++--- sound/pci/lx6464es/lx6464es.c | 4 ++-- sound/pci/rme32.c | 4 ++-- sound/pci/rme96.c | 8 ++++---- sound/pci/rme9652/hdspm.c | 9 ++++----- sound/soc/codecs/adav80x.c | 4 ++-- sound/soc/codecs/twl4030.c | 13 +++++-------- sound/soc/codecs/uda134x.c | 6 ++---- sound/soc/codecs/wl1273.c | 9 ++++----- sound/soc/intel/boards/bytcr_rt5640.c | 14 ++------------ sound/soc/intel/boards/cht_bsw_max98090_ti.c | 14 ++------------ sound/soc/intel/boards/cht_bsw_rt5645.c | 14 ++------------ sound/soc/intel/boards/cht_bsw_rt5672.c | 14 ++------------ sound/soc/omap/n810.c | 3 +-- sound/soc/omap/rx51.c | 3 +-- sound/soc/soc-pcm.c | 10 ++++------ sound/soc/ux500/ux500_msp_dai.c | 4 ++-- 18 files changed, 62 insertions(+), 95 deletions(-) -- 2.1.4

5 24

[alsa-devel] [PATCH v4] ASoC: rt5645: Add the HW EQ for the customized speaker output of Google Celes
by Oder Chiou 21 Oct '15

21 Oct '15

Signed-off-by: Oder Chiou <oder_chiou(a)realtek.com> --- include/sound/rt5645.h | 2 + sound/soc/codecs/rt5645.c | 103 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 104 insertions(+), 1 deletion(-) diff --git a/include/sound/rt5645.h b/include/sound/rt5645.h index a5cf615..efa9f08 100644 --- a/include/sound/rt5645.h +++ b/include/sound/rt5645.h @@ -23,6 +23,8 @@ struct rt5645_platform_data { unsigned int jd_mode; /* Invert JD when jack insert */ bool jd_invert; + /* Speaker HWEQ */ + bool hweq; }; #endif diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index 4d54999..6809d1c 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -42,6 +42,8 @@ #define RT5645_PR_BASE (RT5645_PR_RANGE_BASE + (0 * RT5645_PR_SPACING)) +#define RT5645_HWEQ_NUM 57 + static const struct regmap_range_cfg rt5645_ranges[] = { { .name = "PR", @@ -224,6 +226,11 @@ static const struct reg_default rt5645_reg[] = { { 0xff, 0x6308 }, }; +struct rt5645_eq_param_s { + unsigned short reg; + unsigned short val; +}; + static const char *const rt5645_supply_names[] = { "avdd", "cpvdd", @@ -240,6 +247,7 @@ struct rt5645_priv { struct snd_soc_jack *btn_jack; struct delayed_work jack_detect_work; struct regulator_bulk_data supplies[ARRAY_SIZE(rt5645_supply_names)]; + struct rt5645_eq_param_s *eq_param; int codec_type; int sysclk; @@ -477,6 +485,49 @@ static const DECLARE_TLV_DB_RANGE(spk_clsd_tlv, 7, 7, TLV_DB_SCALE_ITEM(228, 0, 0) ); +static int rt5645_hweq_info(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + uinfo->type = SNDRV_CTL_ELEM_TYPE_BYTES; + uinfo->count = RT5645_HWEQ_NUM * sizeof(struct rt5645_eq_param_s); + + return 0; +} + +static int rt5645_hweq_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); + struct rt5645_priv *rt5645 = snd_soc_component_get_drvdata(component); + char *p = ucontrol->value.bytes.data; + + if (rt5645->pdata.hweq) + memcpy(p, rt5645->eq_param, + RT5645_HWEQ_NUM * sizeof(struct rt5645_eq_param_s)); + + return 0; +} + +static int rt5645_hweq_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); + struct rt5645_priv *rt5645 = snd_soc_component_get_drvdata(component); + char *p = ucontrol->value.bytes.data; + + if (rt5645->pdata.hweq) + memcpy(rt5645->eq_param, p, + RT5645_HWEQ_NUM * sizeof(struct rt5645_eq_param_s)); + + return 0; +} + +#define RT5645_HWEQ(xname) \ +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ + .info = rt5645_hweq_info, \ + .get = rt5645_hweq_get,\ + .put = rt5645_hweq_put } + static const struct snd_kcontrol_new rt5645_snd_controls[] = { /* Speaker Output Volume */ SOC_DOUBLE("Speaker Channel Switch", RT5645_SPK_VOL, @@ -541,6 +592,7 @@ static const struct snd_kcontrol_new rt5645_snd_controls[] = { /* I2S2 function select */ SOC_SINGLE("I2S2 Func Switch", RT5645_GPIO_CTRL1, RT5645_I2S2_SEL_SFT, 1, 1), + RT5645_HWEQ("Speaker HWEQ"), }; /** @@ -631,6 +683,31 @@ static int is_using_asrc(struct snd_soc_dapm_widget *source, } +static bool rt5645_validate_hweq(unsigned short reg) +{ + if ((reg >= 0x1a4 && reg <= 0x1cd) | (reg >= 0x1e5 && reg <= 0x1f8) | + (reg == RT5645_EQ_CTRL2)) + return true; + + return false; +} + +static int rt5645_enable_hweq(struct snd_soc_codec *codec) +{ + struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec); + int i; + + for (i = 0; i < RT5645_HWEQ_NUM; i++) { + if (rt5645_validate_hweq(rt5645->eq_param[i].reg)) + regmap_write(rt5645->regmap, rt5645->eq_param[i].reg, + rt5645->eq_param[i].val); + else + break; + } + + return 0; +} + /** * rt5645_sel_asrc_clk_src - select ASRC clock source for a set of filters * @codec: SoC audio codec device. @@ -1532,9 +1609,12 @@ static int rt5645_spk_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) { struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); + struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec); switch (event) { case SND_SOC_DAPM_POST_PMU: + if (rt5645->pdata.hweq) + rt5645_enable_hweq(codec); snd_soc_update_bits(codec, RT5645_PWR_DIG1, RT5645_PWR_CLS_D | RT5645_PWR_CLS_D_R | RT5645_PWR_CLS_D_L, @@ -1543,6 +1623,8 @@ static int rt5645_spk_event(struct snd_soc_dapm_widget *w, break; case SND_SOC_DAPM_PRE_PMD: + if (rt5645->pdata.hweq) + snd_soc_write(codec, RT5645_EQ_CTRL2, 0); snd_soc_update_bits(codec, RT5645_PWR_DIG1, RT5645_PWR_CLS_D | RT5645_PWR_CLS_D_R | RT5645_PWR_CLS_D_L, 0); @@ -3060,6 +3142,11 @@ static int rt5645_probe(struct snd_soc_codec *codec) snd_soc_dapm_sync(dapm); } + if (rt5645->pdata.hweq) + rt5645->eq_param = devm_kzalloc(codec->dev, + RT5645_HWEQ_NUM * sizeof(struct rt5645_eq_param_s), + GFP_KERNEL); + return 0; } @@ -3209,6 +3296,20 @@ static int strago_quirk_cb(const struct dmi_system_id *id) return 1; } +static struct rt5645_platform_data celes_platform_data = { + .dmic1_data_pin = RT5645_DMIC1_DISABLE, + .dmic2_data_pin = RT5645_DMIC_DATA_IN2P, + .jd_mode = 3, + .hweq = true, +}; + +static int celes_quirk_cb(const struct dmi_system_id *id) +{ + rt5645_pdata = &celes_platform_data; + + return 1; +} + static const struct dmi_system_id dmi_platform_intel_braswell[] = { { .ident = "Intel Strago", @@ -3219,7 +3320,7 @@ static const struct dmi_system_id dmi_platform_intel_braswell[] = { }, { .ident = "Google Celes", - .callback = strago_quirk_cb, + .callback = celes_quirk_cb, .matches = { DMI_MATCH(DMI_PRODUCT_NAME, "Celes"), }, -- 1.8.1.1.439.g50a6b54

2 3

[alsa-devel] Headphone Mic and PA
by Takashi Iwai 21 Oct '15

21 Oct '15

Hi David, I'm currently checking the bug report regarding PA, and this looks like an issue with "Headphone Mic" jack control. The reported problem is that PA doesn't react properly when both HP and dock line-out jacks are plugged and line-out is unplugged. The machine in question is Dell E7250, and I see that it has only "Headphone Mic Jack" kctl without "Headphone Jack" kctl. Is this the intentional behavior? I see the code in hda_jack.c: int snd_hda_jack_add_kctls(struct hda_codec *codec, const struct auto_pin_cfg *cfg) { const hda_nid_t *p; int i, err; for (i = 0; i < cfg->num_inputs; i++) { /* If we have headphone mics; make sure they get the right name before grabbed by output pins */ if (cfg->inputs[i].is_headphone_mic) { if (auto_cfg_hp_outs(cfg) == 1) err = add_jack_kctl(codec, auto_cfg_hp_pins(cfg)[0], cfg, "Headphone Mic"); else err = add_jack_kctl(codec, cfg->inputs[i].pin, cfg, "Headphone Mic"); } else err = add_jack_kctl(codec, cfg->inputs[i].pin, cfg, NULL); So, the driver seems doing what it was written. Meanwhile, the headphone mic comes from the quirk: [ALC293_FIXUP_DELL1_MIC_NO_PRESENCE] = { .type = HDA_FIXUP_PINS, .v.pins = (const struct hda_pintbl[]) { { 0x18, 0x01a1913d }, /* use as headphone mic, without its own jack detect */ { 0x1a, 0x01a1913c }, /* use as headset mic, without its own jack detect */ { } }, .chained = true, .chain_id = ALC269_FIXUP_HEADSET_MODE }, and this appears as if it were supposed to be a phantom jack. The alsa-info output is found in the bugzilla https://bugzilla.suse.com/show_bug.cgi?id=948979 thanks, Takashi

3 5

[alsa-devel] [PATCH 1/1] BAT: Add man page
by han.lu＠intel.com 21 Oct '15

21 Oct '15

From: "Lu, Han" <han.lu(a)intel.com> Add more information about BAT utility, including design intent, principles, use mode, hardware connection, options, example and return value. Signed-off-by: Lu, Han <han.lu(a)intel.com> diff --git a/bat/Makefile.am b/bat/Makefile.am index 0849d0d..3a76d7f 100644 --- a/bat/Makefile.am +++ b/bat/Makefile.am @@ -1,4 +1,7 @@ bin_PROGRAMS = bat +man_MANS = bat.1 + +EXTRA_DIST = bat.1 bat_SOURCES = \ bat.c \ diff --git a/bat/bat.1 b/bat/bat.1 new file mode 100644 index 0000000..e00fc27 --- /dev/null +++ b/bat/bat.1 @@ -0,0 +1,158 @@ +.TH BAT 1 "20th October 2015" +.SH NAME +bat \- command\-line sound tester for ALSA sound card driver + +.SH SYNOPSIS +\fBbat\fP [\fIflags\fP] + +.SH DESCRIPTION +\fBBAT(Basic Audio Tester)\fP is a simple command\-line utility intended +to help automate audio driver and sound server testing with little human +interaction. BAT can be used to test audio quality, stress test features +and test audio before and after PM state changes. + +BAT's design is relatively simple. BAT plays an audio stream and captures +the same stream in either a digital or analog loop back. It then compares +the captured stream using a FFT to the original to determine if the test +case passes or fails. + +BAT can either run wholly on the target machine being tested (standalone +mode) or can run as a client/server mode where by bat client runs on the +target and runs as a server on a separate tester machine. The client/server +mode still requires some manual interaction for synchronization, but this +is actively being developed for future releases. + +The hardware testing configuration may require the use of an analog cable +connecting target to tester machines or a cable to create an analog +loopback if no loopback mode is not available on the sound hardware that +is being tested. +An analog loopback cable can be used to connect the "line in" to "line out" +jacks to create a loopback. If only headphone and mic jacks (or combo jack) +are available then the following simple circuit can be used to create an +analog loopback :- + +https://source.android.com/devices/audio/loopback.html + +.SH OPTIONS +.TP +\fI\-h, \-\-help\fP +Help: show syntax. +.TP +\fI\-D\fP +Select sound card to be tested by name. +.TP +\fI\-P\fP +Select the playback PCM device. +.TP +\fI\-C\fP +Select the capture PCM device. +.TP +\fI\-f\fP +Sample format +.br +Recognized sample formats are: U8 S16_LE S24_3LE S32_LE +.br +Some of these may not be available on selected hardware +.br +The available format shortcuts are: +.nf +\-f cd (16 bit little endian, 44100, stereo) [\-f S16_LE \-c2 \-r44100] +\-f dat (16 bit little endian, 48000, stereo) [\-f S16_LE \-c2 \-r48000] +.fi +If no format is given S16_LE is used. +.TP +\fI\-c\fP +The number of channels. The default is one channel. +Valid values at the moment are 1 or 2. +.TP +\fI\-r\fP +Sampling rate in Hertz. The default rate is 44100 Hertz. +Valid values depends on hardware support. +.TP +\fI\-n\fP +Duration of generated signal. +The value could be either of the two forms: +.br +1. Decimal integer, means number of frames; +.br +2. Floating point with suffix 's', means number of seconds. +.br +The default is 2 seconds. +.TP +\fI\-k\fP +Sigma k value for analysis. +.br +The analysis function reads data from WAV file, run FFT against the data +to get magnitude of frequency vectors, and then calculates the average +value and standard deviation of frequency vectors. After that, we define +a threshold: +.br +threshold = k * standard_deviation + mean_value +.br +Frequencies with amplitude larger than threshold will be recognized as a +peak, and the frequency with largest peak value will be recognized as a +detected frequency. +.br +BAT then compares the detected frequency to target frequency, to decide +if the detecting passes or fails. +.br +The default value is 3.0. +.TP +\fI\-F\fP +Target frequency for signal generation and analysis, in Hertz. +The default is 997.0 Hertz. +Valid range is (DC_THRESHOLD, 40% * Sampling rate). +.TP +\fI\-p\fP +Total number of periods to play or capture. +.TP +\fI\-\-log=#\fP +Write stderr and stdout output to this log file. +.TP +\fI\-\-file=#\fP +Input WAV file for playback. +.TP +\fI\-\-saveplay=#\fP +Target WAV file to save capture test content. +.TP +\fI\-\-local\fP +Internal loopback mode. +Playback, capture and analysis internal to BAT only. This is intended for +developers to test new BAT features as no audio is routed outside of BAT. + +.SH EXAMPLES + +.TP +\fBbat \-P plughw:0,0 \-C plughw:0,0 \-c 2 \-f S32_LE \-F 250\fR +Generate and play a sine wave of 250 Hertz with 2 channel and S32_LE format, +and then capture and analyze. + +.TP +\fBbat \-P plughw:0,0 \-C plughw:0,0 \-\-file 500Hz.wav\fR +Play the RIFF WAV file "500Hz.wav" which contains 500 Hertz waveform LPCM +data, and then capture and analyze. + +.SH RETURN VALUE +.br +On success, returns 0. +.br +If no peak be detected, returns -1001; +.br +If only DC be detected, returns -1002; +.br +If peak frequency does not match with the target frequency, returns -1003. + +.SH SEE ALSO +\fB +aplay(1) +\fP + +.SH BUGS +Currently only support RIFF WAV format with PCM data. Please report any bugs to +the alsa-devel mailing list. + +.SH AUTHOR +\fBbat\fP is by Liam Girdwood <liam.r.girdwood(a)linux.intel.com>, Bernard Gautier +<bernard.gautier(a)intel.com> and Han Lu <han.lu(a)intel.com>. +This document is by Liam Girdwood <liam.r.girdwood(a)linux.intel.com> and Han Lu +<han.lu(a)intel.com>. -- 1.9.1

2 1

[alsa-devel] [PATCH 0/5 v2] ALSA: firewire-tascam: fix sending the same MIDI bytes in two transactions
by Takashi Sakamoto 21 Oct '15

21 Oct '15

Hi, This patchset is revised version of my previous post: http://mailman.alsa-project.org/pipermail/alsa-devel/2015-October/099123.ht… The main purpose of this patchset is to fix an issue that a transaction can include MIDI bytes in the next message. The last patch solves this issue, and the first 4 patches are for better shape of code including a small fixes. Changes: * add buffer alias * refine local variables Takashi Sakamoto (5): ALSA: firewire-tascam: remove buffer initialization in driver side ALSA: firewire-tascam: change type of valiables according to function prototype ALSA: firewire-tascam: use better name for local variables to describe their intension ALSA: firewire-tascam: fix loop condition with some readable variables ALSA: firewire-tascam: clear extra MIDI byte in an asynchronous transaction sound/firewire/tascam/tascam-transaction.c | 73 +++++++++++++++++------------- 1 file changed, 41 insertions(+), 32 deletions(-) -- 2.1.4

2 7

[alsa-devel] [PATCH] ASoC: wm8904: Correct number of EQ registers
by Charles Keepax 20 Oct '15

20 Oct '15

There are 24 EQ registers not 25, I suspect this bug came about because the registers start at EQ1 not zero. The bug is relatively harmless as the extra register written is an unused one. Signed-off-by: Charles Keepax <ckeepax(a)opensource.wolfsonmicro.com> --- include/sound/wm8904.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/sound/wm8904.h b/include/sound/wm8904.h index 898be3a..6d8f8fb 100644 --- a/include/sound/wm8904.h +++ b/include/sound/wm8904.h @@ -119,7 +119,7 @@ #define WM8904_MIC_REGS 2 #define WM8904_GPIO_REGS 4 #define WM8904_DRC_REGS 4 -#define WM8904_EQ_REGS 25 +#define WM8904_EQ_REGS 24 /** * DRC configurations are specified with a label and a set of register -- 1.7.2.5

2 1

[alsa-devel] [PATCH 1/2] ASoC: ssm2518: Drop .volatile_reg implementation
by Axel Lin 20 Oct '15

20 Oct '15

The implementation of ssm2518_register_volatile always returns false, this behavior is the same as no .volatile_reg callback implementation when cache_type != REGCACHE_NONE. Signed-off-by: Axel Lin <axel.lin(a)ingics.com> --- sound/soc/codecs/ssm2518.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sound/soc/codecs/ssm2518.c b/sound/soc/codecs/ssm2518.c index ddb0203..86b81a60 100644 --- a/sound/soc/codecs/ssm2518.c +++ b/sound/soc/codecs/ssm2518.c @@ -723,17 +723,11 @@ static struct snd_soc_codec_driver ssm2518_codec_driver = { .num_dapm_routes = ARRAY_SIZE(ssm2518_routes), }; -static bool ssm2518_register_volatile(struct device *dev, unsigned int reg) -{ - return false; -} - static const struct regmap_config ssm2518_regmap_config = { .val_bits = 8, .reg_bits = 8, .max_register = SSM2518_REG_DRC_9, - .volatile_reg = ssm2518_register_volatile, .cache_type = REGCACHE_RBTREE, .reg_defaults = ssm2518_reg_defaults, -- 2.1.4

3 5

[alsa-devel] BAT: why MAX_NUMBER_OF_CHANNELS and CHANNEL_MAX separate?
by Caleb Crome 20 Oct '15

20 Oct '15

Hi, I'm starting to bring up BAT on my board to see if it's going to work for me. I'm starting from https://github.com/hanlui/bat, is that the correct place to start from? I'm bringing up a 16 channel board, so need BAT to support more channels (currently it supports only 2). bat/include/common.h has the following defines: #define MAX_NUMBER_OF_CHANNELS 2 #define CHANNEL_MAX 2 #define CHANNEL_MIN 1 Is there any reason we need both MAX_NUMBER_OF_CHANNELS and CHANNEL_MAX? They sure seem like they can be merged to me. Once I get the program up and running, I'll add the ramp test, and start thinking about the other tests we talked about. Thanks, -Caleb

3 5

[alsa-devel] Getting ICS43432 MEMS mic working with TMS320DM365 processor
by Ankhit Vivekananda 20 Oct '15

20 Oct '15

Hello, I have configured the TM320DM365 McBSP with clock and frame synchronization signals. Also see the ICS43432 MIC serial data on the oscilloscope, but do not get the right output in my application. I have mapped the DaVinci McBSP with the CQ0093VC audio codec driver. Is this mapping correct or is it necessary to map the McBSP with ICS-43432 codec driver? Since, I have not applied the patch, I have used CQ0093VC codec driver. Please do let me know if the ICS-43432 patch really necessary for the MIC to work. Thank you, Ankhit

2 1

[alsa-devel] [PATCH] ASoC: rt5640: Fill up the IN3's support
by Oder Chiou 20 Oct '15

20 Oct '15

Signed-off-by: Oder Chiou <oder_chiou(a)realtek.com> --- Documentation/devicetree/bindings/sound/rt5640.txt | 9 ++++++--- include/sound/rt5640.h | 3 ++- sound/soc/codecs/rt5640.c | 22 +++++++++++++++++++++- 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/rt5640.txt b/Documentation/devicetree/bindings/sound/rt5640.txt index bac4d9a..9e62f6e 100644 --- a/Documentation/devicetree/bindings/sound/rt5640.txt +++ b/Documentation/devicetree/bindings/sound/rt5640.txt @@ -14,7 +14,8 @@ Optional properties: - realtek,in1-differential - realtek,in2-differential - Boolean. Indicate MIC1/2 input are differential, rather than single-ended. +- realtek,in3-differential + Boolean. Indicate MIC1/2/3 input are differential, rather than single-ended. - realtek,ldo1-en-gpios : The GPIO that controls the CODEC's LDO1_EN pin. @@ -24,9 +25,11 @@ Pins on the device (for linking into audio routes) for RT5639/RT5640: * DMIC2 * MICBIAS1 * IN1P - * IN1R + * IN1N * IN2P - * IN2R + * IN2N + * IN3P + * IN3N * HPOL * HPOR * LOUTL diff --git a/include/sound/rt5640.h b/include/sound/rt5640.h index 59d26dd..e3c84b9 100644 --- a/include/sound/rt5640.h +++ b/include/sound/rt5640.h @@ -12,9 +12,10 @@ #define __LINUX_SND_RT5640_H struct rt5640_platform_data { - /* IN1 & IN2 can optionally be differential */ + /* IN1 & IN2 & IN3 can optionally be differential */ bool in1_diff; bool in2_diff; + bool in3_diff; bool dmic_en; bool dmic1_data_pin; /* 0 = IN1P; 1 = GPIO3 */ diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c index e1ceeb8..f2beb1a 100644 --- a/sound/soc/codecs/rt5640.c +++ b/sound/soc/codecs/rt5640.c @@ -405,11 +405,14 @@ static const struct snd_kcontrol_new rt5640_snd_controls[] = { SOC_DOUBLE_TLV("DAC1 Playback Volume", RT5640_DAC1_DIG_VOL, RT5640_L_VOL_SFT, RT5640_R_VOL_SFT, 175, 0, dac_vol_tlv), - /* IN1/IN2 Control */ + /* IN1/IN2/IN3 Control */ SOC_SINGLE_TLV("IN1 Boost", RT5640_IN1_IN2, RT5640_BST_SFT1, 8, 0, bst_tlv), SOC_SINGLE_TLV("IN2 Boost", RT5640_IN3_IN4, RT5640_BST_SFT2, 8, 0, bst_tlv), + SOC_SINGLE_TLV("IN3 Boost", RT5640_IN1_IN2, + RT5640_BST_SFT2, 8, 0, bst_tlv), + /* INL/INR Volume Control */ SOC_DOUBLE_TLV("IN Capture Volume", RT5640_INL_INR_VOL, RT5640_INL_VOL_SFT, RT5640_INR_VOL_SFT, @@ -598,6 +601,8 @@ static const struct snd_kcontrol_new rt5640_rec_l_mix[] = { RT5640_M_HP_L_RM_L_SFT, 1, 1), SOC_DAPM_SINGLE("INL Switch", RT5640_REC_L2_MIXER, RT5640_M_IN_L_RM_L_SFT, 1, 1), + SOC_DAPM_SINGLE("BST3 Switch", RT5640_REC_L2_MIXER, + RT5640_M_BST2_RM_L_SFT, 1, 1), SOC_DAPM_SINGLE("BST2 Switch", RT5640_REC_L2_MIXER, RT5640_M_BST4_RM_L_SFT, 1, 1), SOC_DAPM_SINGLE("BST1 Switch", RT5640_REC_L2_MIXER, @@ -611,6 +616,8 @@ static const struct snd_kcontrol_new rt5640_rec_r_mix[] = { RT5640_M_HP_R_RM_R_SFT, 1, 1), SOC_DAPM_SINGLE("INR Switch", RT5640_REC_R2_MIXER, RT5640_M_IN_R_RM_R_SFT, 1, 1), + SOC_DAPM_SINGLE("BST3 Switch", RT5640_REC_R2_MIXER, + RT5640_M_BST2_RM_R_SFT, 1, 1), SOC_DAPM_SINGLE("BST2 Switch", RT5640_REC_R2_MIXER, RT5640_M_BST4_RM_R_SFT, 1, 1), SOC_DAPM_SINGLE("BST1 Switch", RT5640_REC_R2_MIXER, @@ -1065,6 +1072,8 @@ static const struct snd_soc_dapm_widget rt5640_dapm_widgets[] = { SND_SOC_DAPM_INPUT("IN1N"), SND_SOC_DAPM_INPUT("IN2P"), SND_SOC_DAPM_INPUT("IN2N"), + SND_SOC_DAPM_INPUT("IN3P"), + SND_SOC_DAPM_INPUT("IN3N"), SND_SOC_DAPM_PGA("DMIC L1", SND_SOC_NOPM, 0, 0, NULL, 0), SND_SOC_DAPM_PGA("DMIC R1", SND_SOC_NOPM, 0, 0, NULL, 0), SND_SOC_DAPM_PGA("DMIC L2", SND_SOC_NOPM, 0, 0, NULL, 0), @@ -1081,6 +1090,8 @@ static const struct snd_soc_dapm_widget rt5640_dapm_widgets[] = { RT5640_PWR_BST1_BIT, 0, NULL, 0), SND_SOC_DAPM_PGA("BST2", RT5640_PWR_ANLG2, RT5640_PWR_BST4_BIT, 0, NULL, 0), + SND_SOC_DAPM_PGA("BST3", RT5640_PWR_ANLG2, + RT5640_PWR_BST2_BIT, 0, NULL, 0), /* Input Volume */ SND_SOC_DAPM_PGA("INL VOL", RT5640_PWR_VOL, RT5640_PWR_IN_L_BIT, 0, NULL, 0), @@ -1310,6 +1321,7 @@ static const struct snd_soc_dapm_widget rt5639_specific_dapm_widgets[] = { static const struct snd_soc_dapm_route rt5640_dapm_routes[] = { {"IN1P", NULL, "LDO2"}, {"IN2P", NULL, "LDO2"}, + {"IN3P", NULL, "LDO2"}, {"DMIC L1", NULL, "DMIC1"}, {"DMIC R1", NULL, "DMIC1"}, @@ -1320,18 +1332,22 @@ static const struct snd_soc_dapm_route rt5640_dapm_routes[] = { {"BST1", NULL, "IN1N"}, {"BST2", NULL, "IN2P"}, {"BST2", NULL, "IN2N"}, + {"BST3", NULL, "IN3P"}, + {"BST3", NULL, "IN3N"}, {"INL VOL", NULL, "IN2P"}, {"INR VOL", NULL, "IN2N"}, {"RECMIXL", "HPOL Switch", "HPOL"}, {"RECMIXL", "INL Switch", "INL VOL"}, + {"RECMIXL", "BST3 Switch", "BST3"}, {"RECMIXL", "BST2 Switch", "BST2"}, {"RECMIXL", "BST1 Switch", "BST1"}, {"RECMIXL", "OUT MIXL Switch", "OUT MIXL"}, {"RECMIXR", "HPOR Switch", "HPOR"}, {"RECMIXR", "INR Switch", "INR VOL"}, + {"RECMIXR", "BST3 Switch", "BST3"}, {"RECMIXR", "BST2 Switch", "BST2"}, {"RECMIXR", "BST1 Switch", "BST1"}, {"RECMIXR", "OUT MIXR Switch", "OUT MIXR"}, @@ -2260,6 +2276,10 @@ static int rt5640_i2c_probe(struct i2c_client *i2c, regmap_update_bits(rt5640->regmap, RT5640_IN3_IN4, RT5640_IN_DF2, RT5640_IN_DF2); + if (rt5640->pdata.in3_diff) + regmap_update_bits(rt5640->regmap, RT5640_IN1_IN2, + RT5640_IN_DF2, RT5640_IN_DF2); + rt5640->hp_mute = 1; return snd_soc_register_codec(&i2c->dev, &soc_codec_dev_rt5640, -- 1.8.1.1.439.g50a6b54

2 1

[alsa-devel] [PATCH] ALSA: hda - Fix deadlock at error in building PCM
by Takashi Iwai 20 Oct '15

20 Oct '15

The HDA codec driver issues snd_hda_codec_reset() at the error path of PCM build. This was needed in the earlier code base, but the recent rewrite to use the standard bus binding made this a deadlock: modprobe D 0000000000000005 0 720 716 0x00000080 Call Trace: [<ffffffff816a5dbe>] schedule+0x3e/0x90 [<ffffffff816a61a5>] schedule_preempt_disabled+0x15/0x20 [<ffffffff816a7ae5>] __mutex_lock_slowpath+0xb5/0x120 [<ffffffff816a7b6b>] mutex_lock+0x1b/0x30 [<ffffffff8148656b>] device_release_driver+0x1b/0x30 [<ffffffff81485c15>] bus_remove_device+0x105/0x180 [<ffffffff814822b9>] device_del+0x139/0x260 [<ffffffffa05e0ec5>] snd_hdac_device_unregister+0x25/0x30 [snd_hda_core] [<ffffffffa074fa6a>] snd_hda_codec_reset+0x2a/0x70 [snd_hda_codec] [<ffffffffa075007b>] snd_hda_codec_build_pcms+0x18b/0x1b0 [snd_hda_codec] [<ffffffffa074a44e>] hda_codec_driver_probe+0xbe/0x140 [snd_hda_codec] [<ffffffff81486ac4>] driver_probe_device+0x1f4/0x460 [<ffffffff81486dc0>] __driver_attach+0x90/0xa0 [<ffffffff81484844>] bus_for_each_dev+0x64/0xa0 [<ffffffff814862de>] driver_attach+0x1e/0x20 [<ffffffff81485e7b>] bus_add_driver+0x1eb/0x280 [<ffffffff81487680>] driver_register+0x60/0xe0 [<ffffffffa074a0da>] __hda_codec_driver_register+0x5a/0x60 [snd_hda_codec] [<ffffffffa070a01e>] realtek_driver_init+0x1e/0x1000 [snd_hda_codec_realtek] [<ffffffff810002f3>] do_one_initcall+0xb3/0x200 [<ffffffff816a1fc5>] do_init_module+0x60/0x1f8 [<ffffffff810ee5c3>] load_module+0x1653/0x1bd0 [<ffffffff810eed48>] SYSC_finit_module+0x98/0xc0 [<ffffffff810eed8e>] SyS_finit_module+0xe/0x10 [<ffffffff816aa032>] entry_SYSCALL_64_fastpath+0x16/0x75 The simple fix is just to remove this call, since we don't need to think about unbinding at there any longer. Bugzilla: https://bugzilla.suse.com/show_bug.cgi?id=948758 Cc: <stable(a)vger.kernel.org> # v4.1+ Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/hda_codec.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 37f43a1b34ef..a249d5486889 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -3367,10 +3367,8 @@ int snd_hda_codec_build_pcms(struct hda_codec *codec) int dev, err; err = snd_hda_codec_parse_pcms(codec); - if (err < 0) { - snd_hda_codec_reset(codec); + if (err < 0) return err; - } /* attach a new PCM streams */ list_for_each_entry(cpcm, &codec->pcm_list_head, list) { -- 2.6.1

1 0

[alsa-devel] [PATCH V4 0/4] Some fixes against previous comments
by han.lu＠intel.com 20 Oct '15

20 Oct '15

From: "Lu, Han" <han.lu(a)intel.com> Some fixes and adjustments against previous comments of Takashi Lu, Han (4): BAT: Remove redundant message strings BAT: Use colon instead of comma for separation BAT: Change comments and interface of usage() BAT: Use dynamic temp file bat/bat.c | 106 +++++++++++++++++++++++++++++++---------------------------- bat/common.h | 2 +- 2 files changed, 57 insertions(+), 51 deletions(-) -- 1.9.1

2 5

[alsa-devel] [PATCH 0/6] HD-audio modalias support patchset
by Takashi Iwai 20 Oct '15

20 Oct '15

Hi, this is a patchset to add the support of automatic modalias creation for HD-audio codec drivers like other standard drivers. Currently, the HDA codec driver has put module alias manually due to ugly historical reasons. This patch finally moves to the saner way. Also it adds the udev modalias support so that it can be autoloaded in udev. The patchset was initiated by Intel people for SKL ASoC drivers. Now I brushed up and made it working for legacy drivers. The current patchset is found in topic/hda-modalias branch of sound git tree, too. thanks, Takashi === Subhransu S. Prusty (2): ALSA: hda - Add hduadio support to DEVTABLE ALSA: hda - Add hdaudio bus modalias support Takashi Iwai (3): ALSA: hda - Add api_version to hda_device_id struct ALSA: hda - Add a common helper to give the codec modalias string ALSA: hda - convert to hda_device_id Thierry Reding (1): ALSA: hda - Advertise MODALIAS in uevent include/linux/mod_devicetable.h | 8 ++ include/sound/hdaudio.h | 12 +-- scripts/mod/devicetable-offsets.c | 5 + scripts/mod/file2alias.c | 17 +++ sound/hda/hda_bus_type.c | 13 +++ sound/hda/hdac_device.c | 15 +++ sound/hda/hdac_sysfs.c | 8 ++ sound/pci/hda/hda_bind.c | 32 +++--- sound/pci/hda/hda_codec.h | 19 ++-- sound/pci/hda/hda_generic.c | 7 +- sound/pci/hda/patch_analog.c | 37 ++++--- sound/pci/hda/patch_ca0110.c | 15 ++- sound/pci/hda/patch_ca0132.c | 9 +- sound/pci/hda/patch_cirrus.c | 21 ++-- sound/pci/hda/patch_cmedia.c | 15 ++- sound/pci/hda/patch_conexant.c | 118 ++++++--------------- sound/pci/hda/patch_hdmi.c | 201 +++++++++++++---------------------- sound/pci/hda/patch_realtek.c | 122 ++++++++++------------ sound/pci/hda/patch_si3054.c | 39 +++---- sound/pci/hda/patch_sigmatel.c | 214 +++++++++++++++++++------------------- sound/pci/hda/patch_via.c | 153 ++++++++++----------------- 21 files changed, 475 insertions(+), 605 deletions(-) -- 2.6.1

2 9

[alsa-devel] [PATCH] ASoC: Intel: Skylake: Convert to devm_snd_soc_register_card
by Axel Lin 20 Oct '15

20 Oct '15

Signed-off-by: Axel Lin <axel.lin(a)ingics.com> --- sound/soc/intel/boards/skl_rt286.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/sound/soc/intel/boards/skl_rt286.c b/sound/soc/intel/boards/skl_rt286.c index 488c98e..3b6f48c 100644 --- a/sound/soc/intel/boards/skl_rt286.c +++ b/sound/soc/intel/boards/skl_rt286.c @@ -240,18 +240,11 @@ static int skylake_audio_probe(struct platform_device *pdev) { skylake_rt286.dev = &pdev->dev; - return snd_soc_register_card(&skylake_rt286); -} - -static int skylake_audio_remove(struct platform_device *pdev) -{ - snd_soc_unregister_card(&skylake_rt286); - return 0; + return devm_snd_soc_register_card(&skylake_rt286); } static struct platform_driver skylake_audio = { .probe = skylake_audio_probe, - .remove = skylake_audio_remove, .driver = { .name = "skl_alc286s_i2s", }, -- 2.1.4

1 0

[alsa-devel] Implementing sub-stream multiplexing in DAI
by Ughreja, Rakesh A 19 Oct '15

19 Oct '15

Hi Mark, In order to implement sub-stream multiplexing as a part of single BE DAI I have following observations. 1. All BE DAI ops gets called only once even if two different FE DAIs are connected to a BE DAI. 2. BE DAI ops are always called with sub-stream 0. are these expected ? What is the best way to allow calling of BE DAI ops with different sub-stream ID so that I can do link configuration based on sub-stream parameters ? can you give some pointers ? Regards, Rakesh

2 1

[alsa-devel] [PATCH] ASoC: rockchip: spdif: Convert to use devm_snd_dmaengine_pcm_register
by Axel Lin 19 Oct '15

19 Oct '15

Use resource managed API then we can remove snd_dmaengine_pcm_unregister() and snd_soc_unregister_component() calls in .probe error path and .remove. Signed-off-by: Axel Lin <axel.lin(a)ingics.com> --- sound/soc/rockchip/rockchip_spdif.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/sound/soc/rockchip/rockchip_spdif.c b/sound/soc/rockchip/rockchip_spdif.c index 9d5c470..a38a302 100644 --- a/sound/soc/rockchip/rockchip_spdif.c +++ b/sound/soc/rockchip/rockchip_spdif.c @@ -355,16 +355,14 @@ static int rk_spdif_probe(struct platform_device *pdev) goto err_pm_runtime; } - ret = snd_dmaengine_pcm_register(&pdev->dev, NULL, 0); + ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0); if (ret) { dev_err(&pdev->dev, "Could not register PCM\n"); - goto err_pcm_register; + goto err_pm_runtime; } return 0; -err_pcm_register: - snd_dmaengine_pcm_unregister(&pdev->dev); err_pm_runtime: pm_runtime_disable(&pdev->dev); @@ -381,8 +379,6 @@ static int rk_spdif_remove(struct platform_device *pdev) clk_disable_unprepare(spdif->mclk); clk_disable_unprepare(spdif->hclk); - snd_dmaengine_pcm_unregister(&pdev->dev); - snd_soc_unregister_component(&pdev->dev); return 0; } -- 2.1.4

2 1

[alsa-devel] [PATCH v3] ASoC: Intel: Skylake - Add Skylake RT286 I2S machine driver
by Vinod Koul 19 Oct '15

19 Oct '15

From: Omair M Abdullah <omair.m.abdullah(a)intel.com> Add the SKL I2S machine driver using Realtek ALC286S codec in I2S mode. Signed-off-by: Omair M Abdullah <omair.m.abdullah(a)intel.com> Signed-off-by: Jeeja KP <jeeja.kp(a)intel.com> Signed-off-by: Vinod Koul <vinod.koul(a)intel.com> --- v3: fixed sparse warns v2: added depends on X86 and ACPI based on LKP reports sound/soc/intel/Kconfig | 13 ++ sound/soc/intel/boards/Makefile | 2 + sound/soc/intel/boards/skl_rt286.c | 266 +++++++++++++++++++++++++++++++++++++ 3 files changed, 281 insertions(+) create mode 100644 sound/soc/intel/boards/skl_rt286.c diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig index 664df1f44530..6d67357f2d74 100644 --- a/sound/soc/intel/Kconfig +++ b/sound/soc/intel/Kconfig @@ -140,3 +140,16 @@ config SND_SOC_INTEL_SKYLAKE select SND_HDA_EXT_CORE select SND_SOC_TOPOLOGY select SND_SOC_INTEL_SST + +config SND_SOC_INTEL_SKL_RT286_MACH + tristate "ASoC Audio driver for SKL with RT286 I2S mode" + depends on X86 && ACPI + select SND_SOC_INTEL_SST + select SND_SOC_INTEL_SKYLAKE + select SND_SOC_RT286 + select SND_SOC_DMIC + help + This adds support for ASoC machine driver for Skylake platforms + with RT286 I2S audio codec. + Say Y if you have such a device + If unsure select "N". diff --git a/sound/soc/intel/boards/Makefile b/sound/soc/intel/boards/Makefile index cb94895c9edb..371c4565cad8 100644 --- a/sound/soc/intel/boards/Makefile +++ b/sound/soc/intel/boards/Makefile @@ -6,6 +6,7 @@ snd-soc-sst-bytcr-rt5640-objs := bytcr_rt5640.o snd-soc-sst-cht-bsw-rt5672-objs := cht_bsw_rt5672.o snd-soc-sst-cht-bsw-rt5645-objs := cht_bsw_rt5645.o snd-soc-sst-cht-bsw-max98090_ti-objs := cht_bsw_max98090_ti.o +snd-soc-skl_rt286-objs := skl_rt286.o obj-$(CONFIG_SND_SOC_INTEL_HASWELL_MACH) += snd-soc-sst-haswell.o obj-$(CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH) += snd-soc-sst-byt-rt5640-mach.o @@ -15,3 +16,4 @@ obj-$(CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH) += snd-soc-sst-bytcr-rt5640.o obj-$(CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH) += snd-soc-sst-cht-bsw-rt5672.o obj-$(CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH) += snd-soc-sst-cht-bsw-rt5645.o obj-$(CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH) += snd-soc-sst-cht-bsw-max98090_ti.o +obj-$(CONFIG_SND_SOC_INTEL_SKL_RT286_MACH) += snd-soc-skl_rt286.o diff --git a/sound/soc/intel/boards/skl_rt286.c b/sound/soc/intel/boards/skl_rt286.c new file mode 100644 index 000000000000..488c98ee1ded --- /dev/null +++ b/sound/soc/intel/boards/skl_rt286.c @@ -0,0 +1,266 @@ +/* + * Intel Skylake I2S Machine Driver + * + * Copyright (C) 2014-2015, Intel Corporation. All rights reserved. + * + * Modified from: + * Intel Broadwell Wildcatpoint SST Audio + * + * Copyright (C) 2013, Intel Corporation. All rights reserved. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License version + * 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <linux/module.h> +#include <linux/platform_device.h> +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/soc.h> +#include <sound/jack.h> +#include <sound/pcm_params.h> +#include "../../codecs/rt286.h" + +static struct snd_soc_jack skylake_headset; +/* Headset jack detection DAPM pins */ +static struct snd_soc_jack_pin skylake_headset_pins[] = { + { + .pin = "Mic Jack", + .mask = SND_JACK_MICROPHONE, + }, + { + .pin = "Headphone Jack", + .mask = SND_JACK_HEADPHONE, + }, +}; + +static const struct snd_kcontrol_new skylake_controls[] = { + SOC_DAPM_PIN_SWITCH("Speaker"), + SOC_DAPM_PIN_SWITCH("Headphone Jack"), + SOC_DAPM_PIN_SWITCH("Mic Jack"), +}; + +static const struct snd_soc_dapm_widget skylake_widgets[] = { + SND_SOC_DAPM_HP("Headphone Jack", NULL), + SND_SOC_DAPM_SPK("Speaker", NULL), + SND_SOC_DAPM_MIC("Mic Jack", NULL), + SND_SOC_DAPM_MIC("DMIC2", NULL), + SND_SOC_DAPM_MIC("SoC DMIC", NULL), +}; + +static const struct snd_soc_dapm_route skylake_rt286_map[] = { + /* speaker */ + {"Speaker", NULL, "SPOR"}, + {"Speaker", NULL, "SPOL"}, + + /* HP jack connectors - unknown if we have jack deteck */ + {"Headphone Jack", NULL, "HPO Pin"}, + + /* other jacks */ + {"MIC1", NULL, "Mic Jack"}, + + /* digital mics */ + {"DMIC1 Pin", NULL, "DMIC2"}, + {"DMIC AIF", NULL, "SoC DMIC"}, + + /* CODEC BE connections */ + { "AIF1 Playback", NULL, "ssp0 Tx"}, + { "ssp0 Tx", NULL, "codec0_out"}, + { "ssp0 Tx", NULL, "codec1_out"}, + + { "codec0_in", NULL, "ssp0 Rx" }, + { "codec1_in", NULL, "ssp0 Rx" }, + { "ssp0 Rx", NULL, "AIF1 Capture" }, + + { "dmic01_hifi", NULL, "DMIC01 Rx" }, + { "DMIC01 Rx", NULL, "Capture" }, + + { "hif1", NULL, "iDisp Tx"}, + { "iDisp Tx", NULL, "iDisp_out"}, + +}; + +static int skylake_rt286_codec_init(struct snd_soc_pcm_runtime *rtd) +{ + struct snd_soc_codec *codec = rtd->codec; + int ret; + + ret = snd_soc_card_jack_new(rtd->card, "Headset", + SND_JACK_HEADSET | SND_JACK_BTN_0, + &skylake_headset, + skylake_headset_pins, ARRAY_SIZE(skylake_headset_pins)); + + if (ret) + return ret; + + rt286_mic_detect(codec, &skylake_headset); + + return 0; +} + + +static int skylake_ssp0_fixup(struct snd_soc_pcm_runtime *rtd, + struct snd_pcm_hw_params *params) +{ + struct snd_interval *rate = hw_param_interval(params, + SNDRV_PCM_HW_PARAM_RATE); + struct snd_interval *channels = hw_param_interval(params, + SNDRV_PCM_HW_PARAM_CHANNELS); + + /* The output is 48KHz, stereo, 16bits */ + rate->min = rate->max = 48000; + channels->min = channels->max = 2; + params_set_format(params, SNDRV_PCM_FORMAT_S16_LE); + + return 0; +} + +static int skylake_rt286_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_dai *codec_dai = rtd->codec_dai; + int ret; + + ret = snd_soc_dai_set_sysclk(codec_dai, RT286_SCLK_S_PLL, 24000000, + SND_SOC_CLOCK_IN); + if (ret < 0) + dev_err(rtd->dev, "set codec sysclk failed: %d\n", ret); + + return ret; +} + +static struct snd_soc_ops skylake_rt286_ops = { + .hw_params = skylake_rt286_hw_params, +}; + +/* skylake digital audio interface glue - connects codec <--> CPU */ +static struct snd_soc_dai_link skylake_rt286_dais[] = { + /* Front End DAI links */ + { + .name = "Skl Audio Port", + .stream_name = "Audio", + .cpu_dai_name = "System Pin", + .platform_name = "0000:00:1f.3", + .nonatomic = 1, + .dynamic = 1, + .codec_name = "snd-soc-dummy", + .codec_dai_name = "snd-soc-dummy-dai", + .trigger = { + SND_SOC_DPCM_TRIGGER_POST, + SND_SOC_DPCM_TRIGGER_POST + }, + .dpcm_playback = 1, + }, + { + .name = "Skl Audio Capture Port", + .stream_name = "Audio Record", + .cpu_dai_name = "System Pin", + .platform_name = "0000:00:1f.3", + .nonatomic = 1, + .dynamic = 1, + .codec_name = "snd-soc-dummy", + .codec_dai_name = "snd-soc-dummy-dai", + .trigger = { + SND_SOC_DPCM_TRIGGER_POST, + SND_SOC_DPCM_TRIGGER_POST + }, + .dpcm_capture = 1, + }, + { + .name = "Skl Audio Reference cap", + .stream_name = "refcap", + .cpu_dai_name = "Reference Pin", + .codec_name = "snd-soc-dummy", + .codec_dai_name = "snd-soc-dummy-dai", + .platform_name = "0000:00:1f.3", + .init = NULL, + .dpcm_capture = 1, + .ignore_suspend = 1, + .nonatomic = 1, + .dynamic = 1, + }, + + /* Back End DAI links */ + { + /* SSP0 - Codec */ + .name = "SSP0-Codec", + .be_id = 0, + .cpu_dai_name = "SSP0 Pin", + .platform_name = "0000:00:1f.3", + .no_pcm = 1, + .codec_name = "i2c-INT343A:00", + .codec_dai_name = "rt286-aif1", + .init = skylake_rt286_codec_init, + .dai_fmt = SND_SOC_DAIFMT_I2S | + SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBS_CFS, + .ignore_suspend = 1, + .ignore_pmdown_time = 1, + .be_hw_params_fixup = skylake_ssp0_fixup, + .ops = &skylake_rt286_ops, + .dpcm_playback = 1, + .dpcm_capture = 1, + }, + { + .name = "dmic01", + .be_id = 1, + .cpu_dai_name = "DMIC01 Pin", + .codec_name = "dmic-codec", + .codec_dai_name = "dmic-hifi", + .platform_name = "0000:00:1f.3", + .ignore_suspend = 1, + .dpcm_capture = 1, + .no_pcm = 1, + }, +}; + +/* skylake audio machine driver for SPT + RT286S */ +static struct snd_soc_card skylake_rt286 = { + .name = "skylake-rt286", + .owner = THIS_MODULE, + .dai_link = skylake_rt286_dais, + .num_links = ARRAY_SIZE(skylake_rt286_dais), + .controls = skylake_controls, + .num_controls = ARRAY_SIZE(skylake_controls), + .dapm_widgets = skylake_widgets, + .num_dapm_widgets = ARRAY_SIZE(skylake_widgets), + .dapm_routes = skylake_rt286_map, + .num_dapm_routes = ARRAY_SIZE(skylake_rt286_map), + .fully_routed = true, +}; + +static int skylake_audio_probe(struct platform_device *pdev) +{ + skylake_rt286.dev = &pdev->dev; + + return snd_soc_register_card(&skylake_rt286); +} + +static int skylake_audio_remove(struct platform_device *pdev) +{ + snd_soc_unregister_card(&skylake_rt286); + return 0; +} + +static struct platform_driver skylake_audio = { + .probe = skylake_audio_probe, + .remove = skylake_audio_remove, + .driver = { + .name = "skl_alc286s_i2s", + }, +}; + +module_platform_driver(skylake_audio) + +/* Module information */ +MODULE_AUTHOR("Omair Mohammed Abdullah <omair.m.abdullah(a)intel.com>"); +MODULE_DESCRIPTION("Intel SST Audio for Skylake"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:skl_alc286s_i2s"); -- 1.9.1

2 1

[alsa-devel] [PATCH] ASoC: ad193x-spi: Add adau1328 to ad193x_spi_id table
by Axel Lin 19 Oct '15

19 Oct '15

This driver also supports adau1328, thus add adau1328 to ad193x_spi_id. Signed-off-by: Axel Lin <axel.lin(a)ingics.com> --- sound/soc/codecs/ad193x-spi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/codecs/ad193x-spi.c b/sound/soc/codecs/ad193x-spi.c index b55055a..431f95d 100644 --- a/sound/soc/codecs/ad193x-spi.c +++ b/sound/soc/codecs/ad193x-spi.c @@ -41,6 +41,7 @@ static const struct spi_device_id ad193x_spi_id[] = { { "ad1934", AD1934 }, { "ad1938", AD193X }, { "ad1939", AD193X }, + { "adau1328", AD193X }, { } }; MODULE_DEVICE_TABLE(spi, ad193x_spi_id); -- 2.1.4

3 2

[alsa-devel] [PATCH 0/7] ALSA: USB-audio: Support Zoom R16 playback
by Ricard Wanderlof 19 Oct '15

19 Oct '15

The Zoom R16 has a nonstandard playback format where each isochronous packet contains a length descriptor in the first four bytes. Curiously, capture data does not contain this and requires no quirk. The quirk involves adding the extra length descriptor whenever outgoing isochronous packets are generated, both in pcm.c (outgoing audio) and endpoint.c (silent data). The calculation for the max packet size in endpoint.c is also affected. This patch series refactors some code in pcm.c and endpoint.c before the actual quirk implementation. A commit then cleans up the entry in the quirks table. Tested with a Zoom R16, both separately using arecord and aplay (8 channel capture and 2 channel playback, respectively), as well as capture and playback together together using the Ardour digitial audio workstation application. The R24 reportedly is compatible with the R16, but I don't have access to one so I can't test it, and consequently the patch series only mentions the R16. Also tested using an Edirol UA-5 in both class compliant (16-bit) and "advanced" (24 bit, forces the use of quirks) modes in order to do some form of regression testing. Ricard Wanderlof (7): Break out copying to urb from prepare_playback_urb() Also move out hwptr_done wrap from prepare_playback_urb() Break out creation of silent urbs from prepare_outbound_urb() Add offset parameter to copy_to_urb() Add quirk for Zoom R16 playback Adjust max packet size calculation for tx_length_quirk Remove mixer entry from Zoom R16/24 quirk sound/usb/card.h | 1 + sound/usb/endpoint.c | 73 +++++++++++++++++++++++++++++++++-------------- sound/usb/pcm.c | 74 +++++++++++++++++++++++++++++++++++++----------- sound/usb/quirks-table.h | 14 +++------ sound/usb/quirks.c | 3 ++ sound/usb/stream.c | 1 + sound/usb/usbaudio.h | 1 + 7 files changed, 119 insertions(+), 48 deletions(-) -- 2.1.4

4 23

[alsa-devel] [PATCH 0/3] Add support for Cirrus Logic CS47L24 and WM1831 codecs
by Richard Fitzgerald 19 Oct '15

19 Oct '15

mfd patch based on Lee Jones's for-next gpio patch based on Linus Walleij's for-next ASoC patch based on Mark Brown's for-next Lee/Mark - can one of you take all three patches (with maintainer acks) so that the patch set is kept together? Richard Fitzgerald (3): mfd: arizona: Support Cirrus Logic CS47L24 and WM1831 gpio: arizona: Support Cirrus Logic CS47L24 and WM1831 ASoC: cs47l24: Add driver for Cirrus Logic CS47L24 and WM1831 codecs Documentation/devicetree/bindings/mfd/arizona.txt | 4 +- drivers/gpio/gpio-arizona.c | 4 + drivers/mfd/Kconfig | 19 +- drivers/mfd/Makefile | 3 + drivers/mfd/arizona-core.c | 72 +- drivers/mfd/arizona-irq.c | 40 +- drivers/mfd/arizona-spi.c | 7 + drivers/mfd/arizona.h | 4 + drivers/mfd/cs47l24-tables.c | 1629 +++++++++++++++++++++ include/linux/mfd/arizona/core.h | 3 + sound/soc/codecs/Kconfig | 8 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/cs47l24.c | 1147 +++++++++++++++ sound/soc/codecs/cs47l24.h | 23 + 14 files changed, 2940 insertions(+), 25 deletions(-) create mode 100644 drivers/mfd/cs47l24-tables.c create mode 100644 sound/soc/codecs/cs47l24.c create mode 100644 sound/soc/codecs/cs47l24.h -- 1.9.1

2 4

[alsa-devel] [patch] ALSA: firewire-tascam: off by one in identify_model()
by Dan Carpenter 19 Oct '15

19 Oct '15

In the original code, we potentially put a NUL character in model[8] and it caused a static checker warning. We can put the NUL in model[7] instead. Fixes: 53b3ffee7885 ('ALSA: firewire-tascam: change device probing processing') Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/sound/firewire/tascam/tascam.c b/sound/firewire/tascam/tascam.c index c6747a4..6ef2bcc 100644 --- a/sound/firewire/tascam/tascam.c +++ b/sound/firewire/tascam/tascam.c @@ -51,7 +51,7 @@ static int identify_model(struct snd_tscm *tscm) } /* Pick up model name from certain addresses. */ - for (i = 0; i < 8; i++) { + for (i = 0; i < 7; i++) { c = config_rom[28 + i / 4] >> (24 - 8 * (i % 4)); if (c == '\0') break;

3 6

[alsa-devel] [PATCH 0/3] ALSA: oxfw: add support for TASCAM FireOne
by Takashi Sakamoto 19 Oct '15

19 Oct '15

Hi, This parchset adds support for TASCAM FireOne to ALSA OXFW driver. PCM and MIDI functionalities become available including physical controls. The first and second patches are preparation for it. This model supports some extra commands. So as the other ALSA drivers for sound and music units on IEEE 1394 bus, they should be implemented in userspace applications. For your information, I note them: (Jog/Shuttle display mode) ./firewire-request /dev/fw1 fcp 0x01ff0000022e46493110ffff response: 000: 0c ff 00 00 02 2e 46 49 31 10 06 * The last byte is: * 0x00: always off * 0x01: always on * 0x02: breathe * 0x03: metronome * 0x04: MIDI clock rotate * 0x05: MIDI clock flash * 0x06: jog slow rotate * 0x07: Jog track (Control surface mode) ./firewire-request /dev/fw1 fcp 0x01ff0000022e46493111ffff response: 000: 0c ff 00 00 02 2e 46 49 31 11 00 * The last bytes is: * 0x00: FireOne native * 0x01: Mackie Human User Interface emulation (Input monitor monaural) ./firewire-request /dev/fw1 fcp 0x01ff0000022e46493112ffff response: 000: 0c ff 00 00 02 2e 46 49 31 12 00 * The last byte is: * 0x00: off * 0x01: on (Firmware version, read-only) ./firewire-request /dev/fw1 fcp 0x01ff0000022e46493113ffff response: 000: 0c ff 00 00 02 2e 46 49 31 13 02 * The last byte is: * 0x02: version 2 I can see additional commands from Windows driver. They seem to be used to retrieve the name of data channels. ./firewire-request /dev/fw1 fcp 0x01ff0000022e48535460ff0000000040 response: 000: 0c ff 00 00 02 2e 48 53 54 60 ff 00 00 00 12 0c ......HST`...... response: 010: 41 75 64 69 6f 20 4f 75 74 20 4c 00 Audio Out L. ./firewire-request /dev/fw1 fcp 0x01ff0000022e48535460ff0000010040 response: 000: 0c ff 00 00 02 2e 48 53 54 60 ff 00 00 01 12 0c ......HST`...... response: 010: 41 75 64 69 6f 20 4f 75 74 20 52 00 Audio Out R. ./firewire-request /dev/fw1 fcp 0x01ff0000022e48535460ff0000020040 response: 000: 0c ff 00 00 02 2e 48 53 54 60 ff 00 00 02 12 09 ......HST`...... response: 010: 4d 69 64 69 20 4f 75 74 20 Midi Out ./firewire-request /dev/fw1 fcp 0x01ff0000022e48535460ff0001000040 response: 000: 0c ff 00 00 02 2e 48 53 54 60 ff 00 01 00 12 0b ......HST`...... response: 010: 41 75 64 69 6f 20 49 6e 20 41 00 Audio In A. ./firewire-request /dev/fw1 fcp 0x01ff0000022e48535460ff0001010040 response: 000: 0c ff 00 00 02 2e 48 53 54 60 ff 00 01 01 12 0b ......HST`...... response: 010: 41 75 64 69 6f 20 49 6e 20 42 00 Audio In B. ./firewire-request /dev/fw1 fcp 0x01ff0000022e48535460ff0001020040 response: 000: 0c ff 00 00 02 2e 48 53 54 60 ff 00 01 02 12 08 ......HST`...... response: 010: 4d 69 64 69 20 49 6e 20 Midi In ./firewire-request /dev/fw1 fcp 0x01ff0000022e48535470ff0000000040 response: 000: 0c ff 00 00 02 2e 48 53 54 70 ff 00 00 00 12 06 ......HSTp...... response: 010: 41 75 64 69 6f 20 Audio ./firewire-request /dev/fw1 fcp 0x01ff0000022e48535470ff0000010040 response: 000: 0c ff 00 00 02 2e 48 53 54 70 ff 00 00 01 12 00 ......HSTp...... ./firewire-request /dev/fw1 fcp 0x01ff0000022e48535470ff0000020040 response: 000: 0a ff 00 00 02 2e 48 53 54 70 ff 00 00 02 00 40 ......HSTp.....@ ./firewire-request /dev/fw1 fcp 0x01ff0000022e48535470ff0001000040 response: 000: 0c ff 00 00 02 2e 48 53 54 70 ff 00 01 00 12 06 ......HSTp...... response: 010: 41 75 64 69 6f 20 Audio ./firewire-request /dev/fw1 fcp 0x01ff0000022e48535470ff0001010040 response: 000: 0c ff 00 00 02 2e 48 53 54 70 ff 00 01 01 12 00 ......HSTp...... ./firewire-request /dev/fw1 fcp 0x01ff0000022e48535470ff0001020040 response: 000: 0a ff 00 00 02 2e 48 53 54 70 ff 00 01 02 00 40 ......HSTp.....@ ./firewire-request /dev/fw1 fcp 0x01ff0000022e48535460ff8100000040 response: 000: 0c ff 00 00 02 2e 48 53 54 60 ff 81 00 00 12 0c ......HST`...... response: 010: 4d 69 64 69 20 49 6e 20 4f 6e 65 00 Midi In One. ./firewire-request /dev/fw1 fcp 0x01ff0000022e48535460ff8101000040 response: 000: 0c ff 00 00 02 2e 48 53 54 60 ff 81 01 00 12 0d ......HST`...... response: 010: 4d 69 64 69 20 4f 75 74 20 4f 6e 65 00 Midi Out One. ./firewire-request /dev/fw1 fcp 0x01ff0000022e48535460ff8200000040 response: 000: 0c ff 00 00 02 2e 48 53 54 60 ff 82 00 00 12 0c ......HST`...... response: 010: 4d 69 64 69 20 49 6e 20 54 77 6f 00 Midi In Two. ./firewire-request /dev/fw1 fcp 0x01ff0000022e48535460ff8201000040 response: 000: 0c ff 00 00 02 2e 48 53 54 60 ff 82 01 00 12 0d ......HST`...... response: 010: 4d 69 64 69 20 4f 75 74 20 54 77 6f 00 Midi Out Two. Takashi Sakamoto (3): ALSA: oxfw: calculating MIDI ports in stream discover ALSA: oxfw: support more MIDI ports ALSA: oxfw: add an entry for TASCAM FireOne sound/firewire/oxfw/oxfw-midi.c | 24 +++--------------------- sound/firewire/oxfw/oxfw-stream.c | 37 +++++++++++++++++++++++++++++++++++-- sound/firewire/oxfw/oxfw.c | 17 +++++++++++++++++ 3 files changed, 55 insertions(+), 23 deletions(-) -- 2.1.4

2 5

[alsa-devel] [PATCH v3] drm/i915: Improve kernel-doc for i915_audio_component struct
by David Henningsson 19 Oct '15

19 Oct '15

Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- Now rebased against drm-intel git master. include/drm/i915_component.h | 69 ++++++++++++++++++++++++++++++++------------ 1 file changed, 51 insertions(+), 18 deletions(-) diff --git a/include/drm/i915_component.h b/include/drm/i915_component.h index 30d89e0..fab1385 100644 --- a/include/drm/i915_component.h +++ b/include/drm/i915_component.h @@ -31,47 +31,80 @@ #define MAX_PORTS 5 /** - * struct i915_audio_component_ops - callbacks defined in gfx driver - * @owner: the module owner - * @get_power: get the POWER_DOMAIN_AUDIO power well - * @put_power: put the POWER_DOMAIN_AUDIO power well - * @codec_wake_override: Enable/Disable generating the codec wake signal - * @get_cdclk_freq: get the Core Display Clock in KHz - * @sync_audio_rate: set n/cts based on the sample rate + * struct i915_audio_component_ops - Ops implemented by i915 driver, called by hda driver */ struct i915_audio_component_ops { + /** + * @owner: i915 module + */ struct module *owner; + /** + * @get_power: get the POWER_DOMAIN_AUDIO power well + * + * Request the power well to be turned on. + */ void (*get_power)(struct device *); + /** + * @put_power: put the POWER_DOMAIN_AUDIO power well + * + * Allow the power well to be turned off. + */ void (*put_power)(struct device *); + /** + * @codec_wake_override: Enable/disable codec wake signal + */ void (*codec_wake_override)(struct device *, bool enable); + /** + * @get_cdclk_freq: Get the Core Display Clock in kHz + */ int (*get_cdclk_freq)(struct device *); + /** + * @sync_audio_rate: set n/cts based on the sample rate + * + * Called from audio driver. After audio driver sets the + * sample rate, it will call this function to set n/cts + */ int (*sync_audio_rate)(struct device *, int port, int rate); }; +/** + * struct i915_audio_component_audio_ops - Ops implemented by hda driver, called by i915 driver + */ struct i915_audio_component_audio_ops { + /** + * @audio_ptr: Pointer to be used in call to pin_eld_notify + */ void *audio_ptr; /** - * Call from i915 driver, notifying the HDA driver that - * pin sense and/or ELD information has changed. - * @audio_ptr: HDA driver object - * @port: Which port has changed (PORTA / PORTB / PORTC etc) + * @pin_eld_notify: Notify the HDA driver that pin sense and/or ELD information has changed + * + * Called when the i915 driver has set up audio pipeline or has just + * begun to tear it down. This allows the HDA driver to update its + * status accordingly (even when the HDA controller is in power save + * mode). */ void (*pin_eld_notify)(void *audio_ptr, int port); }; /** - * struct i915_audio_component - used for audio video interaction - * @dev: the device from gfx driver - * @aud_sample_rate: the array of audio sample rate per port - * @ops: callback for audio driver calling - * @audio_ops: Call from i915 driver + * struct i915_audio_component - Used for direct communication between i915 and hda drivers */ struct i915_audio_component { + /** + * @dev: i915 device, used as parameter for ops + */ struct device *dev; + /** + * @aud_sample_rate: the array of audio sample rate per port + */ int aud_sample_rate[MAX_PORTS]; - + /** + * @ops: Ops implemented by i915 driver, called by hda driver + */ const struct i915_audio_component_ops *ops; - + /** + * @audio_ops: Ops implemented by hda driver, called by i915 driver + */ const struct i915_audio_component_audio_ops *audio_ops; }; -- 1.9.1

2 1

[alsa-devel] [PATCH 0/5] ALSA: firewire: suppress sparse warnings due to endianness handling
by Takashi Sakamoto 19 Oct '15

19 Oct '15

Hi, This patchset fixes some issues related to sparse warnings about endianness handling for ALSA firewire stack. For writing this patchset, I use 'C=1 CF=-D__CHECK_ENDIAN__' options to 'make' command. If they're not enough, please inform to me. Takashi Sakamoto (5): ALSA: dice: correct variable types for __be32 data ALSA: dice: assign converted data to the same type of variable ALSA: fireworks: use u32 type for be32_to_cpup() macro ALSA: bebob: use correct type for __be32 data ALSA: firewire-digi00x/firewire-tascam: remove wrong conversion for Config ROM sound/firewire/bebob/bebob_maudio.c | 2 +- sound/firewire/dice/dice-stream.c | 12 ++++++------ sound/firewire/dice/dice.c | 3 ++- sound/firewire/digi00x/digi00x.c | 3 +-- sound/firewire/fireworks/fireworks_command.c | 2 +- sound/firewire/tascam/tascam.c | 3 +-- 6 files changed, 12 insertions(+), 13 deletions(-) -- 2.1.4

2 6

[alsa-devel] [PATCH] ALSA: firewire-lib: avoid NULL pointer dereference after closing MIDI port
by Takashi Sakamoto 19 Oct '15

19 Oct '15

When asynchronous MIDI port is closed before callbacked, the callback function causes NULL pointer dereference to missing MIDI substream. This commit fixes this bug. Fixes: e8a40d9bcb23('ALSA: firewire-lib: schedule work again when MIDI substream has rest of MIDI messages') Reported-by: Dan Carpenter <dan.carpenter(a)oracle.com> Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- sound/firewire/lib.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sound/firewire/lib.c b/sound/firewire/lib.c index edf1c8b..f80aafa 100644 --- a/sound/firewire/lib.c +++ b/sound/firewire/lib.c @@ -74,7 +74,11 @@ static void async_midi_port_callback(struct fw_card *card, int rcode, struct snd_fw_async_midi_port *port = callback_data; struct snd_rawmidi_substream *substream = ACCESS_ONCE(port->substream); - if (rcode == RCODE_COMPLETE && substream != NULL) + /* This port is closed. */ + if (substream == NULL) + return; + + if (rcode == RCODE_COMPLETE) snd_rawmidi_transmit_ack(substream, port->consume_bytes); else if (!rcode_is_permanent_error(rcode)) /* To start next transaction immediately for recovery. */ -- 2.1.4

2 1

[alsa-devel] [PATCH v6 1/4] drm/i915: Add audio sync_audio_rate callback
by libin.yang＠intel.com 19 Oct '15

19 Oct '15

From: Libin Yang <libin.yang(a)intel.com> Add the sync_audio_rate callback. With the callback, audio driver can trigger i915 driver to set the proper N/CTS or N/M based on different sample rates. Signed-off-by: Libin Yang <libin.yang(a)intel.com> --- include/drm/i915_component.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/drm/i915_component.h b/include/drm/i915_component.h index c9a8b64..8ad6f1b 100644 --- a/include/drm/i915_component.h +++ b/include/drm/i915_component.h @@ -33,6 +33,13 @@ struct i915_audio_component { void (*put_power)(struct device *); void (*codec_wake_override)(struct device *, bool enable); int (*get_cdclk_freq)(struct device *); + /** + * @sync_audio_rate: set n/cts based on the sample rate + * + * Called from audio driver. After audio driver sets the + * sample rate, it will call this function to set n/cts + */ + int (*sync_audio_rate)(struct device *, int port, int rate); } *ops; }; -- 1.9.1

5 20

[alsa-devel] audio-over-SPI driver for ASoC
by Brian Clarkson 18 Oct '15

18 Oct '15

Hi I'm about to embark on the development of an ASoC capture driver that uses SPI to stream the samples to the processor. I'm still spending a lot of my time going through the ALSA kernel code but as I do that may I have some suggestions as to which examples would be closest to my case? My development hardware is AM335x --> McSPI --> ADS8868. So far I think I have achieved a solid understanding of the "simple-card" case where you have dai-link that connects a processor peripheral driver (e.g. McASP ) with a codec driver and forms a snd_soc_card that can be registered. Is my best option to: - write a new CPU DAI (snd_soc_dai_driver) based on the existing SPI driver - write a new CODEC DAI (snd_soc_dai_driver) which will be mostly empty - write a new platform driver that populates and registers a new snd_soc_card struct with the above in a dai_link? Any advice would be much appreciated. Cheers, Brian -- Orthogonal Devices Tokyo, Japan www.orthogonaldevices.com +81 80 8700 2340

2 1

[alsa-devel] [PATCH 0/3] fix sending the same MIDI bytes in two transactions
by Takashi Sakamoto 18 Oct '15

18 Oct '15

Hi, In former commits, MIDI functionality is added to TASCAM driver, while it includes a bug to send the same MIDI bytes in two continuous transactions. This patchset is to fix this bug, including some code improvements. Takashi Sakamoto (3): ALSA: tascam: remove buffer initialization in driver side ALSA: tascam: improve loop condition to filling MIDI bytes in transaction ALSA: tascam: clear extra MIDI byte of asynchronous transaction sound/firewire/tascam/tascam-transaction.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) -- 2.1.4

2 7

[alsa-devel] Sildes of topology status for ELEC 2015
by Lin, Mengdong 18 Oct '15

18 Oct '15

Hi, The slides of topology status is attached. And Libin will update DP MST audio slides based on recent alignment. Thanks Mengdong

4 6

[alsa-devel] [PATCH] ALSA: USB-audio: Add support for Novation Nocturn MIDIcontrol surface
by Ricard Wanderlof 18 Oct '15

18 Oct '15

The Nocturn needs the MIDI_RAW_BYTES quirk, like other Novation devices. Tested that the Nocturn shows up in aconnect, and that it can be used as a control surface (using the xtor synthesizer patch editor). Signed-off-by: Ricard Wanderlof <ricardw(a)axis.com> --- I've noticed that checkpatch complains about the space between the & and (, but in the interest of consistency I've not changed this. Is there some reason for the space, or would it be worth while cleaning up the file? sound/usb/quirks-table.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index e475665..99de061 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -2664,6 +2664,15 @@ YAMAHA_DEVICE(0x7010, "UB99"), } }, { + USB_DEVICE(0x1235, 0x000a), + .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { + /* .vendor_name = "Novation", */ + /* .product_name = "Nocturn", */ + .ifnum = 0, + .type = QUIRK_MIDI_RAW_BYTES + } +}, +{ USB_DEVICE(0x1235, 0x000e), .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { /* .vendor_name = "Novation", */ -- 2.1.4 -- Ricard Wolf Wanderlöf ricardw(at)axis.com Axis Communications AB, Lund, Sweden www.axis.com Phone +46 46 272 2016 Fax +46 46 13 61 30

3 4

[alsa-devel] [PATCH] ALSA: fireworks/bebob/oxfw/dice: enable to make as built-in
by Takashi Sakamoto 18 Oct '15

18 Oct '15

When committed to upstream, these four modules had wrong entries for Makefile. This forces them to be loadable modules even if they're set as built-in. This commit fixes this bug. Fixes: b5b04336015e('ALSA: fireworks: Add skelton for Fireworks based devices') Fixes: fd6f4b0dc167('ALSA: bebob: Add skelton for BeBoB based devices') Fixes: 1a4e39c2e5ca('ALSA: oxfw: Move to its own directory') Fixes: 14ff6a094815('ALSA: dice: Move file to its own directory') Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- sound/firewire/bebob/Makefile | 2 +- sound/firewire/dice/Makefile | 2 +- sound/firewire/fireworks/Makefile | 2 +- sound/firewire/oxfw/Makefile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/firewire/bebob/Makefile b/sound/firewire/bebob/Makefile index 6cf470c..af7ed66 100644 --- a/sound/firewire/bebob/Makefile +++ b/sound/firewire/bebob/Makefile @@ -1,4 +1,4 @@ snd-bebob-objs := bebob_command.o bebob_stream.o bebob_proc.o bebob_midi.o \ bebob_pcm.o bebob_hwdep.o bebob_terratec.o bebob_yamaha.o \ bebob_focusrite.o bebob_maudio.o bebob.o -obj-m += snd-bebob.o +obj-$(CONFIG_SND_BEBOB) += snd-bebob.o diff --git a/sound/firewire/dice/Makefile b/sound/firewire/dice/Makefile index 9ef228e..55b4be9 100644 --- a/sound/firewire/dice/Makefile +++ b/sound/firewire/dice/Makefile @@ -1,3 +1,3 @@ snd-dice-objs := dice-transaction.o dice-stream.o dice-proc.o dice-midi.o \ dice-pcm.o dice-hwdep.o dice.o -obj-m += snd-dice.o +obj-$(CONFIG_SND_DICE) += snd-dice.o diff --git a/sound/firewire/fireworks/Makefile b/sound/firewire/fireworks/Makefile index 0c74408..15ef7f7 100644 --- a/sound/firewire/fireworks/Makefile +++ b/sound/firewire/fireworks/Makefile @@ -1,4 +1,4 @@ snd-fireworks-objs := fireworks_transaction.o fireworks_command.o \ fireworks_stream.o fireworks_proc.o fireworks_midi.o \ fireworks_pcm.o fireworks_hwdep.o fireworks.o -obj-m += snd-fireworks.o +obj-$(CONFIG_SND_FIREWORKS) += snd-fireworks.o diff --git a/sound/firewire/oxfw/Makefile b/sound/firewire/oxfw/Makefile index a926850..06ff50f 100644 --- a/sound/firewire/oxfw/Makefile +++ b/sound/firewire/oxfw/Makefile @@ -1,3 +1,3 @@ snd-oxfw-objs := oxfw-command.o oxfw-stream.o oxfw-control.o oxfw-pcm.o \ oxfw-proc.o oxfw-midi.o oxfw-hwdep.o oxfw.o -obj-m += snd-oxfw.o +obj-$(CONFIG_SND_OXFW) += snd-oxfw.o -- 2.1.4

2 3

[alsa-devel] [PATCH 2/3] ALSA: hda - Remove leftover snd_hda_bus() prototype
by Takashi Iwai 17 Oct '15

17 Oct '15

It was forgotten to be removed. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/hda_codec.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h index 5bcfe7407d83..373fcad840ea 100644 --- a/sound/pci/hda/hda_codec.h +++ b/sound/pci/hda/hda_codec.h @@ -301,10 +301,6 @@ struct hda_codec { /* * constructors */ -int snd_hda_bus_new(struct snd_card *card, - const struct hdac_bus_ops *ops, - const struct hdac_io_ops *io_ops, - struct hda_bus **busp); int snd_hda_codec_new(struct hda_bus *bus, struct snd_card *card, unsigned int codec_addr, struct hda_codec **codecp); int snd_hda_codec_configure(struct hda_codec *codec); -- 2.6.0

1 1

[alsa-devel] [PATCH 1/3] ALSA: hda - Fix bogus codec address check for mixer name assignment
by Takashi Iwai 17 Oct '15

17 Oct '15

The recent commit [7fbe824a0f0e: ALSA: hda - Update mixer name for the lower codec address] tried to improve the mixer chip name assignment in the order of codec address. However, this fix was utterly bogus; it checks the field set in each codec, thus this value is reset at each codec creation, of course. For really handling this priority, the assignment has to be remembered in the common place, namely in hda_bus, instead of hda_codec. Fixes: 7fbe824a0f0e ('ALSA: hda - Update mixer name for the lower codec address') Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/hda_bind.c | 4 ++-- sound/pci/hda/hda_codec.c | 1 - sound/pci/hda/hda_codec.h | 2 +- sound/pci/hda/hda_controller.c | 1 + 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/pci/hda/hda_bind.c b/sound/pci/hda/hda_bind.c index 152acdaa0a45..70671ad65d24 100644 --- a/sound/pci/hda/hda_bind.c +++ b/sound/pci/hda/hda_bind.c @@ -63,11 +63,11 @@ int snd_hda_codec_set_name(struct hda_codec *codec, const char *name) /* update the mixer name */ if (!*codec->card->mixername || - codec->mixer_assigned >= codec->core.addr) { + codec->bus->mixer_assigned >= codec->core.addr) { snprintf(codec->card->mixername, sizeof(codec->card->mixername), "%s %s", codec->core.vendor_name, codec->core.chip_name); - codec->mixer_assigned = codec->core.addr; + codec->bus->mixer_assigned = codec->core.addr; } return 0; diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 0e55c6a6cc7e..2eeaf5ea20f9 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -851,7 +851,6 @@ int snd_hda_codec_new(struct hda_bus *bus, struct snd_card *card, INIT_DELAYED_WORK(&codec->jackpoll_work, hda_jackpoll_work); codec->depop_delay = -1; codec->fixup_id = HDA_FIXUP_ID_NOT_SET; - codec->mixer_assigned = -1; #ifdef CONFIG_PM codec->power_jiffies = jiffies; diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h index 055a80522282..5bcfe7407d83 100644 --- a/sound/pci/hda/hda_codec.h +++ b/sound/pci/hda/hda_codec.h @@ -70,6 +70,7 @@ struct hda_bus { unsigned int no_response_fallback:1; /* don't fallback at RIRB error */ int primary_dig_out_type; /* primary digital out PCM type */ + unsigned int mixer_assigned; /* codec addr for mixer name */ }; /* from hdac_bus to hda_bus */ @@ -260,7 +261,6 @@ struct hda_codec { unsigned long power_off_acct; unsigned long power_jiffies; #endif - unsigned int mixer_assigned; /* filter the requested power state per nid */ unsigned int (*power_filter)(struct hda_codec *codec, hda_nid_t nid, diff --git a/sound/pci/hda/hda_controller.c b/sound/pci/hda/hda_controller.c index 944455997fdc..d6b93a20361b 100644 --- a/sound/pci/hda/hda_controller.c +++ b/sound/pci/hda/hda_controller.c @@ -1045,6 +1045,7 @@ int azx_bus_init(struct azx *chip, const char *model, mutex_init(&bus->prepare_mutex); bus->pci = chip->pci; bus->modelname = model; + bus->mixer_assigned = -1; bus->core.snoop = azx_snoop(chip); if (chip->get_position[0] != azx_get_pos_lpib || chip->get_position[1] != azx_get_pos_lpib) -- 2.6.0

1 0

[alsa-devel] [patch 2/2] ALSA: firewire-tascam: off by one in handle_midi_tx()
by Dan Carpenter 17 Oct '15

17 Oct '15

My static checker complains because tscm->spec->midi_capture_ports is either 2 or 4 but the tscm->tx_midi_substreams[] array has 4 elements so this is possibly off by one. I have looked at the code and I think it should be >= instead of > as well. Fixes: 107cc0129a68 ('ALSA: firewire-tascam: add support for incoming MIDI messages by asynchronous transaction') Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/sound/firewire/tascam/tascam-transaction.c b/sound/firewire/tascam/tascam-transaction.c index 45c3ce3..d4f64ae 100644 --- a/sound/firewire/tascam/tascam-transaction.c +++ b/sound/firewire/tascam/tascam-transaction.c @@ -158,7 +158,7 @@ static void handle_midi_tx(struct fw_card *card, struct fw_request *request, port = b[0] >> 4; /* TODO: support virtual MIDI ports. */ - if (port > tscm->spec->midi_capture_ports) + if (port >= tscm->spec->midi_capture_ports) goto end; /* Assume the message length. */

2 1

[alsa-devel] [patch 1/2] ALSA: firewire-tascam: fix an LED bug
by Dan Carpenter 17 Oct '15

17 Oct '15

We recently tried to add some new code to support turning the LED on and off but the code in snd_tscm_transaction_reregister() is unreachable. Fixes: e65e2cb99e44 ('ALSA: firewire-tascam: Turn on/off FireWire LED') Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/sound/firewire/tascam/tascam-transaction.c b/sound/firewire/tascam/tascam-transaction.c index 1c9a88b..45c3ce3 100644 --- a/sound/firewire/tascam/tascam-transaction.c +++ b/sound/firewire/tascam/tascam-transaction.c @@ -249,7 +249,7 @@ int snd_tscm_transaction_reregister(struct snd_tscm *tscm) /* Turn on messaging. */ reg = cpu_to_be32(0x00000001); - return snd_fw_transaction(tscm->unit, TCODE_WRITE_QUADLET_REQUEST, + err = snd_fw_transaction(tscm->unit, TCODE_WRITE_QUADLET_REQUEST, TSCM_ADDR_BASE + TSCM_OFFSET_MIDI_TX_ON, &reg, sizeof(reg), 0); if (err < 0)

2 1

[alsa-devel] [PATCH] ASoC: rt5645: Recheck the jack detect status after resuming from S3
by Oder Chiou 16 Oct '15

16 Oct '15

The patch rechecks the jack detect status after resuming from S3. Signed-off-by: Oder Chiou <oder_chiou(a)realtek.com> --- sound/soc/codecs/rt5645.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index 89ba4ff..4d54999 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -2745,6 +2745,10 @@ static int rt5645_set_bias_level(struct snd_soc_codec *codec, snd_soc_update_bits(codec, RT5645_PWR_ANLG1, RT5645_PWR_FV1 | RT5645_PWR_FV2, RT5645_PWR_FV1 | RT5645_PWR_FV2); + if (rt5645->en_button_func && + snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_OFF) + queue_delayed_work(system_power_efficient_wq, + &rt5645->jack_detect_work, msecs_to_jiffies(0)); break; case SND_SOC_BIAS_OFF: -- 1.8.1.1.439.g50a6b54

2 1

[alsa-devel] [PATCH RESEND] ASoC: rt298: correct index default value
by Bard Liao 16 Oct '15

16 Oct '15

Some of the default value on rt298_index_def are incorrect. Change them to the correct value. Signed-off-by: Bard Liao <bardliao(a)realtek.com> --- This patch is base on topic/rt298 branch. --- sound/soc/codecs/rt298.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/sound/soc/codecs/rt298.c b/sound/soc/codecs/rt298.c index ff126a7..8c5cb7e 100644 --- a/sound/soc/codecs/rt298.c +++ b/sound/soc/codecs/rt298.c @@ -50,24 +50,24 @@ struct rt298_priv { }; static struct reg_default rt298_index_def[] = { - { 0x01, 0xaaaa }, - { 0x02, 0x8aaa }, + { 0x01, 0xa5a8 }, + { 0x02, 0x8e95 }, { 0x03, 0x0002 }, - { 0x04, 0xaf01 }, - { 0x08, 0x000d }, - { 0x09, 0xd810 }, - { 0x0a, 0x0120 }, + { 0x04, 0xaf67 }, + { 0x08, 0x200f }, + { 0x09, 0xd010 }, + { 0x0a, 0x0100 }, { 0x0b, 0x0000 }, { 0x0d, 0x2800 }, - { 0x0f, 0x0000 }, - { 0x19, 0x0a17 }, + { 0x0f, 0x0022 }, + { 0x19, 0x0217 }, { 0x20, 0x0020 }, { 0x33, 0x0208 }, { 0x46, 0x0300 }, - { 0x49, 0x0004 }, - { 0x4f, 0x50e9 }, - { 0x50, 0x2000 }, - { 0x63, 0x2902 }, + { 0x49, 0x4004 }, + { 0x4f, 0x50c9 }, + { 0x50, 0x3000 }, + { 0x63, 0x1b02 }, { 0x67, 0x1111 }, { 0x68, 0x1016 }, { 0x69, 0x273f }, -- 1.8.1.1.439.g50a6b54

2 2

[alsa-devel] Remove Renesas sound SRU for Gen1 support
by Kuninori Morimoto 16 Oct '15

16 Oct '15

Hi ALSA, and SH ML I would like to remove Renesas sound SRU support of Gen1 in the future. It was created for preparation of Gen2 SRC support, and it converts sampling rate. But no-one is using this feature in Gen1. board-bockw had used SRU before, but it was pass through mode. This means it is same as SSI. 2nd reason is that board-bockw was removed from upstream code. BockW is now supported by DT, but it doesn't use SRU. More detail, r8a7778.dtsi has rcar_sound,src entry, but no-one is using this feature. SRU proving has no relation to this removing feature. This means there is no effect for DT compatibility. Gen2 SRC was created from Gen1 SRU, these are similar but not same IP. Keeping Gen1 SRU in current driver is a little bit difficult, and no-one is using it today. Gen1 sound is still supported via SSI. If there is no objection, I would like to remove it from upstream step1. add warning message in v4.x step2. remove it in v4.x+1 Best regards --- Kuninori Morimoto

2 2

[alsa-devel] [PATCH] ASoC: rsnd: Gen1 probe is not error
by Kuninori Morimoto 16 Oct '15

16 Oct '15

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Probing from Gen1 is not error. This patch fixup it Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/sh/rcar/ctu.c | 6 ++---- sound/soc/sh/rcar/dvc.c | 6 ++---- sound/soc/sh/rcar/mix.c | 6 ++---- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/sound/soc/sh/rcar/ctu.c b/sound/soc/sh/rcar/ctu.c index 6e34909c..27d56a0 100644 --- a/sound/soc/sh/rcar/ctu.c +++ b/sound/soc/sh/rcar/ctu.c @@ -125,10 +125,8 @@ int rsnd_ctu_probe(struct platform_device *pdev, int i, nr, ret; /* This driver doesn't support Gen1 at this point */ - if (rsnd_is_gen1(priv)) { - dev_warn(dev, "CTU is not supported on Gen1\n"); - return -EINVAL; - } + if (rsnd_is_gen1(priv)) + return 0; rsnd_of_parse_ctu(pdev, of_data, priv); diff --git a/sound/soc/sh/rcar/dvc.c b/sound/soc/sh/rcar/dvc.c index 08e58d0..63e8e52 100644 --- a/sound/soc/sh/rcar/dvc.c +++ b/sound/soc/sh/rcar/dvc.c @@ -338,10 +338,8 @@ int rsnd_dvc_probe(struct platform_device *pdev, int i, nr, ret; /* This driver doesn't support Gen1 at this point */ - if (rsnd_is_gen1(priv)) { - dev_warn(dev, "CMD is not supported on Gen1\n"); - return -EINVAL; - } + if (rsnd_is_gen1(priv)) + return 0; rsnd_of_parse_dvc(pdev, of_data, priv); diff --git a/sound/soc/sh/rcar/mix.c b/sound/soc/sh/rcar/mix.c index 2311d49..a5485b2 100644 --- a/sound/soc/sh/rcar/mix.c +++ b/sound/soc/sh/rcar/mix.c @@ -158,10 +158,8 @@ int rsnd_mix_probe(struct platform_device *pdev, int i, nr, ret; /* This driver doesn't support Gen1 at this point */ - if (rsnd_is_gen1(priv)) { - dev_warn(dev, "MIX is not supported on Gen1\n"); - return -EINVAL; - } + if (rsnd_is_gen1(priv)) + return 0; rsnd_of_parse_mix(pdev, of_data, priv); -- 1.9.1

2 1

[alsa-devel] [PATCH] ASoC: Add info callback for SX_TLV controls
by Charles Keepax 16 Oct '15

16 Oct '15

SX_TLV controls are intended for situations where the register behind the control has some non-zero value indicating the minimum gain and then gains increasing from there and eventually overflowing through zero. Currently every CODEC implementing these controls specifies the minimum as the non-zero value for the minimum and the maximum as the number of gain settings available. This means when the info callback subtracts the minimum value from the maximum value to calculate the number of gain levels available it is actually under reporting the available levels. This patch fixes this issue by adding a new snd_soc_info_volsw_sx callback that does not subtract the minimum value. Fixes: 1d99f2436d0d ("ASoC: core: Rework SOC_DOUBLE_R_SX_TLV add SOC_SINGLE_SX_TLV") Signed-off-by: Charles Keepax <ckeepax(a)opensource.wolfsonmicro.com> --- include/sound/soc.h | 6 ++++-- sound/soc/soc-ops.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index 98e080b..bd85564 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -86,7 +86,7 @@ .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | \ SNDRV_CTL_ELEM_ACCESS_READWRITE, \ .tlv.p = (tlv_array),\ - .info = snd_soc_info_volsw, \ + .info = snd_soc_info_volsw_sx, \ .get = snd_soc_get_volsw_sx,\ .put = snd_soc_put_volsw_sx, \ .private_value = (unsigned long)&(struct soc_mixer_control) \ @@ -156,7 +156,7 @@ .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | \ SNDRV_CTL_ELEM_ACCESS_READWRITE, \ .tlv.p = (tlv_array), \ - .info = snd_soc_info_volsw, \ + .info = snd_soc_info_volsw_sx, \ .get = snd_soc_get_volsw_sx, \ .put = snd_soc_put_volsw_sx, \ .private_value = (unsigned long)&(struct soc_mixer_control) \ @@ -593,6 +593,8 @@ int snd_soc_put_enum_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol); int snd_soc_info_volsw(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo); +int snd_soc_info_volsw_sx(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo); #define snd_soc_info_bool_ext snd_ctl_boolean_mono_info int snd_soc_get_volsw(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol); diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c index 100d92b..05977ae 100644 --- a/sound/soc/soc-ops.c +++ b/sound/soc/soc-ops.c @@ -207,6 +207,34 @@ int snd_soc_info_volsw(struct snd_kcontrol *kcontrol, EXPORT_SYMBOL_GPL(snd_soc_info_volsw); /** + * snd_soc_info_volsw_sx - Mixer info callback for SX TLV controls + * @kcontrol: mixer control + * @uinfo: control element information + * + * Callback to provide information about a single mixer control, or a double + * mixer control that spans 2 registers of the SX TLV type. SX TLV controls + * have a range that represents both positive and negative values either side + * of zero but without a sign bit. + * + * Returns 0 for success. + */ +int snd_soc_info_volsw_sx(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + struct soc_mixer_control *mc = + (struct soc_mixer_control *)kcontrol->private_value; + + snd_soc_info_volsw(kcontrol, uinfo); + /* Max represents the number of levels in an SX control not the + * maximum value, so add the minimum value back on + */ + uinfo->value.integer.max += mc->min; + + return 0; +} +EXPORT_SYMBOL_GPL(snd_soc_info_volsw_sx); + +/** * snd_soc_get_volsw - single mixer get callback * @kcontrol: mixer control * @ucontrol: control element information -- 1.7.2.5

3 3

[alsa-devel] race condition between dmaengine_pcm_dma_complete and snd_pcm_release
by Matt Campbell 16 Oct '15

16 Oct '15

Hi All, I've been trying to track down a kernel crash I've been getting when closing ALSA devices. There is a race condition between the bottom half interrupt handler for the DMA system (dmaengine_pcm_dma_complete in pcm_dmaengine.c) and the releasing of the sub-stream resources it receives as an argument (when snd_pcm_release is called). An older thread from 2013 discussed this to a good extent so I wont go into the details here. I've been unable to track down either a patch to fix this or even a good solution that I could implement. I've spent a couple days trying to think of an elegant solution and come up with nothing so far. Any input would be appreciated. Link to original thread: http://mailman.alsa-project.org/pipermail/alsa-devel/2013-October/067111.ht… It's worth nothing that the original thread points out how this can arise on multi-core systems. In my case I'm on a single core system, but with the real-time patch enabled and the userspace ALSA thread running at a higher priority than the kernel's tasklet thread which can reproduce this almost 100% of the time. ~Matt

2 5

[alsa-devel] [PATCH] ALSA: timer: add config item to export PCM timer disabling for expert
by Jie Yang 16 Oct '15

16 Oct '15

PCM timer is not always used. For embedded device, we need an interface to disable it when it is not needed, to shrink the kernel size and memory footprint, here add CONFIG_SND_PCM_TIMER for it. When both CONFIG_SND_PCM_TIMER and CONFIG_SND_TIMER is unselected, about 25KB saving bonus we can get. Please be noted that when disabled, those stubs who using pcm timer (e.g. dmix, dsnoop & co) may work incorrectlly. Suggested-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Jie Yang <yang.jie(a)intel.com> --- include/sound/pcm.h | 8 +++++++- sound/core/Kconfig | 13 ++++++++++++- sound/core/Makefile | 3 ++- sound/core/pcm_lib.c | 2 ++ sound/core/pcm_native.c | 36 ++++++++++++++++-------------------- 5 files changed, 39 insertions(+), 23 deletions(-) diff --git a/include/sound/pcm.h b/include/sound/pcm.h index 691e7ee..79cf943 100644 --- a/include/sound/pcm.h +++ b/include/sound/pcm.h @@ -1117,10 +1117,16 @@ static inline void snd_pcm_set_runtime_buffer(struct snd_pcm_substream *substrea * Timer interface */ +#ifdef CONFIG_SND_PCM_TIMER void snd_pcm_timer_resolution_change(struct snd_pcm_substream *substream); void snd_pcm_timer_init(struct snd_pcm_substream *substream); void snd_pcm_timer_done(struct snd_pcm_substream *substream); - +#else +static inline void +snd_pcm_timer_resolution_change(struct snd_pcm_substream *substream) {} +static inline void snd_pcm_timer_init(struct snd_pcm_substream *substream) {} +static inline void snd_pcm_timer_done(struct snd_pcm_substream *substream) {} +#endif /** * snd_pcm_gettime - Fill the timespec depending on the timestamp mode * @runtime: PCM runtime instance diff --git a/sound/core/Kconfig b/sound/core/Kconfig index 6c96fee..e3e9491 100644 --- a/sound/core/Kconfig +++ b/sound/core/Kconfig @@ -4,7 +4,7 @@ config SND_TIMER config SND_PCM tristate - select SND_TIMER + select SND_TIMER if SND_PCM_TIMER config SND_PCM_ELD bool @@ -93,6 +93,17 @@ config SND_PCM_OSS_PLUGINS support conversion of channels, formats and rates. It will behave like most of new OSS/Free drivers in 2.4/2.6 kernels. +config SND_PCM_TIMER + bool "PCM timer interface" if EXPERT + default y + help + If you disable this option, pcm timer will be inavailable, so + those stubs used pcm timer (e.g. dmix, dsnoop & co) may work + incorrectlly. + + For some embedded device, we may disable it to reduce memory + footprint, about 20KB on x86_64 platform. + config SND_SEQUENCER_OSS bool "OSS Sequencer API" depends on SND_SEQUENCER diff --git a/sound/core/Makefile b/sound/core/Makefile index 3354f91..48ab4b8 100644 --- a/sound/core/Makefile +++ b/sound/core/Makefile @@ -13,8 +13,9 @@ snd-$(CONFIG_SND_OSSEMUL) += sound_oss.o snd-$(CONFIG_SND_VMASTER) += vmaster.o snd-$(CONFIG_SND_JACK) += ctljack.o jack.o -snd-pcm-y := pcm.o pcm_native.o pcm_lib.o pcm_timer.o pcm_misc.o \ +snd-pcm-y := pcm.o pcm_native.o pcm_lib.o pcm_misc.o \ pcm_memory.o memalloc.o +snd-pcm-$(CONFIG_SND_PCM_TIMER) += pcm_timer.o snd-pcm-$(CONFIG_SND_DMA_SGBUF) += sgbuf.o snd-pcm-$(CONFIG_SND_PCM_ELD) += pcm_drm_eld.o snd-pcm-$(CONFIG_SND_PCM_IEC958) += pcm_iec958.o diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index 7d45645..6dc4277 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c @@ -1883,8 +1883,10 @@ void snd_pcm_period_elapsed(struct snd_pcm_substream *substream) snd_pcm_update_hw_ptr0(substream, 1) < 0) goto _end; +#ifdef CONFIG_SND_PCM_TIMER if (substream->timer_running) snd_timer_interrupt(substream->timer, 1); +#endif _end: snd_pcm_stream_unlock_irqrestore(substream, flags); if (runtime->transfer_ack_end) diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 75888dd..d5672ed 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -486,6 +486,16 @@ static void snd_pcm_set_state(struct snd_pcm_substream *substream, int state) snd_pcm_stream_unlock_irq(substream); } +static inline void snd_pcm_timer_notify(struct snd_pcm_substream *substream, + int event) +{ +#ifdef CONFIG_SND_PCM_TIMER + if (substream->timer) + snd_timer_notify(substream->timer, event, + &substream->runtime->trigger_tstamp); +#endif +} + static int snd_pcm_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { @@ -1042,9 +1052,7 @@ static void snd_pcm_post_start(struct snd_pcm_substream *substream, int state) if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK && runtime->silence_size > 0) snd_pcm_playback_silence(substream, ULONG_MAX); - if (substream->timer) - snd_timer_notify(substream->timer, SNDRV_TIMER_EVENT_MSTART, - &runtime->trigger_tstamp); + snd_pcm_timer_notify(substream, SNDRV_TIMER_EVENT_MSTART); } static struct action_ops snd_pcm_action_start = { @@ -1092,9 +1100,7 @@ static void snd_pcm_post_stop(struct snd_pcm_substream *substream, int state) if (runtime->status->state != state) { snd_pcm_trigger_tstamp(substream); runtime->status->state = state; - if (substream->timer) - snd_timer_notify(substream->timer, SNDRV_TIMER_EVENT_MSTOP, - &runtime->trigger_tstamp); + snd_pcm_timer_notify(substream, SNDRV_TIMER_EVENT_MSTOP); } wake_up(&runtime->sleep); wake_up(&runtime->tsleep); @@ -1208,18 +1214,12 @@ static void snd_pcm_post_pause(struct snd_pcm_substream *substream, int push) snd_pcm_trigger_tstamp(substream); if (push) { runtime->status->state = SNDRV_PCM_STATE_PAUSED; - if (substream->timer) - snd_timer_notify(substream->timer, - SNDRV_TIMER_EVENT_MPAUSE, - &runtime->trigger_tstamp); + snd_pcm_timer_notify(substream, SNDRV_TIMER_EVENT_MPAUSE); wake_up(&runtime->sleep); wake_up(&runtime->tsleep); } else { runtime->status->state = SNDRV_PCM_STATE_RUNNING; - if (substream->timer) - snd_timer_notify(substream->timer, - SNDRV_TIMER_EVENT_MCONTINUE, - &runtime->trigger_tstamp); + snd_pcm_timer_notify(substream, SNDRV_TIMER_EVENT_MCONTINUE); } } @@ -1267,9 +1267,7 @@ static void snd_pcm_post_suspend(struct snd_pcm_substream *substream, int state) snd_pcm_trigger_tstamp(substream); runtime->status->suspended_state = runtime->status->state; runtime->status->state = SNDRV_PCM_STATE_SUSPENDED; - if (substream->timer) - snd_timer_notify(substream->timer, SNDRV_TIMER_EVENT_MSUSPEND, - &runtime->trigger_tstamp); + snd_pcm_timer_notify(substream, SNDRV_TIMER_EVENT_MSUSPEND); wake_up(&runtime->sleep); wake_up(&runtime->tsleep); } @@ -1373,9 +1371,7 @@ static void snd_pcm_post_resume(struct snd_pcm_substream *substream, int state) struct snd_pcm_runtime *runtime = substream->runtime; snd_pcm_trigger_tstamp(substream); runtime->status->state = runtime->status->suspended_state; - if (substream->timer) - snd_timer_notify(substream->timer, SNDRV_TIMER_EVENT_MRESUME, - &runtime->trigger_tstamp); + snd_pcm_timer_notify(substream, SNDRV_TIMER_EVENT_MRESUME); } static struct action_ops snd_pcm_action_resume = { -- 2.1.4

2 1

[alsa-devel] [PATCH V3 0/4] BAT: some fixes
by han.lu＠intel.com 16 Oct '15

16 Oct '15

From: "Lu, Han" <han.lu(a)intel.com> some fixes and adjusts. Lu, Han (4): BAT: Merge message strings BAT: Use colon instead of comma for separation BAT: Adjust parameters and strings BAT: Use dynamic temp file bat/bat.c | 77 +++++++++++++++++++++++++++++++++--------------------------- bat/common.h | 2 +- 2 files changed, 43 insertions(+), 36 deletions(-) -- 1.9.1

3 6

[alsa-devel] [RFC PATCH] ASoC: Modify check condition of multiple bindings of components
by Koro Chen 16 Oct '15

16 Oct '15

The patch "ASoC: Prevent components from being bound to multiple cards" adds check to prevent multiple cards from using the same component. However, snd_soc_register_platform() or snd_soc_register_codec() will also create components, and sharing the same platform by multiple cards is then refused. This happens with a platform having multiple independent DAIs that share the same DMA controller. Relax the condition by checking component->registered_as_component, which is only true in case of snd_soc_register_component() and will be false for components created by snd_soc_register_platform() or snd_soc_register_codec(). Signed-off-by: Koro Chen <koro.chen(a)mediatek.com> --- sound/soc/soc-core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 42575b0..eca169a 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1106,7 +1106,8 @@ static int soc_probe_component(struct snd_soc_card *card, return 0; if (component->card) { - if (component->card != card) { + if (component->card != card && + component->registered_as_component) { dev_err(component->dev, "Trying to bind component to card \"%s\" but is already bound to card \"%s\"\n", card->name, component->card->name); -- 1.7.9.5

3 9

[alsa-devel] [PATCH MC Next Gen 0/2] Add mixer and control interface media entities
by Shuah Khan 15 Oct '15

15 Oct '15

This patch series adds the following: Add support for creating MEDIA_ENT_F_AUDIO_MIXER entity for each mixer and a MEDIA_INTF_T_ALSA_CONTROL control interface entity that links to mixer entities. MEDIA_INTF_T_ALSA_CONTROL entity corresponds to the control device for the card. Change au0828_create_media_graph() to create pad link between MEDIA_ENT_F_AUDIO_MIXER entity and decoder's AU8522_PAD_AUDIO_OUT. This patch series is dependent on an earlier patch series: Update ALSA, and au0828 drivers to use Managed Media Controller API: https://www.mail-archive.com/linux-media@vger.kernel.org/msg92752.html Please find the media graph with mixer and control interface nodes: https://drive.google.com/folderview?id=0B0NIL0BQg-Alb3JFb2diMXRoQlU&usp=sha… New file: graph_mixer.png Shuah Khan (2): sound/usb: Create media mixer function and control interface entities media: au0828 create link between ALSA Mixer and decoder drivers/media/usb/au0828/au0828-core.c | 12 +++++ drivers/media/usb/au0828/au0828.h | 1 + sound/usb/card.c | 5 ++ sound/usb/media.c | 85 ++++++++++++++++++++++++++++++++++ sound/usb/media.h | 4 ++ sound/usb/mixer.h | 1 + sound/usb/usbaudio.h | 1 + 7 files changed, 109 insertions(+) -- 2.1.4

1 2

[alsa-devel] DSD: Playing silence before and after actual audio data
by Martin Pietryka 15 Oct '15

15 Oct '15

Hi guys, I'm trying to figure out the best way to insert ~40ms worth of silence pattern before and after playing back DSD data. There seems to be support inside ALSA for a DSD silence pattern, but as far as I have seen it's only used when an underrun might occur (silence_threshold, silence_size). Is there some possibility inside ALSA to basically insert silence before and after playback, or how hard would it be to implement something like this? I have looked a bit for myself and for me it seems that the modifications needed inside ALSA to achieve this feature are substantial, but of course I also might have missed something. Martin

2 1

[alsa-devel] Audio Mini Summit 2015, 8th October, Dublin
by Mark Brown 15 Oct '15

15 Oct '15

[This message is BCCed to everyone currently on the signup list] As previously announce the audio mini-summit for this year will be this Thursday (8th August) at CCD in Dublin. Topics we currently have on the list for discussion are: - Power saving and general system design decisions (is what we're doing lining up with modern hardware with things like multiple output streams?). - What to do with HDMI and its integration with graphics. - Test tools (Intel BAT and others). - BATCH flag. - ACPI simple-card and general generic card support. - Topology & media controller integration. - Kernel tinification. - Android <-> alsa-lib configuration translation. - HDA restructuring. - PCM core simplification - the code is currently quite complex! - Soundwire driver support plans. If you're planning to attend and haven't done so already please sign up at: https://docs.google.com/spreadsheets/d/1bi-8GHsqlzt41FR20WiMuWILe_cZowFireV… Once I have details on the room & so on I will follow up to this mail with both. We'll also try and sort out some dinner on Thursday night, if there are any special requirements for that please say (I'm assuming that we will have at least some vegetarians).

9 25

[alsa-devel] [PATCH] ASoC: bcm2835-i2s: Fix module autoload for OF platform drivers
by Luis de Bethencourt 15 Oct '15

15 Oct '15

These platform drivers have a OF device ID table but the OF module alias information is not created so module autoloading won't work. Signed-off-by: Luis de Bethencourt <luis(a)debethencourt.com> --- sound/soc/bcm/bcm2835-i2s.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/bcm/bcm2835-i2s.c b/sound/soc/bcm/bcm2835-i2s.c index 03fa1cb..8c435be 100644 --- a/sound/soc/bcm/bcm2835-i2s.c +++ b/sound/soc/bcm/bcm2835-i2s.c @@ -862,6 +862,8 @@ static const struct of_device_id bcm2835_i2s_of_match[] = { {}, }; +MODULE_DEVICE_TABLE(of, bcm2835_i2s_of_match); + static struct platform_driver bcm2835_i2s_driver = { .probe = bcm2835_i2s_probe, .driver = { -- 2.4.6

2 2

Re: [alsa-devel] Sound not working after new kernel installed
by James Cameron 15 Oct '15

15 Oct '15

On Thu, Oct 15, 2015 at 01:17:15PM +0200, Simon Wolk wrote: > The Kernel changed from 3.2.0 to 3.19.0 for me. By installing the > 3.19. the sound stopped working. Yes, Ubuntu kernels change like that, but you can easily run more recent kernel versions, see Ubuntu Wiki page: https://wiki.ubuntu.com/Kernel/MainlineBuilds While you wait for help, you can install latest v4.2.3 built 3rd October 2015. You can also test kernels between 3.2 and 3.19, if you don't get any other help. -- James Cameron http://quozl.linux.org.au/

1 0

[alsa-devel] [PATCH 1/2] ALSA: hda - consolidate chip rename functions
by Takashi Iwai 15 Oct '15

15 Oct '15

A few multiple codec drivers do renaming the chip_name string but all these are open-coded and some of them have even no error check. Let's make common helpers to do it properly. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- include/sound/hdaudio.h | 1 + sound/hda/hdac_device.c | 22 ++++++++++++++++++++++ sound/pci/hda/hda_bind.c | 35 +++++++++++++++++++++++------------ sound/pci/hda/hda_codec.h | 2 ++ sound/pci/hda/hda_sysfs.c | 3 +-- sound/pci/hda/patch_realtek.c | 12 +----------- sound/pci/hda/patch_via.c | 18 ++++-------------- 7 files changed, 54 insertions(+), 39 deletions(-) diff --git a/include/sound/hdaudio.h b/include/sound/hdaudio.h index 26e956f4b7c6..49df61c7afdc 100644 --- a/include/sound/hdaudio.h +++ b/include/sound/hdaudio.h @@ -117,6 +117,7 @@ int snd_hdac_device_init(struct hdac_device *dev, struct hdac_bus *bus, void snd_hdac_device_exit(struct hdac_device *dev); int snd_hdac_device_register(struct hdac_device *codec); void snd_hdac_device_unregister(struct hdac_device *codec); +int snd_hdac_device_set_chip_name(struct hdac_device *codec, const char *name); int snd_hdac_refresh_widgets(struct hdac_device *codec); int snd_hdac_refresh_widget_sysfs(struct hdac_device *codec); diff --git a/sound/hda/hdac_device.c b/sound/hda/hdac_device.c index b3b0ad289df1..4b06b26cee06 100644 --- a/sound/hda/hdac_device.c +++ b/sound/hda/hdac_device.c @@ -164,6 +164,28 @@ void snd_hdac_device_unregister(struct hdac_device *codec) EXPORT_SYMBOL_GPL(snd_hdac_device_unregister); /** + * snd_hdac_device_set_chip_name - set/update the codec name + * @codec: the HDAC device + * @name: name string to set + * + * Returns 0 if the name is set or updated, or a negative error code. + */ +int snd_hdac_device_set_chip_name(struct hdac_device *codec, const char *name) +{ + char *newname; + + if (!name) + return 0; + newname = kstrdup(name, GFP_KERNEL); + if (!newname) + return -ENOMEM; + kfree(codec->chip_name); + codec->chip_name = newname; + return 0; +} +EXPORT_SYMBOL_GPL(snd_hdac_device_set_chip_name); + +/** * snd_hdac_make_cmd - compose a 32bit command word to be sent to the * HD-audio controller * @codec: the codec object diff --git a/sound/pci/hda/hda_bind.c b/sound/pci/hda/hda_bind.c index d5ac25cc7fee..ef6b8f836a87 100644 --- a/sound/pci/hda/hda_bind.c +++ b/sound/pci/hda/hda_bind.c @@ -45,15 +45,31 @@ static void hda_codec_unsol_event(struct hdac_device *dev, unsigned int ev) codec->patch_ops.unsol_event(codec, ev); } -/* reset the codec name from the preset */ -static int codec_refresh_name(struct hda_codec *codec, const char *name) +/** + * snd_hda_codec_set_name - set the codec name + * @codec: the HDA codec + * @name: name string to set + */ +int snd_hda_codec_set_name(struct hda_codec *codec, const char *name) { - if (name) { - kfree(codec->core.chip_name); - codec->core.chip_name = kstrdup(name, GFP_KERNEL); + int err; + + if (!name) + return 0; + err = snd_hdac_device_set_chip_name(&codec->core, name); + if (err < 0) + return err; + + /* update the mixer name */ + if (!*codec->card->mixername) { + snprintf(codec->card->mixername, + sizeof(codec->card->mixername), "%s %s", + codec->core.vendor_name, codec->core.chip_name); } - return codec->core.chip_name ? 0 : -ENOMEM; + + return 0; } +EXPORT_SYMBOL_GPL(snd_hda_codec_set_name); static int hda_codec_driver_probe(struct device *dev) { @@ -64,7 +80,7 @@ static int hda_codec_driver_probe(struct device *dev) if (WARN_ON(!codec->preset)) return -EINVAL; - err = codec_refresh_name(codec, codec->preset->name); + err = snd_hda_codec_set_name(codec, codec->preset->name); if (err < 0) goto error; err = snd_hdac_regmap_init(&codec->core); @@ -251,11 +267,6 @@ int snd_hda_codec_configure(struct hda_codec *codec) } } - /* audio codec should override the mixer name */ - if (codec->core.afg || !*codec->card->mixername) - snprintf(codec->card->mixername, - sizeof(codec->card->mixername), "%s %s", - codec->core.vendor_name, codec->core.chip_name); return 0; error: diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h index 95991e463abb..b6d937784afa 100644 --- a/sound/pci/hda/hda_codec.h +++ b/sound/pci/hda/hda_codec.h @@ -463,6 +463,8 @@ void snd_hda_unlock_devices(struct hda_bus *bus); void snd_hda_bus_reset(struct hda_bus *bus); void snd_hda_bus_reset_codecs(struct hda_bus *bus); +int snd_hda_codec_set_name(struct hda_codec *codec, const char *name); + /* * power management */ diff --git a/sound/pci/hda/hda_sysfs.c b/sound/pci/hda/hda_sysfs.c index a6e3d9b511ab..64e0d1d81ca5 100644 --- a/sound/pci/hda/hda_sysfs.c +++ b/sound/pci/hda/hda_sysfs.c @@ -595,8 +595,7 @@ static void parse_model_mode(char *buf, struct hda_bus *bus, static void parse_chip_name_mode(char *buf, struct hda_bus *bus, struct hda_codec **codecp) { - kfree((*codecp)->core.chip_name); - (*codecp)->core.chip_name = kstrdup(buf, GFP_KERNEL); + snd_hda_codec_set_name(*codecp, buf); } #define DEFINE_PARSE_ID_MODE(name) \ diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 16b8dcba5c12..e1ffb0202ebc 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -822,17 +822,7 @@ static const struct hda_codec_ops alc_patch_ops = { }; -/* replace the codec chip_name with the given string */ -static int alc_codec_rename(struct hda_codec *codec, const char *name) -{ - kfree(codec->core.chip_name); - codec->core.chip_name = kstrdup(name, GFP_KERNEL); - if (!codec->core.chip_name) { - alc_free(codec); - return -ENOMEM; - } - return 0; -} +#define alc_codec_rename(codec, name) snd_hda_codec_set_name(codec, name) /* * Rename codecs appropriately from COEF value or subvendor id diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c index da5366405eda..d714a57e9460 100644 --- a/sound/pci/hda/patch_via.c +++ b/sound/pci/hda/patch_via.c @@ -785,21 +785,11 @@ static int patch_vt1708S(struct hda_codec *codec) override_mic_boost(codec, 0x1e, 0, 3, 40); /* correct names for VT1708BCE */ - if (get_codec_type(codec) == VT1708BCE) { - kfree(codec->core.chip_name); - codec->core.chip_name = kstrdup("VT1708BCE", GFP_KERNEL); - snprintf(codec->card->mixername, - sizeof(codec->card->mixername), - "%s %s", codec->core.vendor_name, codec->core.chip_name); - } + if (get_codec_type(codec) == VT1708BCE) + snd_hda_codec_set_name(codec, "VT1708BCE"); /* correct names for VT1705 */ - if (codec->core.vendor_id == 0x11064397) { - kfree(codec->core.chip_name); - codec->core.chip_name = kstrdup("VT1705", GFP_KERNEL); - snprintf(codec->card->mixername, - sizeof(codec->card->mixername), - "%s %s", codec->core.vendor_name, codec->core.chip_name); - } + if (codec->core.vendor_id == 0x11064397) + snd_hda_codec_set_name(codec, "VT1705"); /* automatic parse from the BIOS config */ err = via_parse_auto_config(codec); -- 2.6.1

1 1

[alsa-devel] [PATCH v6 0/10] Fix broken DMAFLUSHP on Rockchips platform
by Shawn Lin 15 Oct '15

15 Oct '15

The purpose of the DMAFLUSHP instruction: - Tell the peripheral to clear its status and control registers. - Send a message to the peripheral to resend its level status. There are 3 timings described in PL330 Technical Reference Manual: - Timing 1: Burst request, can work well without DMAFLUSHP. - Timing 2: Single and burst request, DMAC will ignore the single transfer request. This timing happens if there are single and burst request. - Timing 3: Single transfers for a burst request, DMAC should signals datype to request the peripheral to flush the contents of any control registers. This timing happens if there is not enough MFIFO to places the burst data. A peripheral may signal a DMA request during the execution of DMAFLUSHP instruction, that cause DMA request being ignored by DMAC. But DMAC and all peripherals on RK3X SoCs DO NOT support DMAFLUSHP. It can't send a message to the peripheral to resend DMA request, and the peripheral can't acknowledge a flush request from DMAC. So all DMA requests should NOT be ignored by DMAC, and DMAC will not notify the peripheral to flush. To fix this problem, we need: - Do NOT execute DMAFLUSHP instruction. - Timing 2 and timing 3 should not happen. Because on RK3X SoCs, there are 6 or below channels and 32 MFIFO depth for DMAC_BUS, and 8 channels and 64 MFIFO depth for DMAC_PERI, it is impossible to hit the timing 3 if burst length is equal or less than 4. Since the request type signal by the peripheral can only be set by software. We can set Rockchip Soc's GRF_PERIDMAC_CON0[2:1] to select single or burst request, if it is set b01, all of the peripharals will signal a brust request. So the timing 2 will not happen, too. So DMAC on RK3X can support single or burst transfer, but can't support mixed transfer. Because burst transfer is more efficient than single transfer, this is confirmed by our ASIC team, who strongly suggest to use burst transfer. And this is confirmed by Addy's test on RK3288-Pink2 board, the speed of spi flash burst transfer will increase about two times than single transfer. Also, I have tested dw_mmc with pl330 on RK3188 platform to double confirm the result. That means burst transfer is reansonable. So we need a quirk not to execute DMAFLUSHP instruction and to use burst transfer. Note: - The Rockchip Soc default value of GRF_PERIDMAC_CON0[2:1] is b01. To support brust transfer, these bits should not be changed in bootloader. Changes in v6: - remove expose quirk and add dma max_burst caps for clients - remove expose quirks and add max_burst for dmaengine - remove get quirks and add get slave caps - remove quirks and get dma caps in order to limit burst Changes in v5: - add Mark's tag for spi changes - remove unnecessary whitespace change - use switch statement for i2s quirk - use switch statement for dma_quirk's manipulation Changes in v4: - remove spi & i2s dts changes and query quirk from dmaengine API suggeseted by Mark. - fix typo - Add dmaengine_get_quirk hook and implement it for pl330 Changes in v3: - add Sunny's tag - add more rockchip drivers' changes in this patchset - add Reviewed-by: Sonny Rao <sonnyrao(a)chromium.org> Changes in v2: - amend the author - reorder the patches suggested by Doug - add Reviewed-by: Doug Anderson <dianders(a)chromium.org> for rk3288.dtsi patch and arm-pl330.txt patch - fix Olof's mail address Changes in v1: - add From original author. - remove Sunny's tag - rename broken-no-flushp to "arm,pl330-broken-no-flushp" suggested by Krzysztof. Addy Ke (3): DMA: pl330: add quirk for broken no flushp ARM: dts: Add arm,pl330-broken-no-flushp quirk for rk3288 platform spi: rockchip: modify DMA max burst to 1 Boojin Kim (1): DMA: pl330: support burst mode for dev-to-mem and mem-to-dev transmit Shawn Lin (5): Documentation: arm-pl330: add description of arm,pl330-broken-no-flushp ARM: dts: Add arm,pl330-broken-no-flushp quirk for rk3xxx platform DMA: dmaengine: expose max burst capability to clients DMA: pl330: add max burst for dmaengine snd: dmaengine-pcm: add snd_dmaengine_pcm_get_caps interface Yiwei Cai (1): ASoC: rockchip_i2s: modify DMA max burst to 1 .../devicetree/bindings/dma/arm-pl330.txt | 1 + arch/arm/boot/dts/rk3288.dtsi | 3 + arch/arm/boot/dts/rk3xxx.dtsi | 3 + drivers/dma/dmaengine.c | 1 + drivers/dma/pl330.c | 106 +++++++++++++++------ drivers/spi/spi-rockchip.c | 12 ++- include/linux/dmaengine.h | 4 + sound/soc/rockchip/rockchip_i2s.c | 18 +++- sound/soc/soc-generic-dmaengine-pcm.c | 24 +++++ 9 files changed, 138 insertions(+), 34 deletions(-) -- 2.3.7

4 16

[alsa-devel] [PATCH] ALSA: hda - Enable widget power saving for Cirrus codecs
by Takashi Iwai 15 Oct '15

15 Oct '15

Cirrus codecs have also fine power controls on each widget, thus it gets benefit from the recent widget power-saving feature. As we haven't seen any obvious regressions with tests on some MacBooks, let's try to enable it. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/patch_cirrus.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c index 85813de26da8..01c464a468f6 100644 --- a/sound/pci/hda/patch_cirrus.c +++ b/sound/pci/hda/patch_cirrus.c @@ -570,6 +570,7 @@ static struct cs_spec *cs_alloc_spec(struct hda_codec *codec, int vendor_nid) return NULL; codec->spec = spec; spec->vendor_nid = vendor_nid; + codec->power_save_node = 1; snd_hda_gen_spec_init(&spec->gen); return spec; -- 2.6.1

1 0

[alsa-devel] Sound not working after new kernel installed
by Simon Wolk 15 Oct '15

15 Oct '15

Hello everybody, I don't know if my question is right here, but either way I am asking: I am using an old Benq notebook (Joybook S73) mit Xubuntu 15.04. When I installed a new kernel (then 3.19.0-16, but now I am using 3.19.0.28) the sound on the speakers stoped working and there were no more audible sounds. With headphones plugged in and a the highest possible volume I could hear very silent the music played on the PC. Up to Kernel 3.2.0-70 the sound worked fine. System update and upgrade unfortunately did not help. Do you have any idea what may be the problem? I did the following to show the chip used: simon@simon-Joybook-S73:~$ lspci -nnk | grep -i audio -A2 00:1b.0 Audio device [0403]: Intel Corporation NM10/ICH7 Family High Definition Audio Controller [8086:27d8] (rev 02) Subsystem: Benq Corporation Device [17ff:0600] Kernel driver in use: snd_hda_intel simon@simon-Joybook-S73:~$ cat /proc/asound/cards 0 [Intel ]: HDA-Intel - HDA Intel HDA Intel at 0x6c400000 irq 29 Thank you for your help! Simon

3 2

Re: [alsa-devel] ALSA: firewire-lib: schedule work again when MIDI substream has rest of MIDI messages
by Dan Carpenter 15 Oct '15

15 Oct '15

Hello Takashi Sakamoto, This is a semi-automatic email about new static checker warnings. The patch e8a40d9bcb23: "ALSA: firewire-lib: schedule work again when MIDI substream has rest of MIDI messages" from Oct 9, 2015, leads to the following Smatch complaint: sound/firewire/lib.c:88 async_midi_port_callback() error: we previously assumed 'substream' could be null (see line 77) sound/firewire/lib.c 76 77 if (rcode == RCODE_COMPLETE && substream != NULL) ^^^^^^^^^^^^^^^^^ Existing code assumes substream can be NULL. 78 snd_rawmidi_transmit_ack(substream, port->consume_bytes); 79 else if (!rcode_is_permanent_error(rcode)) 80 /* To start next transaction immediately for recovery. */ 81 port->next_ktime = ktime_set(0, 0); 82 else 83 /* Don't continue processing. */ 84 port->error = true; 85 86 port->idling = true; 87 88 if (!snd_rawmidi_transmit_empty(substream)) ^^^^^^^^^ Patch adds an unchecked dereference (inside the function call). 89 schedule_work(&port->work); 90 } regards, dan carpenter

2 1

[alsa-devel] [PATCH v4 28/79] hdspm.h: use __u8, __u32 and __u64 from linux/types.h instead of stdint.h
by Mikko Rapeli 15 Oct '15

15 Oct '15

Kernel headers should use linux/types.h based definitions. Signed-off-by: Mikko Rapeli <mikko.rapeli(a)iki.fi> --- include/uapi/sound/hdspm.h | 40 ++++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/include/uapi/sound/hdspm.h b/include/uapi/sound/hdspm.h index 5737332..c4db6f5 100644 --- a/include/uapi/sound/hdspm.h +++ b/include/uapi/sound/hdspm.h @@ -20,11 +20,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifdef __KERNEL__ #include <linux/types.h> -#else -#include <stdint.h> -#endif /* Maximum channels is 64 even on 56Mode you have 64playbacks to matrix */ #define HDSPM_MAX_CHANNELS 64 @@ -46,15 +42,15 @@ enum hdspm_speed { /* -------------------- IOCTL Peak/RMS Meters -------------------- */ struct hdspm_peak_rms { - uint32_t input_peaks[64]; - uint32_t playback_peaks[64]; - uint32_t output_peaks[64]; + __u32 input_peaks[64]; + __u32 playback_peaks[64]; + __u32 output_peaks[64]; - uint64_t input_rms[64]; - uint64_t playback_rms[64]; - uint64_t output_rms[64]; + __u64 input_rms[64]; + __u64 playback_rms[64]; + __u64 output_rms[64]; - uint8_t speed; /* enum {ss, ds, qs} */ + __u8 speed; /* enum {ss, ds, qs} */ int status2; }; @@ -155,21 +151,21 @@ enum hdspm_syncsource { }; struct hdspm_status { - uint8_t card_type; /* enum hdspm_io_type */ + __u8 card_type; /* enum hdspm_io_type */ enum hdspm_syncsource autosync_source; - uint64_t card_clock; - uint32_t master_period; + __u64 card_clock; + __u32 master_period; union { struct { - uint8_t sync_wc; /* enum hdspm_sync */ - uint8_t sync_madi; /* enum hdspm_sync */ - uint8_t sync_tco; /* enum hdspm_sync */ - uint8_t sync_in; /* enum hdspm_sync */ - uint8_t madi_input; /* enum hdspm_madi_input */ - uint8_t channel_format; /* enum hdspm_madi_channel_format */ - uint8_t frame_format; /* enum hdspm_madi_frame_format */ + __u8 sync_wc; /* enum hdspm_sync */ + __u8 sync_madi; /* enum hdspm_sync */ + __u8 sync_tco; /* enum hdspm_sync */ + __u8 sync_in; /* enum hdspm_sync */ + __u8 madi_input; /* enum hdspm_madi_input */ + __u8 channel_format; /* enum hdspm_madi_channel_format */ + __u8 frame_format; /* enum hdspm_madi_frame_format */ } madi; } card_specific; }; @@ -184,7 +180,7 @@ struct hdspm_status { #define HDSPM_ADDON_TCO 1 struct hdspm_version { - uint8_t card_type; /* enum hdspm_io_type */ + __u8 card_type; /* enum hdspm_io_type */ char cardname[20]; unsigned int serial; unsigned short firmware_rev; -- 2.5.0

2 1

[alsa-devel] [PATCH v4 17/79] include/uapi/sound/emu10k1.h: added EMU10K1 version of DECLARE_BITMAP macro
by Mikko Rapeli 15 Oct '15

15 Oct '15

Fixes userspace compilation error: error: expected specifier-qualifier-list before ‘DECLARE_BITMAP’ DECLARE_BITMAP(gpr_valid, 0x200); /* bitmask of valid initializers */ DECLARE_BITMAP macro is not meant for userspace headers and thus added here as private copy for emu10k.h. Fix was suggested by Arnd Bergmann <arnd(a)arndb.de> in message <2168807.4Yxh5gl11Q@wuerfel> and Takashi Iwai <tiwai(a)suse.de> in message <s5h1thx88tk.wl-tiwai(a)suse.de> on lkml. Signed-off-by: Mikko Rapeli <mikko.rapeli(a)iki.fi> --- include/uapi/sound/emu10k1.h | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/include/uapi/sound/emu10k1.h b/include/uapi/sound/emu10k1.h index ec1535b..5175e16 100644 --- a/include/uapi/sound/emu10k1.h +++ b/include/uapi/sound/emu10k1.h @@ -34,6 +34,14 @@ #define EMU10K1_FX8010_PCM_COUNT 8 +/* + * Following definition is copied from linux/types.h to support compiling + * this header file in userspace since they are not generally available for + * uapi headers. + */ +#define __EMU10K1_DECLARE_BITMAP(name,bits) \ + unsigned long name[(bits) / (sizeof(unsigned long) * 8)] + /* instruction set */ #define iMAC0 0x00 /* R = A + (X * Y >> 31) ; saturation */ #define iMAC1 0x01 /* R = A + (-X * Y >> 31) ; saturation */ @@ -300,7 +308,7 @@ struct snd_emu10k1_fx8010_control_old_gpr { struct snd_emu10k1_fx8010_code { char name[128]; - DECLARE_BITMAP(gpr_valid, 0x200); /* bitmask of valid initializers */ + __EMU10K1_DECLARE_BITMAP(gpr_valid, 0x200); /* bitmask of valid initializers */ __u32 __user *gpr_map; /* initializers */ unsigned int gpr_add_control_count; /* count of GPR controls to add/replace */ @@ -313,11 +321,11 @@ struct snd_emu10k1_fx8010_code { unsigned int gpr_list_control_total; /* total count of GPR controls */ struct snd_emu10k1_fx8010_control_gpr __user *gpr_list_controls; /* listed GPR controls */ - DECLARE_BITMAP(tram_valid, 0x100); /* bitmask of valid initializers */ + __EMU10K1_DECLARE_BITMAP(tram_valid, 0x100); /* bitmask of valid initializers */ __u32 __user *tram_data_map; /* data initializers */ __u32 __user *tram_addr_map; /* map initializers */ - DECLARE_BITMAP(code_valid, 1024); /* bitmask of valid instructions */ + __EMU10K1_DECLARE_BITMAP(code_valid, 1024); /* bitmask of valid instructions */ __u32 __user *code; /* one instruction - 64 bits */ }; -- 2.5.0

2 1

[alsa-devel] [patch] ALSA: oss: underflow in snd_mixer_oss_proc_write()
by Dan Carpenter 15 Oct '15

15 Oct '15

We cap the upper bound of "idx" but not the negative side. Let's make it unsigned to fix this. Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/sound/core/oss/mixer_oss.c b/sound/core/oss/mixer_oss.c index a99f720..7a8c79d 100644 --- a/sound/core/oss/mixer_oss.c +++ b/sound/core/oss/mixer_oss.c @@ -1177,7 +1177,8 @@ static void snd_mixer_oss_proc_write(struct snd_info_entry *entry, struct snd_mixer_oss *mixer = entry->private_data; char line[128], str[32], idxstr[16]; const char *cptr; - int ch, idx; + unsigned int idx; + int ch; struct snd_mixer_oss_assign_table *tbl; struct slot *slot;

2 1

[alsa-devel] [PATCH v5 0/10] Fix broken DMAFLUSHP on Rockchips platform
by Shawn Lin 14 Oct '15

14 Oct '15

The purpose of the DMAFLUSHP instruction: - Tell the peripheral to clear its status and control registers. - Send a message to the peripheral to resend its level status. There are 3 timings described in PL330 Technical Reference Manual: - Timing 1: Burst request, can work well without DMAFLUSHP. - Timing 2: Single and burst request, DMAC will ignore the single transfer request. This timing happens if there are single and burst request. - Timing 3: Single transfers for a burst request, DMAC should signals datype to request the peripheral to flush the contents of any control registers. This timing happens if there is not enough MFIFO to places the burst data. A peripheral may signal a DMA request during the execution of DMAFLUSHP instruction, that cause DMA request being ignored by DMAC. But DMAC and all peripherals on RK3X SoCs DO NOT support DMAFLUSHP. It can't send a message to the peripheral to resend DMA request, and the peripheral can't acknowledge a flush request from DMAC. So all DMA requests should NOT be ignored by DMAC, and DMAC will not notify the peripheral to flush. To fix this problem, we need: - Do NOT execute DMAFLUSHP instruction. - Timing 2 and timing 3 should not happen. Because on RK3X SoCs, there are 6 or below channels and 32 MFIFO depth for DMAC_BUS, and 8 channels and 64 MFIFO depth for DMAC_PERI, it is impossible to hit the timing 3 if burst length is equal or less than 4. Since the request type signal by the peripheral can only be set by software. We can set Rockchip Soc's GRF_PERIDMAC_CON0[2:1] to select single or burst request, if it is set b01, all of the peripharals will signal a brust request. So the timing 2 will not happen, too. So DMAC on RK3X can support single or burst transfer, but can't support mixed transfer. Because burst transfer is more efficient than single transfer, this is confirmed by our ASIC team, who strongly suggest to use burst transfer. And this is confirmed by Addy's test on RK3288-Pink2 board, the speed of spi flash burst transfer will increase about two times than single transfer. Also, I have tested dw_mmc with pl330 on RK3188 platform to double confirm the result. That means burst transfer is reansonable. So we need a quirk not to execute DMAFLUSHP instruction and to use burst transfer. Note: - The Rockchip Soc default value of GRF_PERIDMAC_CON0[2:1] is b01. To support brust transfer, these bits should not be changed in bootloader. Changes in v5: - add Mark's tag for spi changes - remove unnecessary whitespace change - use switch statement for I2S dma_quirk's manipulation Changes in v4: - remove spi & i2s dts changes and query quirk from dmaengine API suggeseted by Mark. - fix typo - Add dmaengine_get_quirk hook and implement it for pl330 Changes in v3: - add Sunny's tag - add more rockchip drivers' changes in this patchset - add Reviewed-by: Sonny Rao <sonnyrao(a)chromium.org> Changes in v2: - amend the author - reorder the patches suggested by Doug - add Reviewed-by: Doug Anderson <dianders(a)chromium.org> for rk3288.dtsi patch and arm-pl330.txt patch - amend Olof's mail address Changes in v1: - rename broken-no-flushp to "arm,pl330-broken-no-flushp" suggested by Krzysztof. - add From original author. - remove Sunny's tag Addy Ke (3): DMA: pl330: add quirk for broken no flushp ARM: dts: Add arm,pl330-broken-no-flushp quirk for rk3288 platform spi: rockchip: modify DMA max burst to 1 Boojin Kim (1): DMA: pl330: support burst mode for dev-to-mem and mem-to-dev transmit Shawn Lin (5): Documentation: arm-pl330: add description of arm,pl330-broken-no-flushp ARM: dts: Add arm,pl330-broken-no-flushp quirk for rk3xxx platform dmaengine: add API for getting dma controller's quirk DMA: pl330: implement dmaengine_get_quirks hook snd: dmaengine-pcm: add snd_dmaengine_pcm_get_quirks interface Yiwei Cai (1): ASoC: rockchip_i2s: modify DMA max burst to 1 .../devicetree/bindings/dma/arm-pl330.txt | 1 + arch/arm/boot/dts/rk3288.dtsi | 3 + arch/arm/boot/dts/rk3xxx.dtsi | 3 + drivers/dma/pl330.c | 110 +++++++++++++++------ drivers/spi/spi-rockchip.c | 13 ++- include/linux/dmaengine.h | 9 ++ sound/soc/rockchip/rockchip_i2s.c | 21 ++++ sound/soc/soc-generic-dmaengine-pcm.c | 24 +++++ 8 files changed, 153 insertions(+), 31 deletions(-) -- 2.3.7

4 21

[alsa-devel] snd_pcm_hw_params_set_buffer_size_near yields EINVAL for the value 1681
by Andrew Kelley 14 Oct '15

14 Oct '15

When I call snd_pcm_hw_params_set_buffer_size_near with the value 1681, I get an EINVAL error. These other values all work fine: 1 1679 1680 1682 1683 1684 99999 What in the world is going on here?

2 1

[alsa-devel] [PATCH v4 0/8] Add SPDIF support for rockchip
by Sjoerd Simons 14 Oct '15

14 Oct '15

This patchset adds support for the Rockchip SPDIF transceiver as present on RK3066, RK3188 and RK3288 boards and enables it on a Radxa rock pro. Tested on a Radxa Rock Pro board and Radxa Rock 2 Square board. Quite a few changes since v3 (mostly based on review comment). One important addition is proper RK3288 SoC support; While according to the documentation it has 2 SPDIF "solutions" with the default being the old one, this variation doesn't actually work.. So support has been added to switch to the new SPDIF solution on RK3288. Changes in v4: - Require rockchip,grf on RK3288 as the 8 channel solution has to be selected on that SoC - Make the compatibility string one of a known list rather then requiring a precise list of options. - Change the clock names to hclk and mclk instead of spdif_hclk and spdif_mclk to better match the implementation and data sheets. - Use hclk and mclk as the clock names matching the update devicetree documentation - Drop something useless to_info function - Open-code tx control in rk_spdif_trigge - Use devm_regmap_init_mmio_clk to allow the regmap subsystem to manage the hclk as needed - Use a more conventionale pm setup (turn everything on, mark the device as active, enable pm and request the device to go idle) - re-add the platfrorm:rockchip-spdif module alias - Also manage the hclk in the PM callbacks - Check the return code of clk_set_rate - Switch to the 8 channel spdif solutions on RK3288 - Add support for 192khz audio rate - Adjust clock names to match the new names (hclk/mclk) Changes in v3: - Fix typos in commit message - Resent patches to a more complete list of maintainers. Changes in v2: - Remove platform: module alias as it was unused - Call MODULE_DEVICE_TABLE(of, ) right after the of match table - use rk_spdif as a prefix consistenly throughout the driver - Check return code of regmap_update and bubble it up - Sort the spdif node properties - Drop the 0x prefix from the node name - Rename the spdif@ node to sound@ Sjoerd Simons (8): ASoC: dt-bindings: add rockchip tranceiver bindings ASoC: rockchip: Add rockchip SPDIF transceiver driver ARM: dts: rockchip: Add SPDIF transceiver for RK3188 ARM: dts: rockchip: Add SPDIF optical out on Radxa Rock clk: rockchip: Allow the RK3288 SPDIF clocks to change their parent ARM: dts: rockchip: Add SPDIF transceiver for RK3288 ARM: dts: rockchip: Add SPDIF optical out on Radxa Rock2 Square ARM: multi_v7_defconfig: Add rockchip audio support .../devicetree/bindings/sound/rockchip-spdif.txt | 44 +++ arch/arm/boot/dts/rk3188-radxarock.dts | 19 + arch/arm/boot/dts/rk3188.dtsi | 22 ++ arch/arm/boot/dts/rk3288-rock2-square.dts | 18 + arch/arm/boot/dts/rk3288.dtsi | 23 ++ arch/arm/configs/multi_v7_defconfig | 5 + drivers/clk/rockchip/clk-rk3288.c | 16 +- sound/soc/rockchip/Kconfig | 8 + sound/soc/rockchip/Makefile | 2 + sound/soc/rockchip/rockchip_spdif.c | 409 +++++++++++++++++++++ sound/soc/rockchip/rockchip_spdif.h | 63 ++++ 11 files changed, 621 insertions(+), 8 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/rockchip-spdif.txt create mode 100644 sound/soc/rockchip/rockchip_spdif.c create mode 100644 sound/soc/rockchip/rockchip_spdif.h -- 2.6.1

7 17

[alsa-devel] [PATCH v3 0/2] make it possible to not compile compress APIs
by Jie Yang 13 Oct '15

13 Oct '15

Compress APIs are not always needed, but they are always built currentlly, in both ALSA core and ASoC core. This series make it possible to not compile it when unneeded. Hi, Takashi & all, I am not sure you will like the patch 2/2, it split soc-compress to a module, but introduced several extra 'EXPORT_SYMBOL_GPL' there. If don't like it, you can just apply the first one(1/2) and skip 2/2. thanks, ~Keyon Changes in this version: 1. change to use a callback for compress_new, and remove compress_dai bool. 2. remove the empty module_init/exit for soc-compress module. Jie Yang (2): ASoC: soc-compress: add a config item for soc-compress ASoC: soc-compress: split soc-compress to a module include/sound/soc-dai.h | 2 +- include/sound/soc.h | 2 ++ sound/soc/Kconfig | 6 +++++- sound/soc/Makefile | 5 ++++- sound/soc/intel/Kconfig | 1 + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 2 +- sound/soc/soc-compress.c | 10 ++++++++++ sound/soc/soc-core.c | 4 ++-- sound/soc/soc-dapm.c | 1 + sound/soc/soc-pcm.c | 13 +++++++++++++ 10 files changed, 40 insertions(+), 6 deletions(-) -- 1.9.1

5 12

[alsa-devel] [PATCH v2] drm/i915: Improve kernel-doc for i915_audio_component struct
by David Henningsson 13 Oct '15

13 Oct '15

To make kernel-doc happy, the i915_audio_component_audio_ops struct cannot be nested. Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- Documentation/DocBook/drm.tmpl | 1 + include/drm/i915_component.h | 92 ++++++++++++++++++++++++++++++------------ 2 files changed, 67 insertions(+), 26 deletions(-) diff --git a/Documentation/DocBook/drm.tmpl b/Documentation/DocBook/drm.tmpl index 9ddf8c6..f16e4e8 100644 --- a/Documentation/DocBook/drm.tmpl +++ b/Documentation/DocBook/drm.tmpl @@ -4051,6 +4051,7 @@ int num_ioctls;</synopsis> <title>High Definition Audio</title> !Pdrivers/gpu/drm/i915/intel_audio.c High Definition Audio over HDMI and Display Port !Idrivers/gpu/drm/i915/intel_audio.c +!Iinclude/drm/i915_component.h </sect2> <sect2> <title>Panel Self Refresh PSR (PSR/SRD)</title> diff --git a/include/drm/i915_component.h b/include/drm/i915_component.h index 89dc7d6..76c10c8 100644 --- a/include/drm/i915_component.h +++ b/include/drm/i915_component.h @@ -30,38 +30,78 @@ */ #define MAX_PORTS 5 +/** + * struct i915_audio_component_ops - Ops implemented by i915 driver, called by hda driver + */ +struct i915_audio_component_ops { + /** + * @owner: i915 module + */ + struct module *owner; + /** + * @get_power: Request that power well is to be turned on + */ + void (*get_power)(struct device *); + /** + * @put_power: Allow the power well to be turned off + */ + void (*put_power)(struct device *); + /** + * @codec_wake_override: Force the audio codec to stay awake + */ + void (*codec_wake_override)(struct device *, bool enable); + /** + * @get_cdclk_freq: Query the i915 driver about the current cdclk frequency + */ + int (*get_cdclk_freq)(struct device *); + /** + * @sync_audio_rate: set n/cts based on the sample rate + * + * Called from audio driver. After audio driver sets the + * sample rate, it will call this function to set n/cts + */ + int (*sync_audio_rate)(struct device *, int port, int rate); +}; + +/** + * struct i915_audio_component_audio_ops - Ops implemented by hda driver, called by i915 driver + */ +struct i915_audio_component_audio_ops { + /** + * @audio_ptr: Pointer to be used in call to pin_eld_notify + */ + void *audio_ptr; + /** + * @pin_eld_notify: Notify the HDA driver that pin sense and/or ELD information has changed + * + * Called when the i915 driver has set up audio pipeline or has just + * begun to tear it down. This allows the HDA driver to update its + * status accordingly (even when the HDA controller is in power save + * mode). + */ + void (*pin_eld_notify)(void *audio_ptr, int port); +}; + +/** + * struct i915_audio_component - Used for direct communication between i915 and hda drivers + */ struct i915_audio_component { + /** + * @dev: i915 device, used as parameter for ops + */ struct device *dev; /** * @aud_sample_rate: the array of audio sample rate per port */ int aud_sample_rate[MAX_PORTS]; - - const struct i915_audio_component_ops { - struct module *owner; - void (*get_power)(struct device *); - void (*put_power)(struct device *); - void (*codec_wake_override)(struct device *, bool enable); - int (*get_cdclk_freq)(struct device *); - /** - * @sync_audio_rate: set n/cts based on the sample rate - * - * Called from audio driver. After audio driver sets the - * sample rate, it will call this function to set n/cts - */ - int (*sync_audio_rate)(struct device *, int port, int rate); - } *ops; - - const struct i915_audio_component_audio_ops { - void *audio_ptr; - /** - * Call from i915 driver, notifying the HDA driver that - * pin sense and/or ELD information has changed. - * @audio_ptr: HDA driver object - * @port: Which port has changed (PORTA / PORTB / PORTC etc) - */ - void (*pin_eld_notify)(void *audio_ptr, int port); - } *audio_ops; + /** + * @ops: Ops implemented by i915 driver, called by hda driver + */ + const struct i915_audio_component_ops *ops; + /** + * @audio_ops: Ops implemented by hda driver, called by i915 driver + */ + const struct i915_audio_component_audio_ops *audio_ops; }; #endif /* _I915_COMPONENT_H_ */ -- 1.9.1

3 4

[alsa-devel] Feasibility of adding alternative audio transport besides I2S/PWM/SPDIF, etc
by Caleb Crome 13 Oct '15

13 Oct '15

Hi All, I'm in a constant struggle to bring up many channel audio on each separate SoC. I can easily put a microcontroller in place that will collect and distrubute all the TDM channels to the codecs, and connect the hardware via an SPI interface to the SoC. So, instead of: CODECS <---TDM---> SoC It would be CODECS <---TDM---> uC <---SPI---> SoC So, my questions are: * I suspect the SPI interface could be used more universally than each individual I2S/TDM interface (like FSL SSI vs. Ti McBSP vs. Ti McASP, etc). and the SPI port would provide a very common API regardless of SoC. Is that true? * Is it feasible to integrate an SPI transport into the SoC/alsa layer? What are the difficulties involved with that? Cheers, -Caleb

4 7

[alsa-devel] [PATCH v2] drm/i915: set proper N/CTS in modeset
by libin.yang＠intel.com 13 Oct '15

13 Oct '15

From: Libin Yang <libin.yang(a)intel.com> When modeset occurs and the TMDS frequency is set to some speical values, the N/CTS need to be set manually if audio is playing. Signed-off-by: Libin Yang <libin.yang(a)intel.com> --- drivers/gpu/drm/i915/intel_audio.c | 57 ++++++++++++++++++++++++++++++++------ include/drm/i915_component.h | 10 +++++++ 2 files changed, 58 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c index e3c32ce..642dfbd 100644 --- a/drivers/gpu/drm/i915/intel_audio.c +++ b/drivers/gpu/drm/i915/intel_audio.c @@ -128,6 +128,20 @@ static int audio_config_get_n(const struct drm_display_mode *mode, int rate) return 0; } +static uint32_t audio_config_setup_n_reg(int n, uint32_t val) +{ + int n_low, n_up; + uint32_t tmp = val; + + n_low = n & 0xfff; + n_up = (n >> 12) & 0xff; + tmp &= ~(AUD_CONFIG_UPPER_N_MASK | AUD_CONFIG_LOWER_N_MASK); + tmp |= ((n_up << AUD_CONFIG_UPPER_N_SHIFT) | + (n_low << AUD_CONFIG_LOWER_N_SHIFT) | + AUD_CONFIG_N_PROG_ENABLE); + return tmp; +} + /* check whether N/CTS/M need be set manually */ static bool audio_rate_need_prog(struct intel_crtc *crtc, struct drm_display_mode *mode) @@ -262,9 +276,14 @@ static void hsw_audio_codec_enable(struct drm_connector *connector, struct drm_i915_private *dev_priv = connector->dev->dev_private; struct intel_crtc *intel_crtc = to_intel_crtc(encoder->base.crtc); enum pipe pipe = intel_crtc->pipe; + struct i915_audio_component *acomp = dev_priv->audio_component; const uint8_t *eld = connector->eld; + struct intel_digital_port *intel_dig_port = + enc_to_dig_port(&encoder->base); + enum port port = intel_dig_port->port; uint32_t tmp; int len, i; + int n, rate; DRM_DEBUG_KMS("Enable audio codec on pipe %c, %u bytes ELD\n", pipe_name(pipe), drm_eld_size(eld)); @@ -302,12 +321,29 @@ static void hsw_audio_codec_enable(struct drm_connector *connector, /* Enable timestamps */ tmp = I915_READ(HSW_AUD_CFG(pipe)); tmp &= ~AUD_CONFIG_N_VALUE_INDEX; - tmp &= ~AUD_CONFIG_N_PROG_ENABLE; tmp &= ~AUD_CONFIG_PIXEL_CLOCK_HDMI_MASK; if (intel_pipe_has_type(intel_crtc, INTEL_OUTPUT_DISPLAYPORT)) tmp |= AUD_CONFIG_N_VALUE_INDEX; else tmp |= audio_config_hdmi_pixel_clock(mode); + + tmp &= ~AUD_CONFIG_N_PROG_ENABLE; + if (audio_rate_need_prog(intel_crtc, mode)) { + if (!acomp) + rate = 0; + else if (port >= PORT_A && port <= PORT_E) + rate = acomp->aud_sample_rate[port]; + else { + DRM_ERROR("invalid port: %d\n", port); + rate = 0; + } + n = audio_config_get_n(mode, rate); + if (n != 0) + tmp = audio_config_setup_n_reg(n, tmp); + else + DRM_DEBUG_KMS("no suitable N value is found\n"); + } + I915_WRITE(HSW_AUD_CFG(pipe), tmp); mutex_unlock(&dev_priv->av_mutex); @@ -594,9 +630,10 @@ static int i915_audio_component_sync_audio_rate(struct device *dev, struct intel_digital_port *intel_dig_port; struct intel_crtc *crtc; struct drm_display_mode *mode; + struct i915_audio_component *acomp = dev_priv->audio_component; enum pipe pipe = -1; u32 tmp; - int n_low, n_up, n; + int n; /* HSW, BDW SKL need this fix */ if (!IS_SKYLAKE(dev_priv) && @@ -630,6 +667,9 @@ static int i915_audio_component_sync_audio_rate(struct device *dev, pipe_name(pipe), port_name(port)); mode = &crtc->config->base.adjusted_mode; + /* port must be valid now, otherwise the pipe will be invalid */ + acomp->aud_sample_rate[port] = rate; + /* 2. check whether to set the N/CTS/M manually or not */ if (!audio_rate_need_prog(crtc, mode)) { tmp = I915_READ(HSW_AUD_CFG(pipe)); @@ -649,15 +689,10 @@ static int i915_audio_component_sync_audio_rate(struct device *dev, mutex_unlock(&dev_priv->av_mutex); return 0; } - n_low = n & 0xfff; - n_up = (n >> 12) & 0xff; - /* 4. set the N/CTS/M */ + /* 3. set the N/CTS/M */ tmp = I915_READ(HSW_AUD_CFG(pipe)); - tmp &= ~(AUD_CONFIG_UPPER_N_MASK | AUD_CONFIG_LOWER_N_MASK); - tmp |= ((n_up << AUD_CONFIG_UPPER_N_SHIFT) | - (n_low << AUD_CONFIG_LOWER_N_SHIFT) | - AUD_CONFIG_N_PROG_ENABLE); + tmp = audio_config_setup_n_reg(n, tmp); I915_WRITE(HSW_AUD_CFG(pipe), tmp); mutex_unlock(&dev_priv->av_mutex); @@ -678,6 +713,7 @@ static int i915_audio_component_bind(struct device *i915_dev, { struct i915_audio_component *acomp = data; struct drm_i915_private *dev_priv = dev_to_i915(i915_dev); + int i; if (WARN_ON(acomp->ops || acomp->dev)) return -EEXIST; @@ -685,6 +721,9 @@ static int i915_audio_component_bind(struct device *i915_dev, drm_modeset_lock_all(dev_priv->dev); acomp->ops = &i915_audio_component_ops; acomp->dev = i915_dev; + BUILD_BUG_ON(MAX_PORTS != I915_MAX_PORTS); + for (i = 0; i < ARRAY_SIZE(acomp->aud_sample_rate); i++) + acomp->aud_sample_rate[i] = 0; dev_priv->audio_component = acomp; drm_modeset_unlock_all(dev_priv->dev); diff --git a/include/drm/i915_component.h b/include/drm/i915_component.h index e6d35d7..89dc7d6 100644 --- a/include/drm/i915_component.h +++ b/include/drm/i915_component.h @@ -24,8 +24,18 @@ #ifndef _I915_COMPONENT_H_ #define _I915_COMPONENT_H_ +/* MAX_PORT is the number of port + * It must be sync with I915_MAX_PORTS defined i915_drv.h + * 5 should be enough as only HSW, BDW, SKL need such fix. + */ +#define MAX_PORTS 5 + struct i915_audio_component { struct device *dev; + /** + * @aud_sample_rate: the array of audio sample rate per port + */ + int aud_sample_rate[MAX_PORTS]; const struct i915_audio_component_ops { struct module *owner; -- 1.9.1

7 7

[alsa-devel] [PATCH v2] ASoC: Intel: Skylake - Add Skylake RT286 I2S machine driver
by Vinod Koul 13 Oct '15

13 Oct '15

From: Omair M Abdullah <omair.m.abdullah(a)intel.com> Add the SKL I2S machine driver using Realtek ALC286S codec in I2S mode. Signed-off-by: Omair M Abdullah <omair.m.abdullah(a)intel.com> Signed-off-by: Jeeja KP <jeeja.kp(a)intel.com> Signed-off-by: Vinod Koul <vinod.koul(a)intel.com> --- v2: added depends on X86 and ACPI based on LKP reports sound/soc/intel/Kconfig | 13 ++ sound/soc/intel/boards/Makefile | 2 + sound/soc/intel/boards/skl_rt286.c | 268 +++++++++++++++++++++++++++++++++++++ 3 files changed, 283 insertions(+) create mode 100644 sound/soc/intel/boards/skl_rt286.c diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig index 664df1f44530..6d67357f2d74 100644 --- a/sound/soc/intel/Kconfig +++ b/sound/soc/intel/Kconfig @@ -140,3 +140,16 @@ config SND_SOC_INTEL_SKYLAKE select SND_HDA_EXT_CORE select SND_SOC_TOPOLOGY select SND_SOC_INTEL_SST + +config SND_SOC_INTEL_SKL_RT286_MACH + tristate "ASoC Audio driver for SKL with RT286 I2S mode" + depends on X86 && ACPI + select SND_SOC_INTEL_SST + select SND_SOC_INTEL_SKYLAKE + select SND_SOC_RT286 + select SND_SOC_DMIC + help + This adds support for ASoC machine driver for Skylake platforms + with RT286 I2S audio codec. + Say Y if you have such a device + If unsure select "N". diff --git a/sound/soc/intel/boards/Makefile b/sound/soc/intel/boards/Makefile index cb94895c9edb..371c4565cad8 100644 --- a/sound/soc/intel/boards/Makefile +++ b/sound/soc/intel/boards/Makefile @@ -6,6 +6,7 @@ snd-soc-sst-bytcr-rt5640-objs := bytcr_rt5640.o snd-soc-sst-cht-bsw-rt5672-objs := cht_bsw_rt5672.o snd-soc-sst-cht-bsw-rt5645-objs := cht_bsw_rt5645.o snd-soc-sst-cht-bsw-max98090_ti-objs := cht_bsw_max98090_ti.o +snd-soc-skl_rt286-objs := skl_rt286.o obj-$(CONFIG_SND_SOC_INTEL_HASWELL_MACH) += snd-soc-sst-haswell.o obj-$(CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH) += snd-soc-sst-byt-rt5640-mach.o @@ -15,3 +16,4 @@ obj-$(CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH) += snd-soc-sst-bytcr-rt5640.o obj-$(CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH) += snd-soc-sst-cht-bsw-rt5672.o obj-$(CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH) += snd-soc-sst-cht-bsw-rt5645.o obj-$(CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH) += snd-soc-sst-cht-bsw-max98090_ti.o +obj-$(CONFIG_SND_SOC_INTEL_SKL_RT286_MACH) += snd-soc-skl_rt286.o diff --git a/sound/soc/intel/boards/skl_rt286.c b/sound/soc/intel/boards/skl_rt286.c new file mode 100644 index 000000000000..71907b2c1611 --- /dev/null +++ b/sound/soc/intel/boards/skl_rt286.c @@ -0,0 +1,268 @@ +/* + * Intel Skylake I2S Machine Driver + * + * Copyright (C) 2014-2015, Intel Corporation. All rights reserved. + * + * Modified from: + * Intel Broadwell Wildcatpoint SST Audio + * + * Copyright (C) 2013, Intel Corporation. All rights reserved. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License version + * 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <linux/module.h> +#include <linux/platform_device.h> +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/soc.h> +#include <sound/jack.h> +#include <sound/pcm_params.h> +#include "../../codecs/rt286.h" + +static struct snd_soc_jack skylake_headset; +/* Headset jack detection DAPM pins */ +static struct snd_soc_jack_pin skylake_headset_pins[] = { + { + .pin = "Mic Jack", + .mask = SND_JACK_MICROPHONE, + }, + { + .pin = "Headphone Jack", + .mask = SND_JACK_HEADPHONE, + }, +}; + +static const struct snd_kcontrol_new skylake_controls[] = { + SOC_DAPM_PIN_SWITCH("Speaker"), + SOC_DAPM_PIN_SWITCH("Headphone Jack"), + SOC_DAPM_PIN_SWITCH("Mic Jack"), +}; + +static const struct snd_soc_dapm_widget skylake_widgets[] = { + SND_SOC_DAPM_HP("Headphone Jack", NULL), + SND_SOC_DAPM_SPK("Speaker", NULL), + SND_SOC_DAPM_MIC("Mic Jack", NULL), + SND_SOC_DAPM_MIC("DMIC2", NULL), + SND_SOC_DAPM_MIC("SoC DMIC", NULL), +}; + +static const struct snd_soc_dapm_route skylake_rt286_map[] = { + /* speaker */ + {"Speaker", NULL, "SPOR"}, + {"Speaker", NULL, "SPOL"}, + + /* HP jack connectors - unknown if we have jack deteck */ + {"Headphone Jack", NULL, "HPO Pin"}, + + /* other jacks */ + {"MIC1", NULL, "Mic Jack"}, + + /* digital mics */ + {"DMIC1 Pin", NULL, "DMIC2"}, + {"DMIC AIF", NULL, "SoC DMIC"}, + + /* CODEC BE connections */ + { "AIF1 Playback", NULL, "ssp0 Tx"}, + { "ssp0 Tx", NULL, "codec0_out"}, + { "ssp0 Tx", NULL, "codec1_out"}, + + { "codec0_in", NULL, "ssp0 Rx" }, + { "codec1_in", NULL, "ssp0 Rx" }, + { "ssp0 Rx", NULL, "AIF1 Capture" }, + + { "dmic01_hifi", NULL, "DMIC01 Rx" }, + { "DMIC01 Rx", NULL, "Capture" }, + + { "hif1", NULL, "iDisp Tx"}, + { "iDisp Tx", NULL, "iDisp_out"}, + +}; + +static int skylake_rt286_codec_init(struct snd_soc_pcm_runtime *rtd) +{ + struct snd_soc_codec *codec = rtd->codec; + int ret; + + ret = snd_soc_card_jack_new(rtd->card, "Headset", + SND_JACK_HEADSET | SND_JACK_BTN_0, + &skylake_headset, + skylake_headset_pins, ARRAY_SIZE(skylake_headset_pins)); + + if (ret) + return ret; + + rt286_mic_detect(codec, &skylake_headset); + + return 0; +} + + +static int skylake_ssp0_fixup(struct snd_soc_pcm_runtime *rtd, + struct snd_pcm_hw_params *params) +{ + struct snd_interval *rate = hw_param_interval(params, + SNDRV_PCM_HW_PARAM_RATE); + struct snd_interval *channels = hw_param_interval(params, + SNDRV_PCM_HW_PARAM_CHANNELS); + + /* The output is 48KHz, stereo, 16bits */ + rate->min = rate->max = 48000; + channels->min = channels->max = 2; + snd_mask_set(&params->masks[SNDRV_PCM_HW_PARAM_FORMAT - + SNDRV_PCM_HW_PARAM_FIRST_MASK], + SNDRV_PCM_FORMAT_S16_LE); + + return 0; +} + +static int skylake_rt286_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_dai *codec_dai = rtd->codec_dai; + int ret; + + ret = snd_soc_dai_set_sysclk(codec_dai, RT286_SCLK_S_PLL, 24000000, + SND_SOC_CLOCK_IN); + if (ret < 0) + dev_err(rtd->dev, "set codec sysclk failed: %d\n", ret); + + return ret; +} + +static struct snd_soc_ops skylake_rt286_ops = { + .hw_params = skylake_rt286_hw_params, +}; + +/* skylake digital audio interface glue - connects codec <--> CPU */ +static struct snd_soc_dai_link skylake_rt286_dais[] = { + /* Front End DAI links */ + { + .name = "Skl Audio Port", + .stream_name = "Audio", + .cpu_dai_name = "System Pin", + .platform_name = "0000:00:1f.3", + .nonatomic = 1, + .dynamic = 1, + .codec_name = "snd-soc-dummy", + .codec_dai_name = "snd-soc-dummy-dai", + .trigger = { + SND_SOC_DPCM_TRIGGER_POST, + SND_SOC_DPCM_TRIGGER_POST + }, + .dpcm_playback = 1, + }, + { + .name = "Skl Audio Capture Port", + .stream_name = "Audio Record", + .cpu_dai_name = "System Pin", + .platform_name = "0000:00:1f.3", + .nonatomic = 1, + .dynamic = 1, + .codec_name = "snd-soc-dummy", + .codec_dai_name = "snd-soc-dummy-dai", + .trigger = { + SND_SOC_DPCM_TRIGGER_POST, + SND_SOC_DPCM_TRIGGER_POST + }, + .dpcm_capture = 1, + }, + { + .name = "Skl Audio Reference cap", + .stream_name = "refcap", + .cpu_dai_name = "Reference Pin", + .codec_name = "snd-soc-dummy", + .codec_dai_name = "snd-soc-dummy-dai", + .platform_name = "0000:00:1f.3", + .init = NULL, + .dpcm_capture = 1, + .ignore_suspend = 1, + .nonatomic = 1, + .dynamic = 1, + }, + + /* Back End DAI links */ + { + /* SSP0 - Codec */ + .name = "SSP0-Codec", + .be_id = 0, + .cpu_dai_name = "SSP0 Pin", + .platform_name = "0000:00:1f.3", + .no_pcm = 1, + .codec_name = "i2c-INT343A:00", + .codec_dai_name = "rt286-aif1", + .init = skylake_rt286_codec_init, + .dai_fmt = SND_SOC_DAIFMT_I2S | + SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBS_CFS, + .ignore_suspend = 1, + .ignore_pmdown_time = 1, + .be_hw_params_fixup = skylake_ssp0_fixup, + .ops = &skylake_rt286_ops, + .dpcm_playback = 1, + .dpcm_capture = 1, + }, + { + .name = "dmic01", + .be_id = 1, + .cpu_dai_name = "DMIC01 Pin", + .codec_name = "dmic-codec", + .codec_dai_name = "dmic-hifi", + .platform_name = "0000:00:1f.3", + .ignore_suspend = 1, + .dpcm_capture = 1, + .no_pcm = 1, + }, +}; + +/* skylake audio machine driver for SPT + RT286S */ +static struct snd_soc_card skylake_rt286 = { + .name = "skylake-rt286", + .owner = THIS_MODULE, + .dai_link = skylake_rt286_dais, + .num_links = ARRAY_SIZE(skylake_rt286_dais), + .controls = skylake_controls, + .num_controls = ARRAY_SIZE(skylake_controls), + .dapm_widgets = skylake_widgets, + .num_dapm_widgets = ARRAY_SIZE(skylake_widgets), + .dapm_routes = skylake_rt286_map, + .num_dapm_routes = ARRAY_SIZE(skylake_rt286_map), + .fully_routed = true, +}; + +static int skylake_audio_probe(struct platform_device *pdev) +{ + skylake_rt286.dev = &pdev->dev; + + return snd_soc_register_card(&skylake_rt286); +} + +static int skylake_audio_remove(struct platform_device *pdev) +{ + snd_soc_unregister_card(&skylake_rt286); + return 0; +} + +static struct platform_driver skylake_audio = { + .probe = skylake_audio_probe, + .remove = skylake_audio_remove, + .driver = { + .name = "skl_alc286s_i2s", + }, +}; + +module_platform_driver(skylake_audio) + +/* Module information */ +MODULE_AUTHOR("Omair Mohammed Abdullah <omair.m.abdullah(a)intel.com>"); +MODULE_DESCRIPTION("Intel SST Audio for Skylake"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:skl_alc286s_i2s"); -- 2.4.3

2 1

[alsa-devel] [patch] ALSA: pcm: harmless underflow issue in snd_pcm_sw_params()
by Dan Carpenter 13 Oct '15

13 Oct '15

"params->tstamp_mode" is a user supplied int. We cap the maximum but allow negative values by mistake. It's harmless but static checkers complain. Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 75888dd..4863af5 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -650,7 +650,8 @@ static int snd_pcm_sw_params(struct snd_pcm_substream *substream, } snd_pcm_stream_unlock_irq(substream); - if (params->tstamp_mode > SNDRV_PCM_TSTAMP_LAST) + if (params->tstamp_mode < 0 || + params->tstamp_mode > SNDRV_PCM_TSTAMP_LAST) return -EINVAL; if (params->proto >= SNDRV_PROTOCOL_VERSION(2, 0, 12) && params->tstamp_type > SNDRV_PCM_TSTAMP_TYPE_LAST)

2 2

[alsa-devel] [PATCH V2 0/7] BAT: Add Basic Audio Tester command line tool
by han.lu＠intel.com 13 Oct '15

13 Oct '15

From: "Lu, Han" <han.lu(a)intel.com> BAT (Basic Audio Tester) is a simple command line utility intended to automate audio driver and sound server QA testing with no human interaction. BAT works by playing an audio stream and capturing the same stream in either a digital or analog loop back. It then compares the captured stream to the original to determine if the test case passes or fails. The main idea of frequency detecting is: The analysis function reads data from WAV file, run FFT against the data to get magnitude of frequency vectors, and then calculates the average value and standard deviation of frequency vectors. After that, we define a threshold: threshold = 3 * standard_deviation + average_value Frequencies with amplitude larger than threshold will be recognized as a peak, and the frequency with largest peak value will be recognized as a detected frequency. BAT then compares the detected frequency to target frequency, to decide if the detecting passes or fails. BAT supports 4 working modes: 1. Single line playback; 2. Single line capture and analysis; 3. Playback and capture in loop, and analyze captured data; 4. Local analyze without actual playback or capture. BAT will check devices input by user to decide which mode to use. BAT will create threads for playback and record, and will run spectrum analysis for mode 2, 3 or 4. Changes on V2: 1. Adopt Caleb Crome's method to generate sine signal to avoids unwanted distortion on waveform. Lu, Han (7): BAT: Add initial functions BAT: Add common definitions and functions BAT: Add playback and record functions BAT: Add signal generator BAT: Add converting functions BAT: Add spectrum analysis functions BAT: Add Makefile and configures Makefile.am | 3 + bat/Makefile.am | 14 ++ bat/alsa.c | 594 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ bat/alsa.h | 20 ++ bat/analyze.c | 314 +++++++++++++++++++++++++++++ bat/analyze.h | 16 ++ bat/bat.c | 603 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ bat/common.c | 198 +++++++++++++++++++ bat/common.h | 176 +++++++++++++++++ bat/convert.c | 113 +++++++++++ bat/convert.h | 23 +++ bat/signal.c | 182 +++++++++++++++++ bat/signal.h | 30 +++ configure.ac | 19 +- 14 files changed, 2304 insertions(+), 1 deletion(-) create mode 100644 bat/Makefile.am create mode 100644 bat/alsa.c create mode 100644 bat/alsa.h create mode 100644 bat/analyze.c create mode 100644 bat/analyze.h create mode 100644 bat/bat.c create mode 100644 bat/common.c create mode 100644 bat/common.h create mode 100644 bat/convert.c create mode 100644 bat/convert.h create mode 100644 bat/signal.c create mode 100644 bat/signal.h -- 1.9.1

4 12

[alsa-devel] [PATCH v4] ALSA: usb-audio: Fix max packet size calculation for USB audio
by Ricard Wanderlof 13 Oct '15

13 Oct '15

Rounding must take place before multiplication with the frame size, since each packet contains a whole number of frames. We must also properly consider the data interval, as a larger data interval will result in larger packets, which, depending on the sampling frequency, can result in packet sizes that are less than integral multiples of the packet size for a lower data interval. Detailed explanation and rationale: The code before this commit had the following expression on line 613 to calculate the maximum isochronous packet size: maxsize = ((ep->freqmax + 0xffff) * (frame_bits >> 3)) >> (16 - ep->datainterval); Here, ep->freqmax is the maximum assumed sample frequency, calculated from the nominal sample frequency plus 25%. It is ultimately derived from ep->freqn, which is in the units of frames per packet, from get_usb_full_speed_rate() or usb_high_speed_rate(), as applicable, in Q16.16 format. The expression essentially adds the Q16.16 equivalent of 0.999... (i.e. the largest number less than one) to the sample rate, in order to get a rate whose integer part is rounded up from the fractional value. The multiplication with (frame_bits >> 3) yields the number of bytes in a packet, and the (16 >> ep->datainterval) then converts it from Q16.16 back to an integer, taking into consideration the bDataInterval field of the endpoint descriptor (which describes how often isochronous packets are transmitted relative to the (micro)frame rate (125us or 1ms, for USB high speed and full speed, respectively)). For this discussion we will initially assume a bDataInterval of 0, so the second line of the expression just converts the Q16.16 value to an integer. In order to illustrate the problem, we will set frame_bits 64, which corresponds to a frame size of 8 bytes. The problem here is twofold. First, the rounding operation consists of the addition of 0x0.ffff and subsequent conversion to integer, but as the expression stands, the conversion to integer is done after multiplication with the frame size, rather than before. This results in the resulting maxsize becoming too large. Let's take an example. We have a sample rate of 96 kHz, so our ep->freqn is 0xc0000 (see usb_high_speed_rate()). Add 25% (line 612) and we get 0xf0000. The calculated maxsize is then ((0xf0000 + 0x0ffff) * 8) >> 16 = 127 . However, if we do the number of bytes calculation in a less obscure way it's more apparent what the true corresponding packet size is: we get ceil(96000 * 1.25 / 8000) * 8 = 120, where 1.25 is the 25% from line 612, and the 8000 is the number of isochronous packets per second on a high speed USB connection (125 us microframe interval). This is fixed by performing the complete rounding operation prior to multiplication with the frame rate. The second problem is that when considering the ep->datainterval, this must be done before rounding, in order to take the advantage of the fact that if the number of bytes per packet is not an integer, the resulting rounded-up integer is not necessarily a factor of two when the data interval is increased by the same factor. For instance, assuming a freqency of 41 kHz, the resulting bytes-per-packet value for USB high speed is 41 kHz / 8000 = 5.125, or 0x52000 in Q16.16 format. With a data interval of 1 (ep->datainterval = 0), this means that 6 frames per packet are needed, whereas with a data interval of 2 we need 10.25, i.e. 11 frames needed. Rephrasing the maxsize expression to: maxsize = (((ep->freqmax << ep->datainterval) + 0xffff) >> 16) * (frame_bits >> 3); for the above 96 kHz example we instead get ((0xf0000 + 0xffff) >> 16) * 8 = 120 which is the correct value. We can also do the calculation with a non-integer sample rate which is when rounding comes into effect: say we have 44.1 kHz (resulting ep->freqn = 0x58333, and resulting ep->freqmax 0x58333 * 1.25 = 0x6e3ff (rounded down)): Original maxsize = ((0x6e3ff + 0xffff) * 8) << 16 = 63 (63.124.. rounded down) True maxsize = ceil(44100 * 1.25 / 8000) * 8 = 7 * 8 = 56 New maxsize = ((0x6e3ff + 0xffff) >> 16) * 8 = 7 * 8 = 56 This is also corroborated by the wMaxPacketSize check on line 616. Assume that wMaxPacketSize = 104, with ep->maxpacksize then having the same value. As 104 < 127, we get maxsize = 104. ep->freqmax is then recalculated to (104 / 8) << 16 = 0xd0000 . Putting that rate into the original maxsize calculation yields a maxsize of ((0xd0000 + 0xffff) * 8) >> 16 = 111 (with decimals 111.99988). Clearly, we should get back the 104 here, which we would with the new expression: ((0xd0000 + 0xffff) >> 16) * 8 = 104 . (The error has not been a problem because it only results in maxsize being a bit too big which just wastes a couple of bytes, either as a result of the first maxsize calculation, or because the resulting calculation will hit the wMaxPacketSize value before the packet is too big, resulting in fixing the size to wMaxPacketSize even though the packet is actually not too long.) Tested with an Edirol UA-5 both at 44.1 kHz and 96 kHz. Signed-off-by: Ricard Wanderlof <ricardw(a)axis.com> --- V2: Added tested device to commit message. No other changes. V3: Updated after input from Clemens. Since the expression is now getting rather convoluted, added a description in the comments in the code. New commit message to reflect the new version. Updated rationale below. V4: Moved most of the rationale (slightly rephrased) to the commit message as suggested by Takashi. Although the error is tolerable because it just wastes a couple of bytes in each packet, however, I'm working on a quirk for a device which stuffs an extra four (non sample) bytes into each isochronous packet, and that means that the maxsize calculation must take this into account. During this work it became obvious that there was something wrong with the maxsize calculation, as the resulting packet size when wMaxPacketSize was hit did not correspond to the packet size which triggered the if statement to start with. Since this seems to me an obvious (after looking at it for a bit...) bug I'm submitting this as a separate patch rather than part of an upcoming patch series. sound/usb/endpoint.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c index e6f7189..a77d9c8 100644 --- a/sound/usb/endpoint.c +++ b/sound/usb/endpoint.c @@ -610,8 +610,23 @@ static int data_ep_set_params(struct snd_usb_endpoint *ep, /* assume max. frequency is 25% higher than nominal */ ep->freqmax = ep->freqn + (ep->freqn >> 2); - maxsize = ((ep->freqmax + 0xffff) * (frame_bits >> 3)) - >> (16 - ep->datainterval); + /* Round up freqmax to nearest integer in order to calculate maximum + * packet size, which must represent a whole number of frames. + * This is accomplished by adding 0x0.ffff before converting the + * Q16.16 format into integer. + * In order to accurately calculate the maximum packet size when + * the data interval is more than 1 (i.e. ep->datainterval > 0), + * multiply by the data interval prior to rounding. For instance, + * a freqmax of 41 kHz will result in a max packet size of 6 (5.125) + * frames with a data interval of 1, but 11 (10.25) frames with a + * data interval of 2. + * (ep->freqmax << ep->datainterval overflows at 8.192 MHz for the + * maximum datainterval value of 3, at USB full speed, higher for + * USB high speed, noting that ep->freqmax is in units of + * frames per packet in Q16.16 format.) + */ + maxsize = (((ep->freqmax << ep->datainterval) + 0xffff) >> 16) * + (frame_bits >> 3); /* but wMaxPacketSize might reduce this */ if (ep->maxpacksize && ep->maxpacksize < maxsize) { /* whatever fits into a max. size packet */ -- 1.7.10.4 -- Ricard Wolf Wanderlöf ricardw(at)axis.com Axis Communications AB, Lund, Sweden www.axis.com Phone +46 46 272 2016 Fax +46 46 13 61 30

2 1

[alsa-devel] [PATCH] ALSA: hdac: Explicitly add io.h
by Vinod Koul 13 Oct '15

13 Oct '15

Compiling the hdac extended core on arm fails with below error: sound/hda/ext/hdac_ext_bus.c: In function 'hdac_ext_writel': >> sound/hda/ext/hdac_ext_bus.c:29:2: error: implicit declaration of >> function +'writel' [-Werror=implicit-function-declaration] writel(value, addr); ^ sound/hda/ext/hdac_ext_bus.c: In function 'hdac_ext_readl': >> sound/hda/ext/hdac_ext_bus.c:34:2: error: implicit declaration of >> function +'readl' [-Werror=implicit-function-declaration] return readl(addr); This is fixed by explicitly including io.h Fixes: 99463b3a3994 - ('ALSA: hda: provide default bus io ops extended hdac') Reported-by: kbuild test robot <lkp(a)intel.com> Suggested-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Vinod Koul <vinod.koul(a)intel.com> --- sound/hda/ext/hdac_ext_bus.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/hda/ext/hdac_ext_bus.c b/sound/hda/ext/hdac_ext_bus.c index 4449d1a99089..2433f7c81472 100644 --- a/sound/hda/ext/hdac_ext_bus.c +++ b/sound/hda/ext/hdac_ext_bus.c @@ -19,6 +19,7 @@ #include <linux/module.h> #include <linux/slab.h> +#include <linux/io.h> #include <sound/hdaudio_ext.h> MODULE_DESCRIPTION("HDA extended core"); -- 2.4.3

2 1

[alsa-devel] [PATCH] ALSA: hda - Fix inverted internal mic on Lenovo G50-80
by David Henningsson 13 Oct '15

13 Oct '15

Add the appropriate quirk to indicate the Lenovo G50-80 has a stereo mic input where one channel has reverse polarity. Alsa-info available at: https://launchpadlibrarian.net/220846272/AlsaInfo.txt Cc: stable(a)vger.kernel.org BugLink: https://bugs.launchpad.net/bugs/1504778 Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- sound/pci/hda/patch_conexant.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index ca03c40..2f0ec7c 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -819,6 +819,7 @@ static const struct snd_pci_quirk cxt5066_fixups[] = { SND_PCI_QUIRK(0x17aa, 0x21da, "Lenovo X220", CXT_PINCFG_LENOVO_TP410), SND_PCI_QUIRK(0x17aa, 0x21db, "Lenovo X220-tablet", CXT_PINCFG_LENOVO_TP410), SND_PCI_QUIRK(0x17aa, 0x38af, "Lenovo IdeaPad Z560", CXT_FIXUP_MUTE_LED_EAPD), + SND_PCI_QUIRK(0x17aa, 0x390b, "Lenovo G50-80", CXT_FIXUP_STEREO_DMIC), SND_PCI_QUIRK(0x17aa, 0x3975, "Lenovo U300s", CXT_FIXUP_STEREO_DMIC), SND_PCI_QUIRK(0x17aa, 0x3977, "Lenovo IdeaPad U310", CXT_FIXUP_STEREO_DMIC), SND_PCI_QUIRK(0x17aa, 0x397b, "Lenovo S205", CXT_FIXUP_STEREO_DMIC), -- 1.9.1

2 1

[alsa-devel] How is /proc/asound/cardX/eld#Y.Z generated?
by VDR User 12 Oct '15

12 Oct '15

Hi. I was wondering if someone can tell me how exactly the eld files are generated. Additionally, if they can be overridden somehow. The reason is if I start x while my tv is turned on, the eld reports only stereo audio capability for hdmi even though the tv is plugged into my surround receiver. I don't care what the tv reports, my surround receiver is 7.1 so I always want the eld to reflect my -actual- audio channel setup. Thanks.

2 2

[alsa-devel] [PATCH] ASoC: rt298: set register non-volatile by default
by Bard Liao 12 Oct '15

12 Oct '15

It is not necessary to set registers volatile. So, return false for default case of rt298_volatile_register. Signed-off-by: Bard Liao <bardliao(a)realtek.com> --- sound/soc/codecs/rt298.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/rt298.c b/sound/soc/codecs/rt298.c index 5a9aadb..56e5e1a 100644 --- a/sound/soc/codecs/rt298.c +++ b/sound/soc/codecs/rt298.c @@ -128,7 +128,7 @@ static bool rt298_volatile_register(struct device *dev, unsigned int reg) case VERB_CMD(AC_VERB_GET_EAPD_BTLENABLE, RT298_HP_OUT, 0): return true; default: - return true; + return false; } -- 1.8.1.1.439.g50a6b54

2 1

[alsa-devel] [PATCH] ASoC: rt298: correct index default value
by Bard Liao 12 Oct '15

12 Oct '15

Some of the default value on rt298_index_def are incorrect. Change them to the correct value. Signed-off-by: Bard Liao <bardliao(a)realtek.com> --- sound/soc/codecs/rt298.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/sound/soc/codecs/rt298.c b/sound/soc/codecs/rt298.c index 83bbc62..5a9aadb 100644 --- a/sound/soc/codecs/rt298.c +++ b/sound/soc/codecs/rt298.c @@ -49,24 +49,24 @@ struct rt298_priv { }; static const struct reg_default rt298_index_def[] = { - { 0x01, 0xaaaa }, - { 0x02, 0x8aaa }, + { 0x01, 0xa5a8 }, + { 0x02, 0x8e95 }, { 0x03, 0x0002 }, - { 0x04, 0xaf01 }, - { 0x08, 0x000d }, - { 0x09, 0xd810 }, - { 0x0a, 0x0120 }, + { 0x04, 0xaf67 }, + { 0x08, 0x200f }, + { 0x09, 0xd010 }, + { 0x0a, 0x0100 }, { 0x0b, 0x0000 }, { 0x0d, 0x2800 }, - { 0x0f, 0x0000 }, - { 0x19, 0x0a17 }, + { 0x0f, 0x0022 }, + { 0x19, 0x0217 }, { 0x20, 0x0020 }, { 0x33, 0x0208 }, { 0x46, 0x0300 }, - { 0x49, 0x0004 }, - { 0x4f, 0x50e9 }, - { 0x50, 0x2000 }, - { 0x63, 0x2902 }, + { 0x49, 0x4004 }, + { 0x4f, 0x50c9 }, + { 0x50, 0x3000 }, + { 0x63, 0x1b02 }, { 0x67, 0x1111 }, { 0x68, 0x1016 }, { 0x69, 0x273f }, -- 1.8.1.1.439.g50a6b54

2 1

[alsa-devel] [PATCH v3] ASoC: rt5645: Add the HW EQ for the customized speaker output of Google Celes
by Oder Chiou 12 Oct '15

12 Oct '15

Signed-off-by: Oder Chiou <oder_chiou(a)realtek.com> --- include/sound/rt5645.h | 1 + sound/soc/codecs/rt5645.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 86 insertions(+), 1 deletion(-) diff --git a/include/sound/rt5645.h b/include/sound/rt5645.h index a5cf615..42f0842 100644 --- a/include/sound/rt5645.h +++ b/include/sound/rt5645.h @@ -23,6 +23,7 @@ struct rt5645_platform_data { unsigned int jd_mode; /* Invert JD when jack insert */ bool jd_invert; + bool hweq; }; #endif diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index 4c4fe6b..d9532bb 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -22,6 +22,7 @@ #include <linux/acpi.h> #include <linux/dmi.h> #include <linux/regulator/consumer.h> +#include <linux/firmware.h> #include <sound/core.h> #include <sound/pcm.h> #include <sound/pcm_params.h> @@ -224,6 +225,16 @@ static const struct reg_default rt5645_reg[] = { { 0xff, 0x6308 }, }; +struct rt5645_eq_param_s { + unsigned short reg; + unsigned short val; +}; + +struct rt5645_hweq_s { + unsigned short num; + struct rt5645_eq_param_s *param; +}; + static const char *const rt5645_supply_names[] = { "avdd", "cpvdd", @@ -240,6 +251,7 @@ struct rt5645_priv { struct snd_soc_jack *btn_jack; struct delayed_work jack_detect_work; struct regulator_bulk_data supplies[ARRAY_SIZE(rt5645_supply_names)]; + struct rt5645_hweq_s hweq; int codec_type; int sysclk; @@ -631,6 +643,59 @@ static int is_using_asrc(struct snd_soc_dapm_widget *source, } +static int rt5645_read_hweq_param(struct snd_soc_codec *codec) +{ + struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec); + const struct firmware *fw; + int i; + + if (!request_firmware(&fw, "rt5645_hweq.bin", codec->dev)) { + rt5645->hweq.num = fw->size / sizeof(struct rt5645_eq_param_s); + rt5645->hweq.param = devm_kmemdup(codec->dev, fw->data, + fw->size, GFP_KERNEL); + if (rt5645->hweq.param) { + for (i = 0; i < rt5645->hweq.num; i++) { + rt5645->hweq.param[i].reg = + be16_to_cpu(rt5645->hweq.param[i].reg); + rt5645->hweq.param[i].val = + be16_to_cpu(rt5645->hweq.param[i].val); + } + } + release_firmware(fw); + } + + return 0; +} + +static bool rt5645_validate_hweq(unsigned short reg) +{ + if ((reg >= 0x1a4 && reg <= 0x1cd) | (reg >= 0x1e5 && reg <= 0x1f8) | + (reg == RT5645_EQ_CTRL2)) + return true; + + return false; +} + +static int rt5645_enable_hweq(struct snd_soc_codec *codec) +{ + struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec); + int i; + + if (!rt5645->hweq.param) + rt5645_read_hweq_param(codec); + + if (rt5645->hweq.param) { + for (i = 0; i < rt5645->hweq.num; i++) { + if (rt5645_validate_hweq(rt5645->hweq.param[i].reg)) + regmap_write(rt5645->regmap, + rt5645->hweq.param[i].reg, + rt5645->hweq.param[i].val); + } + } + + return 0; +} + /** * rt5645_sel_asrc_clk_src - select ASRC clock source for a set of filters * @codec: SoC audio codec device. @@ -1532,9 +1597,12 @@ static int rt5645_spk_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) { struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); + struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec); switch (event) { case SND_SOC_DAPM_POST_PMU: + if (rt5645->pdata.hweq) + rt5645_enable_hweq(codec); snd_soc_update_bits(codec, RT5645_PWR_DIG1, RT5645_PWR_CLS_D | RT5645_PWR_CLS_D_R | RT5645_PWR_CLS_D_L, @@ -1543,6 +1611,8 @@ static int rt5645_spk_event(struct snd_soc_dapm_widget *w, break; case SND_SOC_DAPM_PRE_PMD: + if (rt5645->pdata.hweq) + snd_soc_write(codec, RT5645_EQ_CTRL2, 0); snd_soc_update_bits(codec, RT5645_PWR_DIG1, RT5645_PWR_CLS_D | RT5645_PWR_CLS_D_R | RT5645_PWR_CLS_D_L, 0); @@ -3205,6 +3275,20 @@ static int strago_quirk_cb(const struct dmi_system_id *id) return 1; } +static struct rt5645_platform_data celes_platform_data = { + .dmic1_data_pin = RT5645_DMIC1_DISABLE, + .dmic2_data_pin = RT5645_DMIC_DATA_IN2P, + .jd_mode = 3, + .hweq = true, +}; + +static int celes_quirk_cb(const struct dmi_system_id *id) +{ + rt5645_pdata = &celes_platform_data; + + return 1; +} + static const struct dmi_system_id dmi_platform_intel_braswell[] = { { .ident = "Intel Strago", @@ -3215,7 +3299,7 @@ static const struct dmi_system_id dmi_platform_intel_braswell[] = { }, { .ident = "Google Celes", - .callback = strago_quirk_cb, + .callback = celes_quirk_cb, .matches = { DMI_MATCH(DMI_PRODUCT_NAME, "Celes"), }, -- 1.8.1.1.439.g50a6b54

2 1

Re: [alsa-devel] [PATCH] ASoC: Intel: Skylake - Add Skylake RT286 I2S machine driver
by Koul, Vinod 12 Oct '15

12 Oct '15

On Sat, 2015-10-10 at 16:42 +0800, kbuild test robot wrote: > Hi Omair, > > [auto build test ERROR on next-20151009 -- if it's inappropriate base, please > ignore] > > config: arm-allmodconfig (attached as .config) > reproduce: That's nice, thanks. We should add a depends on X86 for this to not compile on non X86 code Will send updated patch -- ~Vinod

3 3

[alsa-devel] Applied "ASoc: sh: Fit typo in Kconfig" to the asoc tree
by Mark Brown 12 Oct '15

12 Oct '15

The patch ASoc: sh: Fit typo in Kconfig has been applied to the asoc tree at git://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 d795eb3f5c10d36ed51ca7cd5ce411677f6f7aab Mon Sep 17 00:00:00 2001 From: Masanari Iida <standby24x7(a)gmail.com> Date: Sat, 10 Oct 2015 14:17:58 +0900 Subject: [PATCH] ASoc: sh: Fit typo in Kconfig s/SUR/SRU/g Signed-off-by: Masanari Iida <standby24x7(a)gmail.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/sh/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/sh/Kconfig b/sound/soc/sh/Kconfig index 07114b0..de668b2 100644 --- a/sound/soc/sh/Kconfig +++ b/sound/soc/sh/Kconfig @@ -40,7 +40,7 @@ config SND_SOC_RCAR select SND_SIMPLE_CARD select REGMAP_MMIO help - This option enables R-Car SUR/SCU/SSIU/SSI sound support + This option enables R-Car SRU/SCU/SSIU/SSI sound support config SND_SOC_RSRC_CARD tristate "Renesas Sampling Rate Convert Sound Card" -- 2.5.0

1 0

[alsa-devel] [PATCH] ALSA: usb-audio: Fix max packet size calculation for USB audio
by Ricard Wanderlof 12 Oct '15

12 Oct '15

The addition of 0xffff ("almost 1" in Q16.16 format), resulting in the rounding up of the resulting value, was in the wrong place, as it is the resulting packet size that needs to be rounded up to the nearest integer (e.g. if the resulting packet size is calculated as 55.125 bytes, we need a packet of 56 bytes), rather than the rate value (ep->freqmax). Signed-off-by: Ricard Wanderlof <ricardw(a)axis.com> --- Since this clearly is a sensitive part of the code, here follows a lengthy rationale with examples to illustrate the problem. The code as it stands has the following expression on line 613 to calculate the maximum isochronous packet size: maxsize = ((ep->freqmax + 0xffff) * (frame_bits >> 3)) >> (16 - ep->datainterval); Here, ep->freqmax is the maximum assumed sample frequency, calculated from the nominal sample frequency plus 25%. It is ultimately derived from ep->freqn, which is in the units of samples per packet, from get_usb_full_speed_rate() or usb_high_speed_rate(), as applicable, in Q16.16 format. The expression essentially adds the Q16.16 equivalent of 0.999... (i.e. the largest number less than one) to the sample rate, in order to get a rate whose integer part is rounded up from the fractional value. The multiplication with (frame_bits >> 3) yields the number of bytes in a packet, and the (16 >> ep->datainterval) then converts it from Q16.16 back to an integer, taking into consideration the bDataInterval field of the endpoint descriptor, which describes how often isochronous packets are transmitted relative to the (micro)frame rate (125us or 1ms, for USB high speed and full speed, respectively). For this discussion we will assume a bDataInterval of 0, so the second line of the expression just converts the Q16.16 value to an integer. In order to illustrate the problem, we will set frame_bits 64, which corresponds to a frame size of 8 bytes. The problem here is that the addition of 0xffff is in the wrong place. We don't want the rounding up to take place on the frequency, but on the resulting packet size. Let's take an example. We have a sample rate of 96 kHz, so our ep->freqn is 786432 (see usb_high_speed_rate()). Add 25% (line 612) and we get 983040. The calculated maxsize is then ((983040 + 65535) * 8) >> 16 = 127 . However, if we do the number of bytes calculation in a less obscure way it's more apparent what the true corresponding packet size is: we get (96000 * 1.25 / 8000) * 8 = 120, where 1.25 is the 25% from line 612, and the 8000 is the number of isochronous packets per second on a high speed USB connection (125 us microframe interval). Rephrasing the maxsize expression to: maxsize = (ep->freqmax * (frame_bits >> 3) + 0xffff) >> (16 - ep->datainterval); we instead get (983040 * 8 + 65535) >> 16 = 120 which is the correct value. We can also do the calculation with a non-integer sample rate which is when rounding comes into effect: say we have 44.1 kHz (resulting ep->freqn = 361267, and resulting ep->freqmax 361267 * 1.25 = 451583 (rounded down). Original maxsize = ((451583 + 65535) * 8) << 16 = 63 (63.124.. rounded down) True maxsize = (44100 * 1.25 / 8000) * 8 = 55.125, i.e. 56 bytes required New maxsize = (451583 * 8 + 65535) >> 16 = 56 This is also corroborated by the wMaxPacketSize check on line 616. Assume that wMaxPacketSize = 108, with ep->maxpacksize then having the same value. As 108 < 127, we get maxsize = 108. ep->freqmax is then recalculated to (108 / 8) << 16 = 884736 . Putting that rate into the original maxsize calculation yields a maxsize of ((884736 + 65535) * 8) >> 16 = 115 (with decimals 115.99988). Clearly, we should get back the 108 here, which we would with the new expression: (884736 * 8 + 65535) >> 16 = 108 . As it currently stands, the error is tolerable because it only results in maxsize being a bit too big which wastes a couple of bytes, either as a result of the first maxsize calculation, or because the resulting calculation will hit the wMaxPacketSize value before the packet is too big, resulting in fixing the size to wMaxPacketSize even though the packet is actually not too long. However, I'm working on a quirk for a device which stuffs an extra four (non sample) bytes into each isochronous packet, and that means that the maxsize calculation must take this into account. During this work it became obvious that there was something wrong with the maxsize calculation, as the resulting packet size when wMaxPacketSize was hit did not correspond to the packet size which triggered the if statement to start with. Since this seems to me an obvious (after looking at it for a bit...) bug I'm submitting this as a separate patch rather than part of the upcoming patch series. sound/usb/endpoint.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c index e6f7189..be8a972 100644 --- a/sound/usb/endpoint.c +++ b/sound/usb/endpoint.c @@ -610,7 +610,7 @@ static int data_ep_set_params(struct snd_usb_endpoint *ep, /* assume max. frequency is 25% higher than nominal */ ep->freqmax = ep->freqn + (ep->freqn >> 2); - maxsize = ((ep->freqmax + 0xffff) * (frame_bits >> 3)) + maxsize = (ep->freqmax * (frame_bits >> 3) + 0xffff) >> (16 - ep->datainterval); /* but wMaxPacketSize might reduce this */ if (ep->maxpacksize && ep->maxpacksize < maxsize) { -- 1.7.10.4 -- Ricard Wolf Wanderlöf ricardw(at)axis.com Axis Communications AB, Lund, Sweden www.axis.com Phone +46 46 272 2016 Fax +46 46 13 61 30

2 2

[alsa-devel] [PATCH alsa-lib] fix _GNU_SOURCE handling & header inclusion
by Mike Frysinger 12 Oct '15

12 Oct '15

From: Mike Frysinger <vapier(a)chromium.org> The configure script blindly adds -D_GNU_SOURCE to all build settings, even on non-GNU systems. This isn't too much of a big deal (even if it uses the wrong variable -- CFLAGS instead of CPPFLAGS), except that the alsa-lib source itself determines whether to use GNU features when this is defined (such as versionsort). So when we build on non-glibc systems, we get build failures like: src/ucm/parser.c:1268:18: error: 'versionsort' undeclared (first use in this function) #define SORTFUNC versionsort ^ src/ucm/parser.c:1272:54: note: in expansion of macro 'SORTFUNC' err = scandir(filename, &namelist, filename_filter, SORTFUNC); ^ The correct way to add these flags is to use the autoconf helper AC_USE_SYSTEM_EXTENSIONS. Unfortunately, that triggers some more bugs in the alsa build. This macro adds defines to config.h and not directly to CPPFLAGS, so it relies on files correctly including config.h before anything else. A number of alsa files do not do this leading to build failures. The fix there is to shuffle the includes around so that the local ones come first. Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- configure.ac | 4 +--- src/conf.c | 2 +- src/timer/timer.c | 9 ++------- src/timer/timer_hw.c | 6 ------ src/timer/timer_local.h | 5 ++--- src/timer/timer_query.c | 6 ------ src/timer/timer_query_hw.c | 6 ------ src/ucm/ucm_local.h | 2 +- 8 files changed, 7 insertions(+), 33 deletions(-) diff --git a/configure.ac b/configure.ac index a14e52d..9cb8614 100644 --- a/configure.ac +++ b/configure.ac @@ -27,11 +27,9 @@ AC_PREFIX_DEFAULT(/usr) dnl Checks for programs. -CFLAGS="$CFLAGS -D_GNU_SOURCE" - - AC_PROG_CC AC_PROG_CPP +AC_USE_SYSTEM_EXTENSIONS AC_PROG_INSTALL AC_PROG_LN_S AC_DISABLE_STATIC diff --git a/src/conf.c b/src/conf.c index c6a83ee..91fca25 100644 --- a/src/conf.c +++ b/src/conf.c @@ -414,12 +414,12 @@ beginning:</P> */ +#include "local.h" #include <stdarg.h> #include <limits.h> #include <sys/stat.h> #include <dirent.h> #include <locale.h> -#include "local.h" #ifdef HAVE_LIBPTHREAD #include <pthread.h> #endif diff --git a/src/timer/timer.c b/src/timer/timer.c index b71a9f8..a25e4f7 100644 --- a/src/timer/timer.c +++ b/src/timer/timer.c @@ -67,15 +67,10 @@ This example shows opening a timer device and reading of timer events. * \anchor example_test_timer */ -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <string.h> -#include <fcntl.h> -#include <signal.h> -#include <sys/ioctl.h> #include "timer_local.h" +#include <signal.h> + static int snd_timer_open_conf(snd_timer_t **timer, const char *name, snd_config_t *timer_root, snd_config_t *timer_conf, int mode) diff --git a/src/timer/timer_hw.c b/src/timer/timer_hw.c index e833fc8..e61b994 100644 --- a/src/timer/timer_hw.c +++ b/src/timer/timer_hw.c @@ -19,12 +19,6 @@ * */ -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <string.h> -#include <fcntl.h> -#include <sys/ioctl.h> #include "timer_local.h" #ifndef PIC diff --git a/src/timer/timer_local.h b/src/timer/timer_local.h index 8040b05..eef3b06 100644 --- a/src/timer/timer_local.h +++ b/src/timer/timer_local.h @@ -19,10 +19,9 @@ * */ -#include <stdio.h> -#include <stdlib.h> -#include <limits.h> #include "local.h" +#include <limits.h> +#include <sys/ioctl.h> #ifndef DOC_HIDDEN typedef struct { diff --git a/src/timer/timer_query.c b/src/timer/timer_query.c index 50b098a..93d2455 100644 --- a/src/timer/timer_query.c +++ b/src/timer/timer_query.c @@ -26,12 +26,6 @@ * */ -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <string.h> -#include <fcntl.h> -#include <sys/ioctl.h> #include "timer_local.h" static int snd_timer_query_open_conf(snd_timer_query_t **timer, diff --git a/src/timer/timer_query_hw.c b/src/timer/timer_query_hw.c index 289ca52..d0c4391 100644 --- a/src/timer/timer_query_hw.c +++ b/src/timer/timer_query_hw.c @@ -19,12 +19,6 @@ * */ -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <string.h> -#include <fcntl.h> -#include <sys/ioctl.h> #include "timer_local.h" #ifndef PIC diff --git a/src/ucm/ucm_local.h b/src/ucm/ucm_local.h index c1655c7..3a5d2c2 100644 --- a/src/ucm/ucm_local.h +++ b/src/ucm/ucm_local.h @@ -36,8 +36,8 @@ #define UC_MGR_DEBUG #endif -#include <pthread.h> #include "local.h" +#include <pthread.h> #include "use-case.h" #define MAX_FILE 256 -- 2.5.2

2 1

[alsa-devel] [RFC] i2c: Revert back to old device naming for ACPI enumerated I2C slaves
by Jarkko Nikula 12 Oct '15

12 Oct '15

Commit 70762abb9f89 ("i2c: Use stable dev_name for ACPI enumerated I2C slaves") broke the lm-sensors which relies on I2C hwmon slave devices under /sys/bus/i2c/devices/ to be named as "x-00yz". However if those hwmon devices are ACPI 5 enumerated their name became "i2c-INTABCD:ij" and sysfs code in lm-sensors does not find them anymore: lib/sysfs.c:665: if ((!subsys || !strcmp(subsys, "i2c")) && sscanf(dev_name, "%hd-%x", &entry.chip.bus.nr, &entry.chip.addr) == 2) { This patch fixes this by reverting back the old device naming in i2c-core but at the same avoids regression to ALSA SoC drivers that depend on stable device binding. Reverted I2C slave device naming is handled in ALSA SoC core by using the ACPI name as a component name if device is ACPI probed. This keeps the component binding in ALSA SoC stable and requires only minimal changes to affected machine drivers. Fixes: 70762abb9f89 i2c: Use stable dev_name for ACPI enumerated I2C slaves Reported-by: Dustin Byford <dustin(a)cumulusnetworks.com> Signed-off-by: Jarkko Nikula <jarkko.nikula(a)linux.intel.com> --- This is on top of 4.2.0-rc8. I didn't check exact kernel versions where this still applies but I know we would need a few different versions for older stable versions. Mainly because of added and moved drivers in sound/soc/intel/. This is for discussion so I didn't cc stable(a)vger.kernel.org yet. I was thinking would it work if we'd keep the stable name but have an another symlink in /sys/bus/i2c/devices/ that uses "x-00yz" name. However this feels ill-use of devices directory and probably causes more troubles elsewhere. I don't know how common ACPI enumerated I2C hwmon devices are but I guess they exists since Dustin notices this issue and wrote "With that change, /sys/bus/i2c/devices/i2c-0-004a, for example, became /sys/bus/i2c/devices/i2c-PNPXXXX:xx". It could be possible there is use for the new device naming. I found a comment from Documentation/hid/hid-sensor.txt introduced by commit b2eafd7282fd ("HID: sensor: Update document for custom sensor") that seems to indicate current i2c-INTABCD:xy naming may be used from userspace too but I didn't find examples of that. --- drivers/i2c/i2c-core.c | 21 ++++----------------- sound/soc/intel/boards/broadwell.c | 6 +++--- sound/soc/intel/boards/byt-max98090.c | 2 +- sound/soc/intel/boards/byt-rt5640.c | 2 +- sound/soc/intel/boards/bytcr_rt5640.c | 2 +- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 4 ++-- sound/soc/intel/boards/cht_bsw_rt5645.c | 4 ++-- sound/soc/intel/boards/cht_bsw_rt5672.c | 6 +++--- sound/soc/intel/boards/haswell.c | 2 +- sound/soc/soc-core.c | 10 ++++++++++ 10 files changed, 28 insertions(+), 31 deletions(-) diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index c83e4d13cfc5..e9c227b9dc92 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -913,22 +913,6 @@ void i2c_unlock_adapter(struct i2c_adapter *adapter) } EXPORT_SYMBOL_GPL(i2c_unlock_adapter); -static void i2c_dev_set_name(struct i2c_adapter *adap, - struct i2c_client *client) -{ - struct acpi_device *adev = ACPI_COMPANION(&client->dev); - - if (adev) { - dev_set_name(&client->dev, "i2c-%s", acpi_dev_name(adev)); - return; - } - - /* For 10-bit clients, add an arbitrary offset to avoid collisions */ - dev_set_name(&client->dev, "%d-%04x", i2c_adapter_id(adap), - client->addr | ((client->flags & I2C_CLIENT_TEN) - ? 0xa000 : 0)); -} - /** * i2c_new_device - instantiate an i2c device * @adap: the adapter managing the device @@ -987,7 +971,10 @@ i2c_new_device(struct i2c_adapter *adap, struct i2c_board_info const *info) client->dev.of_node = info->of_node; client->dev.fwnode = info->fwnode; - i2c_dev_set_name(adap, client); + /* For 10-bit clients, add an arbitrary offset to avoid collisions */ + dev_set_name(&client->dev, "%d-%04x", i2c_adapter_id(adap), + client->addr | ((client->flags & I2C_CLIENT_TEN) + ? 0xa000 : 0)); status = device_register(&client->dev); if (status) goto out_err; diff --git a/sound/soc/intel/boards/broadwell.c b/sound/soc/intel/boards/broadwell.c index 8bafaf6ceab1..3abcf0d7682e 100644 --- a/sound/soc/intel/boards/broadwell.c +++ b/sound/soc/intel/boards/broadwell.c @@ -205,7 +205,7 @@ static struct snd_soc_dai_link broadwell_rt286_dais[] = { .cpu_dai_name = "snd-soc-dummy-dai", .platform_name = "snd-soc-dummy", .no_pcm = 1, - .codec_name = "i2c-INT343A:00", + .codec_name = "INT343A:00", .codec_dai_name = "rt286-aif1", .init = broadwell_rt286_codec_init, .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | @@ -223,7 +223,7 @@ static int broadwell_suspend(struct snd_soc_card *card){ struct snd_soc_codec *codec; list_for_each_entry(codec, &card->codec_dev_list, card_list) { - if (!strcmp(codec->component.name, "i2c-INT343A:00")) { + if (!strcmp(codec->component.name, "INT343A:00")) { dev_dbg(codec->dev, "disabling jack detect before going to suspend.\n"); rt286_mic_detect(codec, NULL); break; @@ -236,7 +236,7 @@ static int broadwell_resume(struct snd_soc_card *card){ struct snd_soc_codec *codec; list_for_each_entry(codec, &card->codec_dev_list, card_list) { - if (!strcmp(codec->component.name, "i2c-INT343A:00")) { + if (!strcmp(codec->component.name, "INT343A:00")) { dev_dbg(codec->dev, "enabling jack detect for resume.\n"); rt286_mic_detect(codec, &broadwell_headset); break; diff --git a/sound/soc/intel/boards/byt-max98090.c b/sound/soc/intel/boards/byt-max98090.c index 7ab8cc9fbfd5..ae336b8522a8 100644 --- a/sound/soc/intel/boards/byt-max98090.c +++ b/sound/soc/intel/boards/byt-max98090.c @@ -116,7 +116,7 @@ static struct snd_soc_dai_link byt_max98090_dais[] = { .stream_name = "Audio", .cpu_dai_name = "baytrail-pcm-audio", .codec_dai_name = "HiFi", - .codec_name = "i2c-193C9890:00", + .codec_name = "193C9890:00", .platform_name = "baytrail-pcm-audio", .init = byt_max98090_init, .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | diff --git a/sound/soc/intel/boards/byt-rt5640.c b/sound/soc/intel/boards/byt-rt5640.c index ae89b9b966d9..275b056c495c 100644 --- a/sound/soc/intel/boards/byt-rt5640.c +++ b/sound/soc/intel/boards/byt-rt5640.c @@ -186,7 +186,7 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = { .stream_name = "Audio", .cpu_dai_name = "baytrail-pcm-audio", .codec_dai_name = "rt5640-aif1", - .codec_name = "i2c-10EC5640:00", + .codec_name = "10EC5640:00", .platform_name = "baytrail-pcm-audio", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c index 7f55d59024a8..973f07548b08 100644 --- a/sound/soc/intel/boards/bytcr_rt5640.c +++ b/sound/soc/intel/boards/bytcr_rt5640.c @@ -171,7 +171,7 @@ static struct snd_soc_dai_link byt_dailink[] = { .platform_name = "sst-mfld-platform", .no_pcm = 1, .codec_dai_name = "rt5640-aif1", - .codec_name = "i2c-10EC5640:00", + .codec_name = "10EC5640:00", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, .be_hw_params_fixup = byt_codec_fixup, diff --git a/sound/soc/intel/boards/cht_bsw_max98090_ti.c b/sound/soc/intel/boards/cht_bsw_max98090_ti.c index 70f832114a5a..1a5348771e03 100644 --- a/sound/soc/intel/boards/cht_bsw_max98090_ti.c +++ b/sound/soc/intel/boards/cht_bsw_max98090_ti.c @@ -232,7 +232,7 @@ static struct snd_soc_ops cht_be_ssp2_ops = { static struct snd_soc_aux_dev cht_max98090_headset_dev = { .name = "Headset Chip", .init = cht_max98090_headset_init, - .codec_name = "i2c-104C227E:00", + .codec_name = "104C227E:00", }; static struct snd_soc_dai_link cht_dailink[] = { @@ -265,7 +265,7 @@ static struct snd_soc_dai_link cht_dailink[] = { .platform_name = "sst-mfld-platform", .no_pcm = 1, .codec_dai_name = "HiFi", - .codec_name = "i2c-193C9890:00", + .codec_name = "193C9890:00", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, .init = cht_codec_init, diff --git a/sound/soc/intel/boards/cht_bsw_rt5645.c b/sound/soc/intel/boards/cht_bsw_rt5645.c index bdcaf467842a..c05841264dc7 100644 --- a/sound/soc/intel/boards/cht_bsw_rt5645.c +++ b/sound/soc/intel/boards/cht_bsw_rt5645.c @@ -290,7 +290,7 @@ static struct snd_soc_dai_link cht_dailink[] = { .platform_name = "sst-mfld-platform", .no_pcm = 1, .codec_dai_name = "rt5645-aif1", - .codec_name = "i2c-10EC5645:00", + .codec_name = "10EC5645:00", .dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_IB_NF | SND_SOC_DAIFMT_CBS_CFS, .init = cht_codec_init, @@ -365,7 +365,7 @@ static int snd_cht_mc_probe(struct platform_device *pdev) } } card->dev = &pdev->dev; - sprintf(codec_name, "i2c-%s:00", drv->acpi_card->codec_id); + sprintf(codec_name, "%s:00", drv->acpi_card->codec_id); /* set correct codec name */ strcpy((char *)card->dai_link[2].codec_name, codec_name); snd_soc_card_set_drvdata(card, drv); diff --git a/sound/soc/intel/boards/cht_bsw_rt5672.c b/sound/soc/intel/boards/cht_bsw_rt5672.c index 2c9cc5be439e..632926d0c595 100644 --- a/sound/soc/intel/boards/cht_bsw_rt5672.c +++ b/sound/soc/intel/boards/cht_bsw_rt5672.c @@ -280,7 +280,7 @@ static struct snd_soc_dai_link cht_dailink[] = { .no_pcm = 1, .nonatomic = true, .codec_dai_name = "rt5670-aif1", - .codec_name = "i2c-10EC5670:00", + .codec_name = "10EC5670:00", .dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_IB_NF | SND_SOC_DAIFMT_CBS_CFS, .init = cht_codec_init, @@ -296,7 +296,7 @@ static int cht_suspend_pre(struct snd_soc_card *card) struct snd_soc_codec *codec; list_for_each_entry(codec, &card->codec_dev_list, card_list) { - if (!strcmp(codec->component.name, "i2c-10EC5670:00")) { + if (!strcmp(codec->component.name, "10EC5670:00")) { dev_dbg(codec->dev, "disabling jack detect before going to suspend.\n"); rt5670_jack_suspend(codec); break; @@ -310,7 +310,7 @@ static int cht_resume_post(struct snd_soc_card *card) struct snd_soc_codec *codec; list_for_each_entry(codec, &card->codec_dev_list, card_list) { - if (!strcmp(codec->component.name, "i2c-10EC5670:00")) { + if (!strcmp(codec->component.name, "10EC5670:00")) { dev_dbg(codec->dev, "enabling jack detect for resume.\n"); rt5670_jack_resume(codec); break; diff --git a/sound/soc/intel/boards/haswell.c b/sound/soc/intel/boards/haswell.c index 22558572cb9c..6fd6491e368d 100644 --- a/sound/soc/intel/boards/haswell.c +++ b/sound/soc/intel/boards/haswell.c @@ -160,7 +160,7 @@ static struct snd_soc_dai_link haswell_rt5640_dais[] = { .cpu_dai_name = "snd-soc-dummy-dai", .platform_name = "snd-soc-dummy", .no_pcm = 1, - .codec_name = "i2c-INT33CA:00", + .codec_name = "INT33CA:00", .codec_dai_name = "rt5640-aif1", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 0e1e69c7abd5..811d63e31a7a 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -34,6 +34,7 @@ #include <linux/ctype.h> #include <linux/slab.h> #include <linux/of.h> +#include <linux/acpi.h> #include <sound/core.h> #include <sound/jack.h> #include <sound/pcm.h> @@ -2476,10 +2477,18 @@ static char *fmt_single_name(struct device *dev, int *id) { char *found, name[NAME_SIZE]; int id1, id2; + struct acpi_device *adev; if (dev_name(dev) == NULL) return NULL; + if (ACPI_HANDLE(dev) && + !acpi_bus_get_device(ACPI_HANDLE(dev), &adev)) { + /* use ACPI name as a component name for ACPI probed devices */ + strlcpy(name, acpi_dev_name(adev), NAME_SIZE); + goto out; + } + strlcpy(name, dev_name(dev), NAME_SIZE); /* are we a "%s.%d" name (platform and SPI components) */ @@ -2508,6 +2517,7 @@ static char *fmt_single_name(struct device *dev, int *id) *id = 0; } +out: return kstrdup(name, GFP_KERNEL); } -- 2.5.0

6 16

[alsa-devel] [PATCH 0/6 v3] ALSA: firewire-digi00x: support MIDI functionality
by Takashi Sakamoto 12 Oct '15

12 Oct '15

Hi, This commit updates my former post (patch 13, 15, 16): [alsa-devel] [PATCH 00/25 v2] ALSA: support AMDTP variants http://mailman.alsa-project.org/pipermail/alsa-devel/2015-August/096739.html Digi 00x driver may be newly available in Linux 4.4. This patchset adds ALSA MIDI ports to support physical MIDI ports and physical controls. I tested physical MIDI ports, while never tested physical controls because I'm not an owner of 'console' models. The functionality for physical controls is written according to my assumption. When I investigated Digi 002 rack, Windows driver registers a certain address to the device, and adds virtual MIDI ports to the system. These ports are named as 'control'. When MIDI application sends MIDI messages to the port, asynchronous transactions start on IEEE 1394 bus. On the other hand, I have no way to confirm asynchronous transaction in opposite direction because the rack model doesn't have the functionality. In this time, I apply the same format of outgoing asynchronous transaction to incoming asynchronous transaction. Takashi Sakamoto (6): firewire-digi00x: use in-kernel representation for the type of 8 bits firewire-digi00x: handle MIDI messages in isochronous packets firewire-digi00x: add support for MIDI ports corresponding to isochronous packet streaming firewire-digi00x: add support of asynchronous transaction for incoming MIDI messages from physical controls firewire-digi00x: add support of asynchronous transaction for outgoing MIDI messages to physical controls firewire-digi00x: add support for MIDI ports for physical controls sound/firewire/digi00x/Makefile | 2 +- sound/firewire/digi00x/amdtp-dot.c | 150 +++++++++++++++++++++---- sound/firewire/digi00x/digi00x-midi.c | 160 +++++++++++++++++++++++++++ sound/firewire/digi00x/digi00x-stream.c | 6 +- sound/firewire/digi00x/digi00x-transaction.c | 70 ++++++++++-- sound/firewire/digi00x/digi00x.c | 4 + sound/firewire/digi00x/digi00x.h | 15 ++- 7 files changed, 376 insertions(+), 31 deletions(-) create mode 100644 sound/firewire/digi00x/digi00x-midi.c -- 2.1.4

2 8

[alsa-devel] [RESEND PATCH 1/1] Allow any MIDI endpoint to drive use of interrupt transfer on newer Roland devices
by maillist＠superlative.org 11 Oct '15

11 Oct '15

From: "Keith A. Milner" <maillist(a)superlative.org> This patch enables interrupt transfer mode for MIDI ports on newer Boss/Roland devices such as the GT-100/001 which support interrupt transfer on both IN and OUT MIDI endpoints. Previously this wasn't being enabled for these devices as the code was specifically looking for the scenario where the IN endpoint supported interrupt transfer and the OUT endpoint was bulk transfer. Newer devices support interrupt transfer for both endpoints. This has been tested on Boss devices GT-001, BR-80 and JS-8 and Roland VS-20. It would benefit from some regresison testing with other devices if possible. Signed-off-by: Keith A. Milner <maillist(a)superlative.org> diff --git a/sound/usb/midi.c b/sound/usb/midi.c index b901f46..d50c649 100644 --- a/sound/usb/midi.c +++ b/sound/usb/midi.c @@ -1860,9 +1860,14 @@ static void snd_usbmidi_switch_roland_altsetting(struct snd_usb_midi* umidi) hostif = &intf->altsetting[1]; intfd = get_iface_desc(hostif); + /* If either or both of the endpoints support interrupt transfer, + * then use the alternate setting + */ if (intfd->bNumEndpoints != 2 || - (get_endpoint(hostif, 0)->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) != USB_ENDPOINT_XFER_BULK || - (get_endpoint(hostif, 1)->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) != USB_ENDPOINT_XFER_INT) + !((get_endpoint(hostif, 0)->bmAttributes + & USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_INT || + (get_endpoint(hostif, 1)->bmAttributes + & USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_INT)) return; snd_printdd(KERN_INFO "switching to altsetting %d with int ep\n", -- 1.9.1

3 5

[alsa-devel] [PATCH v3] ALSA: usb-audio: Fix max packet size calculation for USB audio
by Ricard Wanderlof 11 Oct '15

11 Oct '15

Rounding must take place before multiplication with the frame size, since each packet contains a whole number of frames. We must also properly consider the data interval, as a larger data interval will result in larger packets, which, depending on the sampling frequency, can result in packet sizes that are less than integral multiples of the packet size for a lower data interval. Tested with an Edirol UA-5 both at 44.1 kHz and 96 kHz. Signed-off-by: Ricard Wanderlof <ricardw(a)axis.com> --- V2: Added tested device to commit message. No other changes. V3: Updated after input from Clemens. Since the expression is now getting rather convoluted, added a description in the comments in the code. New commit message to reflect the new version. Updated rationale below. The code as it stands has the following expression on line 613 to calculate the maximum isochronous packet size: maxsize = ((ep->freqmax + 0xffff) * (frame_bits >> 3)) >> (16 - ep->datainterval); Here, ep->freqmax is the maximum assumed sample frequency, calculated from the nominal sample frequency plus 25%. It is ultimately derived from ep->freqn, which is in the units of frames per packet, from get_usb_full_speed_rate() or usb_high_speed_rate(), as applicable, in Q16.16 format. The expression essentially adds the Q16.16 equivalent of 0.999... (i.e. the largest number less than one) to the sample rate, in order to get a rate whose integer part is rounded up from the fractional value. The multiplication with (frame_bits >> 3) yields the number of bytes in a packet, and the (16 >> ep->datainterval) then converts it from Q16.16 back to an integer, taking into consideration the bDataInterval field of the endpoint descriptor (which describes how often isochronous packets are transmitted relative to the (micro)frame rate (125us or 1ms, for USB high speed and full speed, respectively)). For this discussion we will initially assume a bDataInterval of 0, so the second line of the expression just converts the Q16.16 value to an integer. In order to illustrate the problem, we will set frame_bits 64, which corresponds to a frame size of 8 bytes. The problem here is twofold. First, the rounding operation consists of the addition of 0x0.ffff and subsequent conversion to integer, but as the expression stands, the conversion to integer is done after multiplication with the frame size, rather than before. This results in the resulting maxsize becoming too large. Let's take an example. We have a sample rate of 96 kHz, so our ep->freqn is 0xc0000 (see usb_high_speed_rate()). Add 25% (line 612) and we get 0xf0000. The calculated maxsize is then ((0xf0000 + 0x0ffff) * 8) >> 16 = 127 . However, if we do the number of bytes calculation in a less obscure way it's more apparent what the true corresponding packet size is: we get ceil(96000 * 1.25 / 8000) * 8 = 120, where 1.25 is the 25% from line 612, and the 8000 is the number of isochronous packets per second on a high speed USB connection (125 us microframe interval). This is fixed by performing the complete rounding operation prior to multiplication with the frame rate. The second problem is that when considering the ep->datainterval, this must be done before rounding, in order to take the advantage of the fact that the number of bytes per packet is not an integer, the resulting rounded-up integer is not necessarily a factor of two when the data interval is increased by the same factor. For instance, assuming a freqency of 41 kHz, the resulting bytes-per-packet value for USB high speed is 41 kHz / 8000 = 5.125, or 0x52000 in Q16.16 format. With a data interval of 1 (ep->datainterval = 0), this 6 frames per packet is required, whereas with a data interval of 2 we need 10.25, i.e. 11 frames needed. Rephrasing the maxsize expression to: maxsize = (((ep->freqmax << ep->datainterval) + 0xffff) >> 16) * (frame_bits >> 3); for the above 96 kHz example we instead get ((0xf0000 + 0xffff) >> 16) * 8 = 120 which is the correct value. We can also do the calculation with a non-integer sample rate which is when rounding comes into effect: say we have 44.1 kHz (resulting ep->freqn = 0x58333, and resulting ep->freqmax 0x58333 * 1.25 = 0x6e3ff (rounded down)): Original maxsize = ((0x6e3ff + 0xffff) * 8) << 16 = 63 (63.124.. rounded down) True maxsize = ceil(44100 * 1.25 / 8000) * 8 = 7 * 8 = 56 New maxsize = ((0x6e3ff + 0xffff) >> 16) * 8 = 7 * 8 = 56 This is also corroborated by the wMaxPacketSize check on line 616. Assume that wMaxPacketSize = 104, with ep->maxpacksize then having the same value. As 104 < 127, we get maxsize = 104. ep->freqmax is then recalculated to (104 / 8) << 16 = 0xd0000 . Putting that rate into the original maxsize calculation yields a maxsize of ((0xd0000 + 0xffff) * 8) >> 16 = 111 (with decimals 111.99988). Clearly, we should get back the 104 here, which we would with the new expression: ((0xd0000 + 0xffff) >> 16) * 8 = 104 . As it currently stands, the error is tolerable because it only results in maxsize being a bit too big which wastes a couple of bytes, either as a result of the first maxsize calculation, or because the resulting calculation will hit the wMaxPacketSize value before the packet is too big, resulting in fixing the size to wMaxPacketSize even though the packet is actually not too long. However, I'm working on a quirk for a device which stuffs an extra four (non sample) bytes into each isochronous packet, and that means that the maxsize calculation must take this into account. During this work it became obvious that there was something wrong with the maxsize calculation, as the resulting packet size when wMaxPacketSize was hit did not correspond to the packet size which triggered the if statement to start with. Since this seems to me an obvious (after looking at it for a bit...) bug I'm submitting this as a separate patch rather than part of an upcoming patch series. sound/usb/endpoint.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c index e6f7189..a77d9c8 100644 --- a/sound/usb/endpoint.c +++ b/sound/usb/endpoint.c @@ -610,8 +610,23 @@ static int data_ep_set_params(struct snd_usb_endpoint *ep, /* assume max. frequency is 25% higher than nominal */ ep->freqmax = ep->freqn + (ep->freqn >> 2); - maxsize = ((ep->freqmax + 0xffff) * (frame_bits >> 3)) - >> (16 - ep->datainterval); + /* Round up freqmax to nearest integer in order to calculate maximum + * packet size, which must represent a whole number of frames. + * This is accomplished by adding 0x0.ffff before converting the + * Q16.16 format into integer. + * In order to accurately calculate the maximum packet size when + * the data interval is more than 1 (i.e. ep->datainterval > 0), + * multiply by the data interval prior to rounding. For instance, + * a freqmax of 41 kHz will result in a max packet size of 6 (5.125) + * frames with a data interval of 1, but 11 (10.25) frames with a + * data interval of 2. + * (ep->freqmax << ep->datainterval overflows at 8.192 MHz for the + * maximum datainterval value of 3, at USB full speed, higher for + * USB high speed, noting that ep->freqmax is in units of + * frames per packet in Q16.16 format.) + */ + maxsize = (((ep->freqmax << ep->datainterval) + 0xffff) >> 16) * + (frame_bits >> 3); /* but wMaxPacketSize might reduce this */ if (ep->maxpacksize && ep->maxpacksize < maxsize) { /* whatever fits into a max. size packet */ -- 1.7.10.4 -- Ricard Wolf Wanderlöf ricardw(at)axis.com Axis Communications AB, Lund, Sweden www.axis.com Phone +46 46 272 2016 Fax +46 46 13 61 30

2 3

[alsa-devel] [PATCH] ALSA: firewire-lib: continue packet processing at detecting wrong CIP headers
by Takashi Sakamoto 11 Oct '15

11 Oct '15

In firewire-lib, isochronous packet streaming is stopped when detecting wrong value for FMT field of CIP headers. Although this is appropriate to IEC 61883-1 and 6, some BeBoB based devices with vendors' customization use invalid value to FMT field of CIP headers in the beginning of streaming. $ journalctl snd-bebob fw1.0: Detect unexpected protocol: 01000000 8000ffff I got this log with M-Audio FireWire 1814. In this line, the value of FMT field is 0x00, while it should be 0x10 in usual AMDTP. Except for the beginning, these devices continue to transfer packets with valid value for FMT field, except for the beginning. Therefore, in this case, firewire-lib should continue to process packets. The former implementation of firewire-lib performs it. This commit loosens the handling of wrong value, to continue packet processing in the case. Fixes: 414ba022a528('ALSA: firewire-lib: add support arbitrary value for fmt/fdf fields in CIP header') Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- sound/firewire/amdtp-stream.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sound/firewire/amdtp-stream.c b/sound/firewire/amdtp-stream.c index fa10b58..ed29026 100644 --- a/sound/firewire/amdtp-stream.c +++ b/sound/firewire/amdtp-stream.c @@ -468,10 +468,12 @@ static int handle_in_packet(struct amdtp_stream *s, /* Check valid protocol or not. */ fmt = (cip_header[1] & CIP_FMT_MASK) >> CIP_FMT_SHIFT; if (fmt != s->fmt) { - dev_err(&s->unit->device, - "Detect unexpected protocol: %08x %08x\n", - cip_header[0], cip_header[1]); - return -EIO; + dev_info_ratelimited(&s->unit->device, + "Detect unexpected protocol: %08x %08x\n", + cip_header[0], cip_header[1]); + *data_blocks = 0; + pcm_frames = 0; + goto end; } /* Calculate data blocks */ -- 2.1.4

2 1

[alsa-devel] [PATCH] ALSA: bebob: constify snd_bebob_rate_spec structures
by Julia Lawall 11 Oct '15

11 Oct '15

The snd_bebob_rate_spec structure type contains only function pointers. In all instances of this structure type, the functions are provided statically and are never changed subsequently. Add a const annotation on all initializations and uses. Done with the help of Coccinelle. Signed-off-by: Julia Lawall <Julia.Lawall(a)lip6.fr> --- sound/firewire/bebob/bebob.c | 2 +- sound/firewire/bebob/bebob.h | 2 +- sound/firewire/bebob/bebob_focusrite.c | 4 ++-- sound/firewire/bebob/bebob_maudio.c | 4 ++-- sound/firewire/bebob/bebob_pcm.c | 2 +- sound/firewire/bebob/bebob_proc.c | 2 +- sound/firewire/bebob/bebob_stream.c | 2 +- sound/firewire/bebob/bebob_terratec.c | 2 +- sound/firewire/bebob/bebob_yamaha.c | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sound/firewire/bebob/bebob_yamaha.c b/sound/firewire/bebob/bebob_yamaha.c index 5810170..2a9ffdb 100644 --- a/sound/firewire/bebob/bebob_yamaha.c +++ b/sound/firewire/bebob/bebob_yamaha.c @@ -51,7 +51,7 @@ static struct snd_bebob_clock_spec clock_spec = { .types = clk_src_types, .get = &clk_src_get, }; -static struct snd_bebob_rate_spec rate_spec = { +static const struct snd_bebob_rate_spec rate_spec = { .get = &snd_bebob_stream_get_rate, .set = &snd_bebob_stream_set_rate, }; diff --git a/sound/firewire/bebob/bebob_focusrite.c b/sound/firewire/bebob/bebob_focusrite.c index a1a3949..e62923e 100644 --- a/sound/firewire/bebob/bebob_focusrite.c +++ b/sound/firewire/bebob/bebob_focusrite.c @@ -260,7 +260,7 @@ saffire_meter_get(struct snd_bebob *bebob, u32 *buf, unsigned int size) return err; } -static struct snd_bebob_rate_spec saffirepro_both_rate_spec = { +static const struct snd_bebob_rate_spec saffirepro_both_rate_spec = { .get = &saffirepro_both_clk_freq_get, .set = &saffirepro_both_clk_freq_set, }; @@ -287,7 +287,7 @@ struct snd_bebob_spec saffirepro_10_spec = { .meter = NULL }; -static struct snd_bebob_rate_spec saffire_both_rate_spec = { +static const struct snd_bebob_rate_spec saffire_both_rate_spec = { .get = &snd_bebob_stream_get_rate, .set = &snd_bebob_stream_set_rate, }; diff --git a/sound/firewire/bebob/bebob.c b/sound/firewire/bebob/bebob.c index 0ed5e5f..091290d 100644 --- a/sound/firewire/bebob/bebob.c +++ b/sound/firewire/bebob/bebob.c @@ -335,7 +335,7 @@ static void bebob_remove(struct fw_unit *unit) snd_card_free_when_closed(bebob->card); } -static struct snd_bebob_rate_spec normal_rate_spec = { +static const struct snd_bebob_rate_spec normal_rate_spec = { .get = &snd_bebob_stream_get_rate, .set = &snd_bebob_stream_set_rate }; diff --git a/sound/firewire/bebob/bebob.h b/sound/firewire/bebob/bebob.h index d3c9d8d..aff9da3 100644 --- a/sound/firewire/bebob/bebob.h +++ b/sound/firewire/bebob/bebob.h @@ -71,7 +71,7 @@ struct snd_bebob_meter_spec { }; struct snd_bebob_spec { struct snd_bebob_clock_spec *clock; - struct snd_bebob_rate_spec *rate; + const struct snd_bebob_rate_spec *rate; struct snd_bebob_meter_spec *meter; }; diff --git a/sound/firewire/bebob/bebob_terratec.c b/sound/firewire/bebob/bebob_terratec.c index 9242e33..470d526 100644 --- a/sound/firewire/bebob/bebob_terratec.c +++ b/sound/firewire/bebob/bebob_terratec.c @@ -55,7 +55,7 @@ phase24_series_clk_src_get(struct snd_bebob *bebob, unsigned int *id) return 0; } -static struct snd_bebob_rate_spec phase_series_rate_spec = { +static const struct snd_bebob_rate_spec phase_series_rate_spec = { .get = &snd_bebob_stream_get_rate, .set = &snd_bebob_stream_set_rate, }; diff --git a/sound/firewire/bebob/bebob_pcm.c b/sound/firewire/bebob/bebob_pcm.c index 2fdc1f1..ef224d6 100644 --- a/sound/firewire/bebob/bebob_pcm.c +++ b/sound/firewire/bebob/bebob_pcm.c @@ -155,7 +155,7 @@ static int pcm_open(struct snd_pcm_substream *substream) { struct snd_bebob *bebob = substream->private_data; - struct snd_bebob_rate_spec *spec = bebob->spec->rate; + const struct snd_bebob_rate_spec *spec = bebob->spec->rate; unsigned int sampling_rate; enum snd_bebob_clock_type src; int err; diff --git a/sound/firewire/bebob/bebob_stream.c b/sound/firewire/bebob/bebob_stream.c index a2baa47..fc7a66d 100644 --- a/sound/firewire/bebob/bebob_stream.c +++ b/sound/firewire/bebob/bebob_stream.c @@ -580,7 +580,7 @@ end: int snd_bebob_stream_start_duplex(struct snd_bebob *bebob, unsigned int rate) { - struct snd_bebob_rate_spec *rate_spec = bebob->spec->rate; + const struct snd_bebob_rate_spec *rate_spec = bebob->spec->rate; struct amdtp_stream *master, *slave; enum cip_flags sync_mode; unsigned int curr_rate; diff --git a/sound/firewire/bebob/bebob_maudio.c b/sound/firewire/bebob/bebob_maudio.c index 057495d..dc9cd0c 100644 --- a/sound/firewire/bebob/bebob_maudio.c +++ b/sound/firewire/bebob/bebob_maudio.c @@ -712,7 +712,7 @@ end: } /* for special customized devices */ -static struct snd_bebob_rate_spec special_rate_spec = { +static const struct snd_bebob_rate_spec special_rate_spec = { .get = &special_get_rate, .set = &special_set_rate, }; @@ -733,7 +733,7 @@ struct snd_bebob_spec maudio_special_spec = { }; /* Firewire 410 specification */ -static struct snd_bebob_rate_spec usual_rate_spec = { +static const struct snd_bebob_rate_spec usual_rate_spec = { .get = &snd_bebob_stream_get_rate, .set = &snd_bebob_stream_set_rate, }; diff --git a/sound/firewire/bebob/bebob_proc.c b/sound/firewire/bebob/bebob_proc.c index 301cc6a..0f3b2ca 100644 --- a/sound/firewire/bebob/bebob_proc.c +++ b/sound/firewire/bebob/bebob_proc.c @@ -138,7 +138,7 @@ proc_read_clock(struct snd_info_entry *entry, "SYT-Match", }; struct snd_bebob *bebob = entry->private_data; - struct snd_bebob_rate_spec *rate_spec = bebob->spec->rate; + const struct snd_bebob_rate_spec *rate_spec = bebob->spec->rate; struct snd_bebob_clock_spec *clk_spec = bebob->spec->clock; enum snd_bebob_clock_type src; unsigned int rate;

3 8

[alsa-devel] [PATCH 1/1] Allow any MIDI endpoint to drive use of interrupt transfer on Roland devices
by maillist＠superlative.org 11 Oct '15

11 Oct '15

From: "Keith A. Milner" <kamilner(a)superlative.org> Signed-off-by: Keith A. Milner <maillist(a)superlative.org> diff --git a/sound/usb/midi.c b/sound/usb/midi.c index b901f46..52b8c72 100644 --- a/sound/usb/midi.c +++ b/sound/usb/midi.c @@ -1860,9 +1860,14 @@ static void snd_usbmidi_switch_roland_altsetting(struct snd_usb_midi* umidi) hostif = &intf->altsetting[1]; intfd = get_iface_desc(hostif); + /* If either or both of the endpoints support interrupt transfer, + * then use the alternate setting + */ if (intfd->bNumEndpoints != 2 || - (get_endpoint(hostif, 0)->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) != USB_ENDPOINT_XFER_BULK || - (get_endpoint(hostif, 1)->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) != USB_ENDPOINT_XFER_INT) + !((get_endpoint(hostif, 0)->bmAttributes + & USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_INT || + (get_endpoint(hostif, 1)->bmAttributes + & USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_INT)) return; snd_printdd(KERN_INFO "switching to altsetting %d with int ep\n", -- 1.9.1

2 1

[alsa-devel] [PATCH v2] ALSA: usb-audio: Fix max packet size calculation for USB audio
by Ricard Wanderlof 11 Oct '15

11 Oct '15

The addition of 0xffff ("almost 1" in Q16.16 format), resulting in the rounding up of the resulting value, was in the wrong place, as it is the resulting packet size that needs to be rounded up to the nearest integer (e.g. if the resulting packet size is calculated as 55.125 bytes, we need a packet of 56 bytes), rather than the rate value (ep->freqmax). Tested with an Edirol UA-5 both at 44.1 kHz and 96 kHz. Signed-off-by: Ricard Wanderlof <ricardw(a)axis.com> --- V2: Added tested device to commit message. No other changes. Since this clearly is a sensitive part of the code, here follows a lengthy rationale with examples to illustrate the problem. The code as it stands has the following expression on line 613 to calculate the maximum isochronous packet size: maxsize = ((ep->freqmax + 0xffff) * (frame_bits >> 3)) >> (16 - ep->datainterval); Here, ep->freqmax is the maximum assumed sample frequency, calculated from the nominal sample frequency plus 25%. It is ultimately derived from ep->freqn, which is in the units of samples per packet, from get_usb_full_speed_rate() or usb_high_speed_rate(), as applicable, in Q16.16 format. The expression essentially adds the Q16.16 equivalent of 0.999... (i.e. the largest number less than one) to the sample rate, in order to get a rate whose integer part is rounded up from the fractional value. The multiplication with (frame_bits >> 3) yields the number of bytes in a packet, and the (16 >> ep->datainterval) then converts it from Q16.16 back to an integer, taking into consideration the bDataInterval field of the endpoint descriptor, which describes how often isochronous packets are transmitted relative to the (micro)frame rate (125us or 1ms, for USB high speed and full speed, respectively). For this discussion we will assume a bDataInterval of 0, so the second line of the expression just converts the Q16.16 value to an integer. In order to illustrate the problem, we will set frame_bits 64, which corresponds to a frame size of 8 bytes. The problem here is that the addition of 0xffff is in the wrong place. We don't want the rounding up to take place on the frequency, but on the resulting packet size. Let's take an example. We have a sample rate of 96 kHz, so our ep->freqn is 786432 (see usb_high_speed_rate()). Add 25% (line 612) and we get 983040. The calculated maxsize is then ((983040 + 65535) * 8) >> 16 = 127 . However, if we do the number of bytes calculation in a less obscure way it's more apparent what the true corresponding packet size is: we get (96000 * 1.25 / 8000) * 8 = 120, where 1.25 is the 25% from line 612, and the 8000 is the number of isochronous packets per second on a high speed USB connection (125 us microframe interval). Rephrasing the maxsize expression to: maxsize = (ep->freqmax * (frame_bits >> 3) + 0xffff) >> (16 - ep->datainterval); we instead get (983040 * 8 + 65535) >> 16 = 120 which is the correct value. We can also do the calculation with a non-integer sample rate which is when rounding comes into effect: say we have 44.1 kHz (resulting ep->freqn = 361267, and resulting ep->freqmax 361267 * 1.25 = 451583 (rounded down). Original maxsize = ((451583 + 65535) * 8) << 16 = 63 (63.124.. rounded down) True maxsize = (44100 * 1.25 / 8000) * 8 = 55.125, i.e. 56 bytes required New maxsize = (451583 * 8 + 65535) >> 16 = 56 This is also corroborated by the wMaxPacketSize check on line 616. Assume that wMaxPacketSize = 108, with ep->maxpacksize then having the same value. As 108 < 127, we get maxsize = 108. ep->freqmax is then recalculated to (108 / 8) << 16 = 884736 . Putting that rate into the original maxsize calculation yields a maxsize of ((884736 + 65535) * 8) >> 16 = 115 (with decimals 115.99988). Clearly, we should get back the 108 here, which we would with the new expression: (884736 * 8 + 65535) >> 16 = 108 . As it currently stands, the error is tolerable because it only results in maxsize being a bit too big which wastes a couple of bytes, either as a result of the first maxsize calculation, or because the resulting calculation will hit the wMaxPacketSize value before the packet is too big, resulting in fixing the size to wMaxPacketSize even though the packet is actually not too long. However, I'm working on a quirk for a device which stuffs an extra four (non sample) bytes into each isochronous packet, and that means that the maxsize calculation must take this into account. During this work it became obvious that there was something wrong with the maxsize calculation, as the resulting packet size when wMaxPacketSize was hit did not correspond to the packet size which triggered the if statement to start with. Since this seems to me an obvious (after looking at it for a bit...) bug I'm submitting this as a separate patch rather than part of an upcoming patch series. sound/usb/endpoint.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c index e6f7189..be8a972 100644 --- a/sound/usb/endpoint.c +++ b/sound/usb/endpoint.c @@ -610,7 +610,7 @@ static int data_ep_set_params(struct snd_usb_endpoint *ep, /* assume max. frequency is 25% higher than nominal */ ep->freqmax = ep->freqn + (ep->freqn >> 2); - maxsize = ((ep->freqmax + 0xffff) * (frame_bits >> 3)) + maxsize = (ep->freqmax * (frame_bits >> 3) + 0xffff) >> (16 - ep->datainterval); /* but wMaxPacketSize might reduce this */ if (ep->maxpacksize && ep->maxpacksize < maxsize) { -- 1.7.10.4 -- Ricard Wolf Wanderlöf ricardw(at)axis.com Axis Communications AB, Lund, Sweden www.axis.com Phone +46 46 272 2016 Fax +46 46 13 61 30

2 4

[alsa-devel] How to download and install patch for ICS-43432 codec driver
by Ankhit Vivekananda 10 Oct '15

10 Oct '15

Hello, I am new to developing with ALSA. I have a situation where I need to use ICS-43432 MEMS microphone with a TMS320DM365 processor. I wanted to know if I could download the patch for ICS-43432 codec driver: http://permalink.gmane.org/gmane.linux.alsa.devel/143442. Appreciate any help. Thank you, Ankhit

2 1

[alsa-devel] Boss GT-001
by maillist＠superlative.org 10 Oct '15

10 Oct '15

I recently got access to a Boss GT-001. This is a small USB audio Interface for guitar with onboard FX which doesn't work with ALSA under Linux Mint 17 (running kernel 3.16.0-38-generic). I've not tried it with the latest ALSA development branch, but scanning the recent ALSA Dev archives, I can't see anything which might fix this. # lsusb ... Bus 001 Device 011: ID 0582:0187 Roland Corp (detailed lsusb output is towards the bottom of this email) The unit is moderately quirky compared to most audio devices. This unit includes on-board Boss guitar amp emulations and effects and the USB connection allows you to simultaneously record both the "wet" (with effects) and "dry" (without effects) signal. Thus the USB carries two separate stereo pairs to the computer. It also allows "re-amping" which allows you to apply effects to the output signal. The way this seems to do this is by having two separate stereo pair outputs from the computer one of which is processed via the onboard effects, and one of which is not. This is all just background, but the upshot of this is that the unit is a 2x stereo pair in, and 2x stereo pair out. However, this not only does not show up properly under Linux, but it will not play or record anything. ALSA sees it thusly: # aplay -l ... card 4: GT001 [GT-001], device 0: USB Audio [USB Audio] Subdevices: 0/1 Subdevice #0: subdevice #0 PLaying a CD-format file: # aplay hw:4 test.wav Playing WAVE 'test.wav' : Signed 16 bit Little Endian, Rate 44100 Hz, Stereo aplay: set_params:1233: Sample format not available Available formats: - S32_LE # aplay hw:4 test.wav Playing WAVE 'test.wav' : Signed 16 bit Little Endian, Rate 44100 Hz, Stereo No audio is output For input: # arecord -l card 4: GT001 [GT-001], device 0: USB Audio [USB Audio] Subdevices: 1/1 Subdevice #0: subdevice #0 The unit also supports MIDI which is used for both control of the unit itself via a PC editing application (editing settings, changing patches, etc.) and for simple DAW control. There are three USB MIDI ports for this which, on Windows, are labelled "GT-001", "GT-001 DAW CTRL" and "GT-001 CTRL" On Linux these show up as follows: # amidi -l IO hw:4,0,0 GT-001 MIDI 1 IO hw:4,0,1 GT-001 MIDI 2 IO hw:4,0,2 GT-001 MIDI 3 Any advice and pointers to get this working would be appreciated. Dmesg output: [17530.759008] usb 1-1: new high-speed USB device number 12 using ehci-pci [17530.893299] usb 1-1: New USB device found, idVendor=0582, idProduct=0187 [17530.893303] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=0 [17530.893305] usb 1-1: Product: GT-001 [17530.893307] usb 1-1: Manufacturer: BOSS [17530.894412] snd-usb-audio: probe of 1-1:1.0 failed with error -5 [17530.927591] usb 1-1: Unable to change format on ep #8e: already in use [17530.927614] usb 1-1: Unable to change format on ep #8e: already in use [17530.927764] usb 1-1: Unable to change format on ep #8e: already in use [17530.927945] usb 1-1: Unable to change format on ep #8e: already in use [17530.928161] usb 1-1: Unable to change format on ep #8e: already in use [17530.928600] usb 1-1: Unable to change format on ep #8e: already in use [17530.928620] usb 1-1: Unable to change format on ep #8e: already in use [17530.928693] usb 1-1: Unable to change format on ep #8e: already in use [17530.928832] usb 1-1: Unable to change format on ep #8e: already in use [17530.928958] usb 1-1: Unable to change format on ep #8e: already in use [17530.929350] usb 1-1: Unable to change format on ep #8e: already in use [17530.929377] usb 1-1: Unable to change format on ep #8e: already in use [17530.929500] usb 1-1: Unable to change format on ep #8e: already in use [17530.929743] usb 1-1: Unable to change format on ep #8e: already in use [17530.929988] usb 1-1: Unable to change format on ep #8e: already in use [17530.930577] usb 1-1: Unable to change format on ep #8e: already in use [17530.930617] usb 1-1: Unable to change format on ep #8e: already in use [17530.930808] usb 1-1: Unable to change format on ep #8e: already in use [17530.931064] usb 1-1: Unable to change format on ep #8e: already in use [17530.931213] usb 1-1: Unable to change format on ep #8e: already in use [17531.330778] usb 1-1: Unable to change format on ep #8e: already in use [17531.334500] usb 1-1: Unable to change format on ep #8e: already in use lsusb output: lsusb -vv -d 0582:0187 Bus 001 Device 011: ID 0582:0187 Roland Corp. Couldn't open device, some information will be missing Device Descriptor: bLength 18 bDescriptorType 1 bcdUSB 2.00 bDeviceClass 255 Vendor Specific Class bDeviceSubClass 0 bDeviceProtocol 255 bMaxPacketSize0 64 idVendor 0x0582 Roland Corp. idProduct 0x0187 bcdDevice 0.00 iManufacturer 1 iProduct 2 iSerial 0 bNumConfigurations 1 Configuration Descriptor: bLength 9 bDescriptorType 2 wTotalLength 176 bNumInterfaces 4 bConfigurationValue 1 iConfiguration 0 bmAttributes 0xc0 Self Powered MaxPower 0mA Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber 0 bAlternateSetting 0 bNumEndpoints 0 bInterfaceClass 255 Vendor Specific Class bInterfaceSubClass 255 Vendor Specific Subclass bInterfaceProtocol 0 iInterface 0 Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber 1 bAlternateSetting 0 bNumEndpoints 0 bInterfaceClass 255 Vendor Specific Class bInterfaceSubClass 2 bInterfaceProtocol 2 iInterface 0 ** UNRECOGNIZED: 06 24 f1 01 00 00 Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber 1 bAlternateSetting 1 bNumEndpoints 1 bInterfaceClass 255 Vendor Specific Class bInterfaceSubClass 2 bInterfaceProtocol 2 iInterface 0 ** UNRECOGNIZED: 07 24 01 01 00 01 00 ** UNRECOGNIZED: 0b 24 02 01 04 04 18 01 44 ac 00 Endpoint Descriptor: bLength 7 bDescriptorType 5 bEndpointAddress 0x0d EP 13 OUT bmAttributes 5 Transfer Type Isochronous Synch Type Asynchronous Usage Type Data wMaxPacketSize 0x0070 1x 112 bytes bInterval 1 Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber 2 bAlternateSetting 0 bNumEndpoints 0 bInterfaceClass 255 Vendor Specific Class bInterfaceSubClass 2 bInterfaceProtocol 1 iInterface 0 Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber 2 bAlternateSetting 1 bNumEndpoints 1 bInterfaceClass 255 Vendor Specific Class bInterfaceSubClass 2 bInterfaceProtocol 1 iInterface 0 ** UNRECOGNIZED: 07 24 01 07 00 01 00 ** UNRECOGNIZED: 0b 24 02 01 04 04 18 01 44 ac 00 Endpoint Descriptor: bLength 7 bDescriptorType 5 bEndpointAddress 0x8e EP 14 IN bmAttributes 37 Transfer Type Isochronous Synch Type Asynchronous Usage Type Implicit feedback Data wMaxPacketSize 0x0070 1x 112 bytes bInterval 1 Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber 3 bAlternateSetting 0 bNumEndpoints 2 bInterfaceClass 255 Vendor Specific Class bInterfaceSubClass 3 bInterfaceProtocol 0 iInterface 0 ** UNRECOGNIZED: 06 24 f1 02 03 03 Endpoint Descriptor: bLength 7 bDescriptorType 5 bEndpointAddress 0x03 EP 3 OUT bmAttributes 2 Transfer Type Bulk Synch Type None Usage Type Data wMaxPacketSize 0x0200 1x 512 bytes bInterval 1 Endpoint Descriptor: bLength 7 bDescriptorType 5 bEndpointAddress 0x84 EP 4 IN bmAttributes 2 Transfer Type Bulk Synch Type None Usage Type Data wMaxPacketSize 0x0200 1x 512 bytes bInterval 0 Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber 3 bAlternateSetting 1 bNumEndpoints 2 bInterfaceClass 255 Vendor Specific Class bInterfaceSubClass 3 bInterfaceProtocol 0 iInterface 0 Endpoint Descriptor: bLength 7 bDescriptorType 5 bEndpointAddress 0x03 EP 3 OUT bmAttributes 3 Transfer Type Interrupt Synch Type None Usage Type Data wMaxPacketSize 0x0200 1x 512 bytes bInterval 1 Endpoint Descriptor: bLength 7 bDescriptorType 5 bEndpointAddress 0x85 EP 5 IN bmAttributes 3 Transfer Type Interrupt Synch Type None Usage Type Data wMaxPacketSize 0x0200 1x 512 bytes bInterval 1 Cheers, Keith

4 19

[alsa-devel] [asoc:topic/rockchip 4/4] sound/soc/rockchip/rockchip_spdif.c:67:12: warning: 'rk_spdif_runtime_resume' defined but not used
by kbuild test robot 10 Oct '15

10 Oct '15

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git topic/rockchip head: f874b80e1571118fcf4554878633556f06f998e6 commit: f874b80e1571118fcf4554878633556f06f998e6 [4/4] ASoC: rockchip: Add rockchip SPDIF transceiver driver config: microblaze-allmodconfig (attached as .config) 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 f874b80e1571118fcf4554878633556f06f998e6 # save the attached .config to linux build tree make.cross ARCH=microblaze All warnings (new ones prefixed by >>): >> sound/soc/rockchip/rockchip_spdif.c:67:12: warning: 'rk_spdif_runtime_resume' defined but not used [-Wunused-function] static int rk_spdif_runtime_resume(struct device *dev) ^ vim +/rk_spdif_runtime_resume +67 sound/soc/rockchip/rockchip_spdif.c 51 { .compatible = "rockchip,rk3288-spdif", 52 .data = (void *) RK_SPDIF_RK3288 }, 53 {}, 54 }; 55 MODULE_DEVICE_TABLE(of, rk_spdif_match); 56 57 static int rk_spdif_runtime_suspend(struct device *dev) 58 { 59 struct rk_spdif_dev *spdif = dev_get_drvdata(dev); 60 61 clk_disable_unprepare(spdif->mclk); 62 clk_disable_unprepare(spdif->hclk); 63 64 return 0; 65 } 66 > 67 static int rk_spdif_runtime_resume(struct device *dev) 68 { 69 struct rk_spdif_dev *spdif = dev_get_drvdata(dev); 70 int ret; 71 72 ret = clk_prepare_enable(spdif->mclk); 73 if (ret) { 74 dev_err(spdif->dev, "mclk clock enable failed %d\n", ret); 75 return ret; --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] Dummy module and sample rates
by Uli Franke 10 Oct '15

10 Oct '15

Hi Clemens, I fiddled around with the Dummy module and it seems to be the thing we're looking for. I observed a rather strange behavior though: I set the hw params sample rate to 44k1 without error, but a subsequent call of snd_pcm_start returns EPIPE. When setting hw params sample rate to 4k this does not happen. Did I miss anything? Regards Uli ____ uli@ankerklause:~/.../dlna/wdmr$ modinfo snd-dummy filename: /lib/modules/3.16.0-46-generic/kernel/sound/drivers/snd-dummy.ko license: GPL description: Dummy soundcard (/dev/null) author: Jaroslav Kysela <perex(a)perex.cz> srcversion: BB2C5716F580F3D7D0F53D1 depends: snd-pcm,snd intree: Y vermagic: 3.16.0-46-generic SMP mod_unload modversions 686 signer: Magrathea: Glacier signing key sig_key: 6C:3B:5C:5E:34:A0:6D:7D:5F:7D:A3:D0:50:98:75:D9:6C:6D:E6:C4 sig_hashalgo: sha512 parm: index:Index value for dummy soundcard. (array of int) parm: id:ID string for dummy soundcard. (array of charp) parm: enable:Enable this dummy soundcard. (array of bool) parm: model:Soundcard model. (array of charp) parm: pcm_devs:PCM devices # (0-4) for dummy driver. (array of int) parm: pcm_substreams:PCM substreams # (1-128) for dummy driver. (array of int) parm: fake_buffer:Fake buffer allocations. (bool) parm: hrtimer:Use hrtimer as the timer source. (bool)

3 4

[alsa-devel] [PATCH] ASoC: Intel: Skylake - Add Skylake RT286 I2S machine driver
by Vinod Koul 09 Oct '15

09 Oct '15

From: Omair M Abdullah <omair.m.abdullah(a)intel.com> Add the SKL I2S machine driver using Realtek ALC286S codec in I2S mode. Signed-off-by: Omair M Abdullah <omair.m.abdullah(a)intel.com> Signed-off-by: Jeeja KP <jeeja.kp(a)intel.com> Signed-off-by: Vinod Koul <vinod.koul(a)intel.com> --- sound/soc/intel/Kconfig | 12 ++ sound/soc/intel/boards/Makefile | 2 + sound/soc/intel/boards/skl_rt286.c | 268 +++++++++++++++++++++++++++++++++++++ 3 files changed, 282 insertions(+) create mode 100644 sound/soc/intel/boards/skl_rt286.c diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig index 664df1f44530..ea3221a8b615 100644 --- a/sound/soc/intel/Kconfig +++ b/sound/soc/intel/Kconfig @@ -140,3 +140,15 @@ config SND_SOC_INTEL_SKYLAKE select SND_HDA_EXT_CORE select SND_SOC_TOPOLOGY select SND_SOC_INTEL_SST + +config SND_SOC_INTEL_SKL_RT286_MACH + tristate "ASoC Audio driver for SKL with RT286 I2S mode" + select SND_SOC_INTEL_SST + select SND_SOC_INTEL_SKYLAKE + select SND_SOC_RT286 + select SND_SOC_DMIC + help + This adds support for ASoC machine driver for Skylake platforms + with RT286 I2S audio codec. + Say Y if you have such a device + If unsure select "N". diff --git a/sound/soc/intel/boards/Makefile b/sound/soc/intel/boards/Makefile index cb94895c9edb..371c4565cad8 100644 --- a/sound/soc/intel/boards/Makefile +++ b/sound/soc/intel/boards/Makefile @@ -6,6 +6,7 @@ snd-soc-sst-bytcr-rt5640-objs := bytcr_rt5640.o snd-soc-sst-cht-bsw-rt5672-objs := cht_bsw_rt5672.o snd-soc-sst-cht-bsw-rt5645-objs := cht_bsw_rt5645.o snd-soc-sst-cht-bsw-max98090_ti-objs := cht_bsw_max98090_ti.o +snd-soc-skl_rt286-objs := skl_rt286.o obj-$(CONFIG_SND_SOC_INTEL_HASWELL_MACH) += snd-soc-sst-haswell.o obj-$(CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH) += snd-soc-sst-byt-rt5640-mach.o @@ -15,3 +16,4 @@ obj-$(CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH) += snd-soc-sst-bytcr-rt5640.o obj-$(CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH) += snd-soc-sst-cht-bsw-rt5672.o obj-$(CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH) += snd-soc-sst-cht-bsw-rt5645.o obj-$(CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH) += snd-soc-sst-cht-bsw-max98090_ti.o +obj-$(CONFIG_SND_SOC_INTEL_SKL_RT286_MACH) += snd-soc-skl_rt286.o diff --git a/sound/soc/intel/boards/skl_rt286.c b/sound/soc/intel/boards/skl_rt286.c new file mode 100644 index 000000000000..71907b2c1611 --- /dev/null +++ b/sound/soc/intel/boards/skl_rt286.c @@ -0,0 +1,268 @@ +/* + * Intel Skylake I2S Machine Driver + * + * Copyright (C) 2014-2015, Intel Corporation. All rights reserved. + * + * Modified from: + * Intel Broadwell Wildcatpoint SST Audio + * + * Copyright (C) 2013, Intel Corporation. All rights reserved. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License version + * 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <linux/module.h> +#include <linux/platform_device.h> +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/soc.h> +#include <sound/jack.h> +#include <sound/pcm_params.h> +#include "../../codecs/rt286.h" + +static struct snd_soc_jack skylake_headset; +/* Headset jack detection DAPM pins */ +static struct snd_soc_jack_pin skylake_headset_pins[] = { + { + .pin = "Mic Jack", + .mask = SND_JACK_MICROPHONE, + }, + { + .pin = "Headphone Jack", + .mask = SND_JACK_HEADPHONE, + }, +}; + +static const struct snd_kcontrol_new skylake_controls[] = { + SOC_DAPM_PIN_SWITCH("Speaker"), + SOC_DAPM_PIN_SWITCH("Headphone Jack"), + SOC_DAPM_PIN_SWITCH("Mic Jack"), +}; + +static const struct snd_soc_dapm_widget skylake_widgets[] = { + SND_SOC_DAPM_HP("Headphone Jack", NULL), + SND_SOC_DAPM_SPK("Speaker", NULL), + SND_SOC_DAPM_MIC("Mic Jack", NULL), + SND_SOC_DAPM_MIC("DMIC2", NULL), + SND_SOC_DAPM_MIC("SoC DMIC", NULL), +}; + +static const struct snd_soc_dapm_route skylake_rt286_map[] = { + /* speaker */ + {"Speaker", NULL, "SPOR"}, + {"Speaker", NULL, "SPOL"}, + + /* HP jack connectors - unknown if we have jack deteck */ + {"Headphone Jack", NULL, "HPO Pin"}, + + /* other jacks */ + {"MIC1", NULL, "Mic Jack"}, + + /* digital mics */ + {"DMIC1 Pin", NULL, "DMIC2"}, + {"DMIC AIF", NULL, "SoC DMIC"}, + + /* CODEC BE connections */ + { "AIF1 Playback", NULL, "ssp0 Tx"}, + { "ssp0 Tx", NULL, "codec0_out"}, + { "ssp0 Tx", NULL, "codec1_out"}, + + { "codec0_in", NULL, "ssp0 Rx" }, + { "codec1_in", NULL, "ssp0 Rx" }, + { "ssp0 Rx", NULL, "AIF1 Capture" }, + + { "dmic01_hifi", NULL, "DMIC01 Rx" }, + { "DMIC01 Rx", NULL, "Capture" }, + + { "hif1", NULL, "iDisp Tx"}, + { "iDisp Tx", NULL, "iDisp_out"}, + +}; + +static int skylake_rt286_codec_init(struct snd_soc_pcm_runtime *rtd) +{ + struct snd_soc_codec *codec = rtd->codec; + int ret; + + ret = snd_soc_card_jack_new(rtd->card, "Headset", + SND_JACK_HEADSET | SND_JACK_BTN_0, + &skylake_headset, + skylake_headset_pins, ARRAY_SIZE(skylake_headset_pins)); + + if (ret) + return ret; + + rt286_mic_detect(codec, &skylake_headset); + + return 0; +} + + +static int skylake_ssp0_fixup(struct snd_soc_pcm_runtime *rtd, + struct snd_pcm_hw_params *params) +{ + struct snd_interval *rate = hw_param_interval(params, + SNDRV_PCM_HW_PARAM_RATE); + struct snd_interval *channels = hw_param_interval(params, + SNDRV_PCM_HW_PARAM_CHANNELS); + + /* The output is 48KHz, stereo, 16bits */ + rate->min = rate->max = 48000; + channels->min = channels->max = 2; + snd_mask_set(&params->masks[SNDRV_PCM_HW_PARAM_FORMAT - + SNDRV_PCM_HW_PARAM_FIRST_MASK], + SNDRV_PCM_FORMAT_S16_LE); + + return 0; +} + +static int skylake_rt286_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_dai *codec_dai = rtd->codec_dai; + int ret; + + ret = snd_soc_dai_set_sysclk(codec_dai, RT286_SCLK_S_PLL, 24000000, + SND_SOC_CLOCK_IN); + if (ret < 0) + dev_err(rtd->dev, "set codec sysclk failed: %d\n", ret); + + return ret; +} + +static struct snd_soc_ops skylake_rt286_ops = { + .hw_params = skylake_rt286_hw_params, +}; + +/* skylake digital audio interface glue - connects codec <--> CPU */ +static struct snd_soc_dai_link skylake_rt286_dais[] = { + /* Front End DAI links */ + { + .name = "Skl Audio Port", + .stream_name = "Audio", + .cpu_dai_name = "System Pin", + .platform_name = "0000:00:1f.3", + .nonatomic = 1, + .dynamic = 1, + .codec_name = "snd-soc-dummy", + .codec_dai_name = "snd-soc-dummy-dai", + .trigger = { + SND_SOC_DPCM_TRIGGER_POST, + SND_SOC_DPCM_TRIGGER_POST + }, + .dpcm_playback = 1, + }, + { + .name = "Skl Audio Capture Port", + .stream_name = "Audio Record", + .cpu_dai_name = "System Pin", + .platform_name = "0000:00:1f.3", + .nonatomic = 1, + .dynamic = 1, + .codec_name = "snd-soc-dummy", + .codec_dai_name = "snd-soc-dummy-dai", + .trigger = { + SND_SOC_DPCM_TRIGGER_POST, + SND_SOC_DPCM_TRIGGER_POST + }, + .dpcm_capture = 1, + }, + { + .name = "Skl Audio Reference cap", + .stream_name = "refcap", + .cpu_dai_name = "Reference Pin", + .codec_name = "snd-soc-dummy", + .codec_dai_name = "snd-soc-dummy-dai", + .platform_name = "0000:00:1f.3", + .init = NULL, + .dpcm_capture = 1, + .ignore_suspend = 1, + .nonatomic = 1, + .dynamic = 1, + }, + + /* Back End DAI links */ + { + /* SSP0 - Codec */ + .name = "SSP0-Codec", + .be_id = 0, + .cpu_dai_name = "SSP0 Pin", + .platform_name = "0000:00:1f.3", + .no_pcm = 1, + .codec_name = "i2c-INT343A:00", + .codec_dai_name = "rt286-aif1", + .init = skylake_rt286_codec_init, + .dai_fmt = SND_SOC_DAIFMT_I2S | + SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBS_CFS, + .ignore_suspend = 1, + .ignore_pmdown_time = 1, + .be_hw_params_fixup = skylake_ssp0_fixup, + .ops = &skylake_rt286_ops, + .dpcm_playback = 1, + .dpcm_capture = 1, + }, + { + .name = "dmic01", + .be_id = 1, + .cpu_dai_name = "DMIC01 Pin", + .codec_name = "dmic-codec", + .codec_dai_name = "dmic-hifi", + .platform_name = "0000:00:1f.3", + .ignore_suspend = 1, + .dpcm_capture = 1, + .no_pcm = 1, + }, +}; + +/* skylake audio machine driver for SPT + RT286S */ +static struct snd_soc_card skylake_rt286 = { + .name = "skylake-rt286", + .owner = THIS_MODULE, + .dai_link = skylake_rt286_dais, + .num_links = ARRAY_SIZE(skylake_rt286_dais), + .controls = skylake_controls, + .num_controls = ARRAY_SIZE(skylake_controls), + .dapm_widgets = skylake_widgets, + .num_dapm_widgets = ARRAY_SIZE(skylake_widgets), + .dapm_routes = skylake_rt286_map, + .num_dapm_routes = ARRAY_SIZE(skylake_rt286_map), + .fully_routed = true, +}; + +static int skylake_audio_probe(struct platform_device *pdev) +{ + skylake_rt286.dev = &pdev->dev; + + return snd_soc_register_card(&skylake_rt286); +} + +static int skylake_audio_remove(struct platform_device *pdev) +{ + snd_soc_unregister_card(&skylake_rt286); + return 0; +} + +static struct platform_driver skylake_audio = { + .probe = skylake_audio_probe, + .remove = skylake_audio_remove, + .driver = { + .name = "skl_alc286s_i2s", + }, +}; + +module_platform_driver(skylake_audio) + +/* Module information */ +MODULE_AUTHOR("Omair Mohammed Abdullah <omair.m.abdullah(a)intel.com>"); +MODULE_DESCRIPTION("Intel SST Audio for Skylake"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:skl_alc286s_i2s"); -- 2.4.3

2 1

[alsa-devel] [asoc:topic/rockchip 4/4] sound/soc/rockchip/rockchip_spdif.c:283:6: warning: cast from pointer to integer of different size
by kbuild test robot 09 Oct '15

09 Oct '15

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git topic/rockchip head: f874b80e1571118fcf4554878633556f06f998e6 commit: f874b80e1571118fcf4554878633556f06f998e6 [4/4] ASoC: rockchip: Add rockchip SPDIF transceiver driver config: x86_64-allmodconfig (attached as .config) reproduce: git checkout f874b80e1571118fcf4554878633556f06f998e6 # save the attached .config to linux build tree make ARCH=x86_64 All warnings (new ones prefixed by >>): sound/soc/rockchip/rockchip_spdif.c: In function 'rk_spdif_probe': >> sound/soc/rockchip/rockchip_spdif.c:283:6: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] if ((int) match->data == RK_SPDIF_RK3288) { ^ vim +283 sound/soc/rockchip/rockchip_spdif.c 267 .writeable_reg = rk_spdif_wr_reg, 268 .readable_reg = rk_spdif_rd_reg, 269 .volatile_reg = rk_spdif_volatile_reg, 270 .cache_type = REGCACHE_FLAT, 271 }; 272 273 static int rk_spdif_probe(struct platform_device *pdev) 274 { 275 struct device_node *np = pdev->dev.of_node; 276 struct rk_spdif_dev *spdif; 277 const struct of_device_id *match; 278 struct resource *res; 279 void __iomem *regs; 280 int ret; 281 282 match = of_match_node(rk_spdif_match, np); > 283 if ((int) match->data == RK_SPDIF_RK3288) { 284 struct regmap *grf; 285 286 grf = syscon_regmap_lookup_by_phandle(np, "rockchip,grf"); 287 if (IS_ERR(grf)) { 288 dev_err(&pdev->dev, 289 "rockchip_spdif missing 'rockchip,grf' \n"); 290 return PTR_ERR(grf); 291 } --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] [PATCH] ASoC: Intel: Skylake: Modify the log level
by Vinod Koul 09 Oct '15

09 Oct '15

dev_info is too noisy for tplg wiget loading, so move it to debug level Signed-off-by: Vinod Koul <vinod.koul(a)intel.com> --- sound/soc/intel/skylake/skl-topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c index b1bffa52cbcd..a5d8420ce69a 100644 --- a/sound/soc/intel/skylake/skl-topology.c +++ b/sound/soc/intel/skylake/skl-topology.c @@ -1178,7 +1178,7 @@ static int skl_tplg_widget_load(struct snd_soc_component *cmpnt, bind_event: if (tplg_w->event_type == 0) { - dev_info(bus->dev, "ASoC: No event handler required\n"); + dev_dbg(bus->dev, "ASoC: No event handler required\n"); return 0; } -- 2.4.3

2 1

[alsa-devel] [PATCH 1/1] ASoC: da7213: Correct units description of dmic-clkrate
by Adam Thomson 09 Oct '15

09 Oct '15

Description previously stated MHz whereas the resolution is in Hz. This has now has been updated to align with reality. Signed-off-by: Adam Thomson <Adam.Thomson.Opensource(a)diasemi.com> --- This patch is based on changes introduced under patch: 'ASoC: da7213: Add bindings documentation for codec driver' (Commit a97d4e93a9bc556d0b3c2efb7695eb4c79938de7, kernel/git/broonie/sound.git) Documentation/devicetree/bindings/sound/da7213.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/sound/da7213.txt b/Documentation/devicetree/bindings/sound/da7213.txt index 7280e82..5890280 100644 --- a/Documentation/devicetree/bindings/sound/da7213.txt +++ b/Documentation/devicetree/bindings/sound/da7213.txt @@ -18,7 +18,7 @@ Optional properties: ["lrise_rfall", "lfall_rrise"] - dlg,dmic-samplephase : When to sample audio from DMIC. ["on_clkedge", "between_clkedge"] -- dlg,dmic-clkrate : DMIC clock frequency (MHz). +- dlg,dmic-clkrate : DMIC clock frequency (Hz). [<1500000>, <3000000>] ====== -- 1.9.3

2 1

[alsa-devel] [PATCH] ASoC: nau8825: add acpi match ID
by yang.a.fang＠intel.com 09 Oct '15

09 Oct '15

From: "Fang, Yang A" <yang.a.fang(a)intel.com> This patch adds the acpi match ID for nau8825 codec Signed-off-by: Fang, Yang A <yang.a.fang(a)intel.com> --- sound/soc/codecs/nau8825.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sound/soc/codecs/nau8825.c b/sound/soc/codecs/nau8825.c index c44a7a1..5c1badf 100644 --- a/sound/soc/codecs/nau8825.c +++ b/sound/soc/codecs/nau8825.c @@ -16,6 +16,7 @@ #include <linux/regmap.h> #include <linux/slab.h> #include <linux/clk.h> +#include <linux/acpi.h> #include <sound/initval.h> #include <sound/tlv.h> @@ -1090,10 +1091,19 @@ static const struct of_device_id nau8825_of_ids[] = { MODULE_DEVICE_TABLE(of, nau8825_of_ids); #endif +#ifdef CONFIG_ACPI +static const struct acpi_device_id nau8825_acpi_match[] = { + { "10508825", 0 }, + {}, +}; +MODULE_DEVICE_TABLE(acpi, nau8825_acpi_match); +#endif + static struct i2c_driver nau8825_driver = { .driver = { .name = "nau8825", .of_match_table = of_match_ptr(nau8825_of_ids), + .acpi_match_table = ACPI_PTR(nau8825_acpi_match), }, .probe = nau8825_i2c_probe, .remove = nau8825_i2c_remove, -- 1.7.9.5

2 1

[alsa-devel] Applied "ASoC: rockchip: Add rockchip SPDIF transceiver driver" to the asoc tree
by Mark Brown 09 Oct '15

09 Oct '15

The patch ASoC: rockchip: Add rockchip SPDIF transceiver driver has been applied to the asoc tree at git://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 f874b80e1571118fcf4554878633556f06f998e6 Mon Sep 17 00:00:00 2001 From: Sjoerd Simons <sjoerd.simons(a)collabora.co.uk> Date: Thu, 8 Oct 2015 15:31:13 +0200 Subject: [PATCH] ASoC: rockchip: Add rockchip SPDIF transceiver driver Add a driver for the SPDIF transceiver available on RK3066, RK3188 and RK3288. Heavily based on the rockchip i2s driver. Signed-off-by: Sjoerd Simons <sjoerd.simons(a)collabora.co.uk> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/rockchip/Kconfig | 8 + sound/soc/rockchip/Makefile | 2 + sound/soc/rockchip/rockchip_spdif.c | 409 ++++++++++++++++++++++++++++++++++++ sound/soc/rockchip/rockchip_spdif.h | 63 ++++++ 4 files changed, 482 insertions(+) create mode 100644 sound/soc/rockchip/rockchip_spdif.c create mode 100644 sound/soc/rockchip/rockchip_spdif.h diff --git a/sound/soc/rockchip/Kconfig b/sound/soc/rockchip/Kconfig index 5709057..f1e0c70 100644 --- a/sound/soc/rockchip/Kconfig +++ b/sound/soc/rockchip/Kconfig @@ -15,6 +15,14 @@ config SND_SOC_ROCKCHIP_I2S Rockchip I2S device. The device supports upto maximum of 8 channels each for play and record. +config SND_SOC_ROCKCHIP_SPDIF + tristate "Rockchip SPDIF Device Driver" + depends on CLKDEV_LOOKUP && SND_SOC_ROCKCHIP + select SND_SOC_GENERIC_DMAENGINE_PCM + help + Say Y or M if you want to add support for SPDIF driver for + Rockchip SPDIF transceiver device. + config SND_SOC_ROCKCHIP_MAX98090 tristate "ASoC support for Rockchip boards using a MAX98090 codec" depends on SND_SOC_ROCKCHIP && I2C && GPIOLIB && CLKDEV_LOOKUP diff --git a/sound/soc/rockchip/Makefile b/sound/soc/rockchip/Makefile index e9ba558..c0bf560 100644 --- a/sound/soc/rockchip/Makefile +++ b/sound/soc/rockchip/Makefile @@ -1,7 +1,9 @@ # ROCKCHIP Platform Support snd-soc-rockchip-i2s-objs := rockchip_i2s.o +snd-soc-rockchip-spdif-objs := rockchip_spdif.o obj-$(CONFIG_SND_SOC_ROCKCHIP_I2S) += snd-soc-rockchip-i2s.o +obj-$(CONFIG_SND_SOC_ROCKCHIP_SPDIF) += snd-soc-rockchip-spdif.o snd-soc-rockchip-max98090-objs := rockchip_max98090.o snd-soc-rockchip-rt5645-objs := rockchip_rt5645.o diff --git a/sound/soc/rockchip/rockchip_spdif.c b/sound/soc/rockchip/rockchip_spdif.c new file mode 100644 index 0000000..9d5c470 --- /dev/null +++ b/sound/soc/rockchip/rockchip_spdif.c @@ -0,0 +1,409 @@ +/* sound/soc/rockchip/rk_spdif.c + * + * ALSA SoC Audio Layer - Rockchip I2S Controller driver + * + * Copyright (c) 2014 Rockchip Electronics Co. Ltd. + * Author: Jianqun <jay.xu(a)rock-chips.com> + * Copyright (c) 2015 Collabora Ltd. + * Author: Sjoerd Simons <sjoerd.simons(a)collabora.co.uk> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include <linux/module.h> +#include <linux/delay.h> +#include <linux/of_gpio.h> +#include <linux/clk.h> +#include <linux/pm_runtime.h> +#include <linux/mfd/syscon.h> +#include <linux/regmap.h> +#include <sound/pcm_params.h> +#include <sound/dmaengine_pcm.h> + +#include "rockchip_spdif.h" + +enum rk_spdif_type { + RK_SPDIF_RK3066, + RK_SPDIF_RK3188, + RK_SPDIF_RK3288, +}; + +#define RK3288_GRF_SOC_CON2 0x24c + +struct rk_spdif_dev { + struct device *dev; + + struct clk *mclk; + struct clk *hclk; + + struct snd_dmaengine_dai_dma_data playback_dma_data; + + struct regmap *regmap; +}; + +static const struct of_device_id rk_spdif_match[] = { + { .compatible = "rockchip,rk3066-spdif", + .data = (void *) RK_SPDIF_RK3066 }, + { .compatible = "rockchip,rk3188-spdif", + .data = (void *) RK_SPDIF_RK3188 }, + { .compatible = "rockchip,rk3288-spdif", + .data = (void *) RK_SPDIF_RK3288 }, + {}, +}; +MODULE_DEVICE_TABLE(of, rk_spdif_match); + +static int rk_spdif_runtime_suspend(struct device *dev) +{ + struct rk_spdif_dev *spdif = dev_get_drvdata(dev); + + clk_disable_unprepare(spdif->mclk); + clk_disable_unprepare(spdif->hclk); + + return 0; +} + +static int rk_spdif_runtime_resume(struct device *dev) +{ + struct rk_spdif_dev *spdif = dev_get_drvdata(dev); + int ret; + + ret = clk_prepare_enable(spdif->mclk); + if (ret) { + dev_err(spdif->dev, "mclk clock enable failed %d\n", ret); + return ret; + } + + ret = clk_prepare_enable(spdif->hclk); + if (ret) { + dev_err(spdif->dev, "hclk clock enable failed %d\n", ret); + return ret; + } + + return 0; +} + +static int rk_spdif_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params, + struct snd_soc_dai *dai) +{ + struct rk_spdif_dev *spdif = snd_soc_dai_get_drvdata(dai); + unsigned int val = SPDIF_CFGR_HALFWORD_ENABLE; + int srate, mclk; + int ret; + + srate = params_rate(params); + switch (srate) { + case 32000: + case 48000: + case 96000: + mclk = 96000 * 128; /* 12288000 hz */ + break; + case 44100: + mclk = 44100 * 256; /* 11289600 hz */ + break; + case 192000: + mclk = 192000 * 128; /* 24576000 hz */ + break; + default: + return -EINVAL; + } + + switch (params_format(params)) { + case SNDRV_PCM_FORMAT_S16_LE: + val |= SPDIF_CFGR_VDW_16; + break; + case SNDRV_PCM_FORMAT_S20_3LE: + val |= SPDIF_CFGR_VDW_20; + break; + case SNDRV_PCM_FORMAT_S24_LE: + val |= SPDIF_CFGR_VDW_24; + break; + default: + return -EINVAL; + } + + /* Set clock and calculate divider */ + ret = clk_set_rate(spdif->mclk, mclk); + if (ret != 0) { + dev_err(spdif->dev, "Failed to set module clock rate: %d\n", + ret); + return ret; + } + + val |= SPDIF_CFGR_CLK_DIV(mclk/(srate * 256)); + ret = regmap_update_bits(spdif->regmap, SPDIF_CFGR, + SPDIF_CFGR_CLK_DIV_MASK | SPDIF_CFGR_HALFWORD_ENABLE | + SDPIF_CFGR_VDW_MASK, + val); + + return ret; +} + +static int rk_spdif_trigger(struct snd_pcm_substream *substream, + int cmd, struct snd_soc_dai *dai) +{ + struct rk_spdif_dev *spdif = snd_soc_dai_get_drvdata(dai); + int ret; + + switch (cmd) { + case SNDRV_PCM_TRIGGER_START: + case SNDRV_PCM_TRIGGER_RESUME: + case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: + ret = regmap_update_bits(spdif->regmap, SPDIF_DMACR, + SPDIF_DMACR_TDE_ENABLE, + SPDIF_DMACR_TDE_ENABLE); + + if (ret != 0) + return ret; + + ret = regmap_update_bits(spdif->regmap, SPDIF_XFER, + SPDIF_XFER_TXS_START, + SPDIF_XFER_TXS_START); + break; + case SNDRV_PCM_TRIGGER_SUSPEND: + case SNDRV_PCM_TRIGGER_STOP: + case SNDRV_PCM_TRIGGER_PAUSE_PUSH: + ret = regmap_update_bits(spdif->regmap, SPDIF_DMACR, + SPDIF_DMACR_TDE_ENABLE, + SPDIF_DMACR_TDE_DISABLE); + + if (ret != 0) + return ret; + + ret = regmap_update_bits(spdif->regmap, SPDIF_XFER, + SPDIF_XFER_TXS_START, + SPDIF_XFER_TXS_STOP); + break; + default: + ret = -EINVAL; + break; + } + + return ret; +} + +static int rk_spdif_dai_probe(struct snd_soc_dai *dai) +{ + struct rk_spdif_dev *spdif = snd_soc_dai_get_drvdata(dai); + + dai->playback_dma_data = &spdif->playback_dma_data; + + return 0; +} + +static const struct snd_soc_dai_ops rk_spdif_dai_ops = { + .hw_params = rk_spdif_hw_params, + .trigger = rk_spdif_trigger, +}; + +static struct snd_soc_dai_driver rk_spdif_dai = { + .probe = rk_spdif_dai_probe, + .playback = { + .stream_name = "Playback", + .channels_min = 2, + .channels_max = 2, + .rates = (SNDRV_PCM_RATE_32000 | + SNDRV_PCM_RATE_44100 | + SNDRV_PCM_RATE_48000 | + SNDRV_PCM_RATE_96000 | + SNDRV_PCM_RATE_192000), + .formats = (SNDRV_PCM_FMTBIT_S16_LE | + SNDRV_PCM_FMTBIT_S20_3LE | + SNDRV_PCM_FMTBIT_S24_LE), + }, + .ops = &rk_spdif_dai_ops, +}; + +static const struct snd_soc_component_driver rk_spdif_component = { + .name = "rockchip-spdif", +}; + +static bool rk_spdif_wr_reg(struct device *dev, unsigned int reg) +{ + switch (reg) { + case SPDIF_CFGR: + case SPDIF_DMACR: + case SPDIF_INTCR: + case SPDIF_XFER: + case SPDIF_SMPDR: + return true; + default: + return false; + } +} + +static bool rk_spdif_rd_reg(struct device *dev, unsigned int reg) +{ + switch (reg) { + case SPDIF_CFGR: + case SPDIF_SDBLR: + case SPDIF_INTCR: + case SPDIF_INTSR: + case SPDIF_XFER: + return true; + default: + return false; + } +} + +static bool rk_spdif_volatile_reg(struct device *dev, unsigned int reg) +{ + switch (reg) { + case SPDIF_INTSR: + case SPDIF_SDBLR: + return true; + default: + return false; + } +} + +static const struct regmap_config rk_spdif_regmap_config = { + .reg_bits = 32, + .reg_stride = 4, + .val_bits = 32, + .max_register = SPDIF_SMPDR, + .writeable_reg = rk_spdif_wr_reg, + .readable_reg = rk_spdif_rd_reg, + .volatile_reg = rk_spdif_volatile_reg, + .cache_type = REGCACHE_FLAT, +}; + +static int rk_spdif_probe(struct platform_device *pdev) +{ + struct device_node *np = pdev->dev.of_node; + struct rk_spdif_dev *spdif; + const struct of_device_id *match; + struct resource *res; + void __iomem *regs; + int ret; + + match = of_match_node(rk_spdif_match, np); + if ((int) match->data == RK_SPDIF_RK3288) { + struct regmap *grf; + + grf = syscon_regmap_lookup_by_phandle(np, "rockchip,grf"); + if (IS_ERR(grf)) { + dev_err(&pdev->dev, + "rockchip_spdif missing 'rockchip,grf' \n"); + return PTR_ERR(grf); + } + + /* Select the 8 channel SPDIF solution on RK3288 as + * the 2 channel one does not appear to work + */ + regmap_write(grf, RK3288_GRF_SOC_CON2, BIT(1) << 16); + } + + spdif = devm_kzalloc(&pdev->dev, sizeof(*spdif), GFP_KERNEL); + if (!spdif) + return -ENOMEM; + + spdif->hclk = devm_clk_get(&pdev->dev, "hclk"); + if (IS_ERR(spdif->hclk)) { + dev_err(&pdev->dev, "Can't retrieve rk_spdif bus clock\n"); + return PTR_ERR(spdif->hclk); + } + ret = clk_prepare_enable(spdif->hclk); + if (ret) { + dev_err(spdif->dev, "hclock enable failed %d\n", ret); + return ret; + } + + spdif->mclk = devm_clk_get(&pdev->dev, "mclk"); + if (IS_ERR(spdif->mclk)) { + dev_err(&pdev->dev, "Can't retrieve rk_spdif master clock\n"); + return PTR_ERR(spdif->mclk); + } + + ret = clk_prepare_enable(spdif->mclk); + if (ret) { + dev_err(spdif->dev, "clock enable failed %d\n", ret); + return ret; + } + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + regs = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(regs)) + return PTR_ERR(regs); + + spdif->regmap = devm_regmap_init_mmio_clk(&pdev->dev, "hclk", regs, + &rk_spdif_regmap_config); + if (IS_ERR(spdif->regmap)) { + dev_err(&pdev->dev, + "Failed to initialise managed register map\n"); + return PTR_ERR(spdif->regmap); + } + + spdif->playback_dma_data.addr = res->start + SPDIF_SMPDR; + spdif->playback_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; + spdif->playback_dma_data.maxburst = 4; + + spdif->dev = &pdev->dev; + dev_set_drvdata(&pdev->dev, spdif); + + pm_runtime_set_active(&pdev->dev); + pm_runtime_enable(&pdev->dev); + pm_request_idle(&pdev->dev); + + ret = devm_snd_soc_register_component(&pdev->dev, + &rk_spdif_component, + &rk_spdif_dai, 1); + if (ret) { + dev_err(&pdev->dev, "Could not register DAI\n"); + goto err_pm_runtime; + } + + ret = snd_dmaengine_pcm_register(&pdev->dev, NULL, 0); + if (ret) { + dev_err(&pdev->dev, "Could not register PCM\n"); + goto err_pcm_register; + } + + return 0; + +err_pcm_register: + snd_dmaengine_pcm_unregister(&pdev->dev); +err_pm_runtime: + pm_runtime_disable(&pdev->dev); + + return ret; +} + +static int rk_spdif_remove(struct platform_device *pdev) +{ + struct rk_spdif_dev *spdif = dev_get_drvdata(&pdev->dev); + + pm_runtime_disable(&pdev->dev); + if (!pm_runtime_status_suspended(&pdev->dev)) + rk_spdif_runtime_suspend(&pdev->dev); + + clk_disable_unprepare(spdif->mclk); + clk_disable_unprepare(spdif->hclk); + snd_dmaengine_pcm_unregister(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); + + return 0; +} + +static const struct dev_pm_ops rk_spdif_pm_ops = { + SET_RUNTIME_PM_OPS(rk_spdif_runtime_suspend, rk_spdif_runtime_resume, + NULL) +}; + +static struct platform_driver rk_spdif_driver = { + .probe = rk_spdif_probe, + .remove = rk_spdif_remove, + .driver = { + .name = "rockchip-spdif", + .of_match_table = of_match_ptr(rk_spdif_match), + .pm = &rk_spdif_pm_ops, + }, +}; +module_platform_driver(rk_spdif_driver); + +MODULE_ALIAS("platform:rockchip-spdif"); +MODULE_DESCRIPTION("ROCKCHIP SPDIF transceiver Interface"); +MODULE_AUTHOR("Sjoerd Simons <sjoerd.simons(a)collabora.co.uk>"); +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/rockchip/rockchip_spdif.h b/sound/soc/rockchip/rockchip_spdif.h new file mode 100644 index 0000000..07f86a2 --- /dev/null +++ b/sound/soc/rockchip/rockchip_spdif.h @@ -0,0 +1,63 @@ +/* + * ALSA SoC Audio Layer - Rockchip SPDIF transceiver driver + * + * Copyright (c) 2015 Collabora Ltd. + * Author: Sjoerd Simons <sjoerd.simons(a)collabora.co.uk> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#ifndef _ROCKCHIP_SPDIF_H +#define _ROCKCHIP_SPDIF_H + +/* + * CFGR + * transfer configuration register +*/ +#define SPDIF_CFGR_CLK_DIV_SHIFT (16) +#define SPDIF_CFGR_CLK_DIV_MASK (0xff << SPDIF_CFGR_CLK_DIV_SHIFT) +#define SPDIF_CFGR_CLK_DIV(x) (x << SPDIF_CFGR_CLK_DIV_SHIFT) + +#define SPDIF_CFGR_HALFWORD_SHIFT 2 +#define SPDIF_CFGR_HALFWORD_DISABLE (0 << SPDIF_CFGR_HALFWORD_SHIFT) +#define SPDIF_CFGR_HALFWORD_ENABLE (1 << SPDIF_CFGR_HALFWORD_SHIFT) + +#define SPDIF_CFGR_VDW_SHIFT 0 +#define SPDIF_CFGR_VDW(x) (x << SPDIF_CFGR_VDW_SHIFT) +#define SDPIF_CFGR_VDW_MASK (0xf << SPDIF_CFGR_VDW_SHIFT) + +#define SPDIF_CFGR_VDW_16 SPDIF_CFGR_VDW(0x00) +#define SPDIF_CFGR_VDW_20 SPDIF_CFGR_VDW(0x01) +#define SPDIF_CFGR_VDW_24 SPDIF_CFGR_VDW(0x10) + +/* + * DMACR + * DMA control register +*/ +#define SPDIF_DMACR_TDE_SHIFT 5 +#define SPDIF_DMACR_TDE_DISABLE (0 << SPDIF_DMACR_TDE_SHIFT) +#define SPDIF_DMACR_TDE_ENABLE (1 << SPDIF_DMACR_TDE_SHIFT) + +#define SPDIF_DMACR_TDL_SHIFT 0 +#define SPDIF_DMACR_TDL(x) ((x) << SPDIF_DMACR_TDL_SHIFT) +#define SPDIF_DMACR_TDL_MASK (0x1f << SDPIF_DMACR_TDL_SHIFT) + +/* + * XFER + * Transfer control register +*/ +#define SPDIF_XFER_TXS_SHIFT 0 +#define SPDIF_XFER_TXS_STOP (0 << SPDIF_XFER_TXS_SHIFT) +#define SPDIF_XFER_TXS_START (1 << SPDIF_XFER_TXS_SHIFT) + +#define SPDIF_CFGR (0x0000) +#define SPDIF_SDBLR (0x0004) +#define SPDIF_DMACR (0x0008) +#define SPDIF_INTCR (0x000c) +#define SPDIF_INTSR (0x0010) +#define SPDIF_XFER (0x0018) +#define SPDIF_SMPDR (0x0020) + +#endif /* _ROCKCHIP_SPDIF_H */ -- 2.5.0

1 0

[alsa-devel] [PATCH] ASoC: rt5645: fix build warning
by Sudip Mukherjee 09 Oct '15

09 Oct '15

We were getting build warning about "Section mismatch". dmi_platform_intel_broadwell is being referenced from the probe function rt5645_i2c_probe(), but dmi_platform_intel_broadwell was marked with __initdata. Signed-off-by: Sudip Mukherjee <sudip(a)vectorindia.org> --- sound/soc/codecs/rt5645.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index 4c4fe6b..89ba4ff 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -3244,7 +3244,7 @@ static int buddy_quirk_cb(const struct dmi_system_id *id) return 1; } -static struct dmi_system_id dmi_platform_intel_broadwell[] __initdata = { +static struct dmi_system_id dmi_platform_intel_broadwell[] = { { .ident = "Chrome Buddy", .callback = buddy_quirk_cb, -- 1.9.1

3 4

[alsa-devel] [PATCH 0/4] ASoC: Intel: Skylake: Enable runtime pm
by Vinod Koul 09 Oct '15

09 Oct '15

Although driver already has runtime pm handlers, some of things were missing to have it properly functional, so add the fixes and correct handling Jeeja KP (4): ASoC: Intel: Skylake: Check CPA bit in DSP core power down ASoC: Intel: Skylake: Verify the status bit before handling interrupt ASoC: Intel: Skylake: Correct the runtime handler behaviour ASoC: Intel: Skylake: power down all link in suspend sound/soc/intel/common/sst-dsp-priv.h | 1 + sound/soc/intel/skylake/skl-sst-dsp.c | 7 ++++- sound/soc/intel/skylake/skl-sst-ipc.c | 12 ++++++++ sound/soc/intel/skylake/skl-sst-ipc.h | 1 + sound/soc/intel/skylake/skl-sst.c | 56 +++++++++++++++++++---------------- sound/soc/intel/skylake/skl.c | 3 ++ 6 files changed, 53 insertions(+), 27 deletions(-) -- 2.4.3

2 8

[alsa-devel] [PATCH 0/5 v4] ALSA: add helper functions for MIDI message transmission on IEEE 1394 asynchronous transaction
by Takashi Sakamoto 09 Oct '15

09 Oct '15

Hi, This patchset updates a part of my previous post: [alsa-devel] [PATCH 0/5] ALSA: add helper functions for MIDI message transmission on IEEE 1394 asynchronous transaction http://mailman.alsa-project.org/pipermail/alsa-devel/2015-October/098536.ht… (Besides, the patchset should have been version 3, thus this patchset is v4.) This patchset adds some helper functions for MIDI transmission via IEEE 1394 asynchronous transaction. Changes: * fix compile error due to missing member of structure. * improve comments Takashi Sakamoto (5): ALSA: firewire-lib: add helper functions for asynchronous transactions to transfer MIDI messages ALSA: firewire-lib: add a restriction for a transaction at once ALSA: firewire-lib: schedule work again when MIDI substream has rest of MIDI messages ALSA: firewire-lib: add throttle for MIDI data rate ALSA: firewire-lib: avoid endless loop to transfer MIDI messages at fatal error sound/firewire/lib.c | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++ sound/firewire/lib.h | 56 +++++++++++++++++++++ 2 files changed, 194 insertions(+) -- 2.1.4

2 6

Re: [alsa-devel] [PATCH] ALSA: seq_oss: fix waitqueue_active without memory barrier in snd-seq-oss
by Takashi Iwai 09 Oct '15

09 Oct '15

On Fri, 09 Oct 2015 02:35:54 +0200, Kosuke Tatsukawa wrote: > > snd_seq_oss_readq_put_event() seems to be missing a memory barrier which > might cause the waker to not notice the waiter and miss sending a > wake_up as in the following figure. > > snd_seq_oss_readq_put_event snd_seq_oss_readq_wait > ------------------------------------------------------------------------ > /* wait_event_interruptible_timeout */ > /* __wait_event_interruptible_timeout */ > /* ___wait_event */ > for (;;) { prepare_to_wait_event(&wq, &__wait, > state); > spin_lock_irqsave(&q->lock, flags); > if (waitqueue_active(&q->midi_sleep)) > /* The CPU might reorder the test for > the waitqueue up here, before > prior writes complete */ > if ((q->qlen>0 || q->head==q->tail) > ... > __ret = schedule_timeout(__ret) > if (q->qlen >= q->maxlen - 1) { > memcpy(&q->q[q->tail], ev, sizeof(*ev)); > q->tail = (q->tail + 1) % q->maxlen; > q->qlen++; > ------------------------------------------------------------------------ > > There are two other place in sound/core/seq/oss/ which have similar > code. The attached patch removes the call to waitqueue_active() leaving > just wake_up() behind. This fixes the problem because the call to > spin_lock_irqsave() in wake_up() will be an ACQUIRE operation. > > I found this issue when I was looking through the linux source code > for places calling waitqueue_active() before wake_up*(), but without > preceding memory barriers, after sending a patch to fix a similar > issue in drivers/tty/n_tty.c (Details about the original issue can be > found here: https://lkml.org/lkml/2015/9/28/849). > > Signed-off-by: Kosuke Tatsukawa <tatsu(a)ab.jp.nec.com> Thanks, applied now. Takashi > --- > sound/core/seq/oss/seq_oss_readq.c | 6 ++---- > sound/core/seq/oss/seq_oss_writeq.c | 4 +--- > 2 files changed, 3 insertions(+), 7 deletions(-) > > diff --git a/sound/core/seq/oss/seq_oss_readq.c b/sound/core/seq/oss/seq_oss_readq.c > index ccd8935..046cb58 100644 > --- a/sound/core/seq/oss/seq_oss_readq.c > +++ b/sound/core/seq/oss/seq_oss_readq.c > @@ -91,8 +91,7 @@ snd_seq_oss_readq_clear(struct seq_oss_readq *q) > q->head = q->tail = 0; > } > /* if someone sleeping, wake'em up */ > - if (waitqueue_active(&q->midi_sleep)) > - wake_up(&q->midi_sleep); > + wake_up(&q->midi_sleep); > q->input_time = (unsigned long)-1; > } > > @@ -138,8 +137,7 @@ snd_seq_oss_readq_put_event(struct seq_oss_readq *q, union evrec *ev) > q->qlen++; > > /* wake up sleeper */ > - if (waitqueue_active(&q->midi_sleep)) > - wake_up(&q->midi_sleep); > + wake_up(&q->midi_sleep); > > spin_unlock_irqrestore(&q->lock, flags); > > diff --git a/sound/core/seq/oss/seq_oss_writeq.c b/sound/core/seq/oss/seq_oss_writeq.c > index d50338b..1f6788a 100644 > --- a/sound/core/seq/oss/seq_oss_writeq.c > +++ b/sound/core/seq/oss/seq_oss_writeq.c > @@ -138,9 +138,7 @@ snd_seq_oss_writeq_wakeup(struct seq_oss_writeq *q, abstime_t time) > spin_lock_irqsave(&q->sync_lock, flags); > q->sync_time = time; > q->sync_event_put = 0; > - if (waitqueue_active(&q->sync_sleep)) { > - wake_up(&q->sync_sleep); > - } > + wake_up(&q->sync_sleep); > spin_unlock_irqrestore(&q->sync_lock, flags); > } > > -- > 1.7.1 >

1 0

[alsa-devel] Release of the tool for benchmarking sound server power efficiency
by Alexander E. Patrakov 09 Oct '15

09 Oct '15

Earlier today (sorry - yesterday!) at the audio mini-summit I promised to release a tool that I used for evaluating sound server energy efficiency. The tool is a shell script, which is attached, together with an example report. It needs to be run as root (in a throwaway VM, if you need), with one argument: the name of a directory to be created and populated with various files. The script needs the "debootstrap" program to be installed. The script will populate the directory with a Debian Jessie amd64 installation, compile CRAS there, and pack everything into an initramfs file that can be used for evaluation. It will produce two files as the main result: vmlinuz and initramfs.img, near the directory that it creates. The initramfs will play a sound file in a loop (please use headphones, so that your laptop does not annoy anyone) and log the laptop battery energy or charge. If it drops below 75% of the initial value, the experiment is terminated, the log is saved to the disk, and the laptop is powered off. You can add this to your boot loader. Example for extlinux: LABEL battery-pulse7 MENU LABEL Battery Benchmark (pulseaudio 7) LINUX /boot/battery-benchmark/vmlinuz INITRD /boot/battery-benchmark/initramfs.img APPEND quiet root=ram save=/dev/md126p1 test_case=pulse pa_version=7 latency_msec=28 dobenchmark Here is the meaning of the arguments: quiet: don't print verbose messages to the console root=ram: use ramfs (not tmpfs) for the extracted initramfs save=/dev/...: save the log to this block device at the end. The /battery-reports directory will be created, and the log will be placed there. FAT32, NTFS and EXT4 filesystems are supported. test_case=pulse|alsa|cras: what we want to test. alsa means raw hw device. pa_version=5|6|7: version of PulseAudio to test latency_msec: buffer size or its equivalent, in milliseconds cras_output: the correct output node for CRAS. Usually 5:0 (the default) or 6:0, please see cras_test_client --dump_server_info resampler: force a given resampler for PulseAudio (if not given, no resampler is used) dobenchmark: dpms-blank the screen and perform the measurement automatically To replicate the results in my presentation, it is sufficient to obtain logs for all three versions of PulseAudio, as well as ALSA and CRAS, for the following latency_msec values: 7, 28, 448. Please send any reports created by this tool to me directly, and mention the laptop model. A big "thanks" goes to Felipe Sateler for providing Debian packages of PulseAudio that are mostly compatible with Debian Jessie. -- Alexander E. Patrakov

1 0

[alsa-devel] [PATCH alsa-utils] build: Do not try to detect cross-compiler
by Mike Frysinger 08 Oct '15

08 Oct '15

From: Mike Frysinger <vapier(a)chromium.org> cross compilers are passed via path may not be a gcc based cross compiler in such cases this check fails and try's to force gcc based cross compiler detection, This code is a convenience that limits the build system. Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- Note: this is the same fix that landed in alsa-lib. configure.ac | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/configure.ac b/configure.ac index 8c2d1a5..79a9aaf 100644 --- a/configure.ac +++ b/configure.ac @@ -12,20 +12,6 @@ AM_GNU_GETTEXT_VERSION([0.15]) dnl Checks for programs. -dnl try to gues cross-compiler if not set -if test "x$target" != "x$host" -a -z "`echo $CC | grep -e '-gcc'`"; -then - AC_MSG_CHECKING(for cross-compiler) - - which ${program_prefix}gcc >/dev/null 2>&1 && CC=${program_prefix}gcc - which ${target_cpu}-${target_os}-gcc >/dev/null 2>&1 \ - && CC=${target_cpu}-${target-os}-gcc - which ${target_cpu}-${target_vendor}-${target_os}-gcc >/dev/null 2>&1 \ - && CC=${target_cpu}-${target_vendor}-${target_os}-gcc - - AC_MSG_RESULT($CC) -fi - AC_PROG_CC dnl AC_PROG_CXX AC_PROG_INSTALL -- 2.5.2

2 1

[alsa-devel] [PATCH 1/2] ALSA: hdac: Copy codec helpers to core
by Vinod Koul 08 Oct '15

08 Oct '15

From: "Subhransu S. Prusty" <subhransu.s.prusty(a)intel.com> The current codec helpers are local to hda code and needs to be moved to core so that other users can use it. The helpers to read/write the codec and to check the power state of widgets is copied Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty(a)intel.com> Signed-off-by: Vinod Koul <vinod.koul(a)intel.com> --- include/sound/hdaudio.h | 6 ++++ sound/hda/hdac_device.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+) diff --git a/include/sound/hdaudio.h b/include/sound/hdaudio.h index 49bc836fcd84..26e956f4b7c6 100644 --- a/include/sound/hdaudio.h +++ b/include/sound/hdaudio.h @@ -147,6 +147,12 @@ int snd_hdac_query_supported_pcm(struct hdac_device *codec, hda_nid_t nid, bool snd_hdac_is_supported_format(struct hdac_device *codec, hda_nid_t nid, unsigned int format); +int snd_hdac_codec_read(struct hdac_device *hdac, hda_nid_t nid, + int flags, unsigned int verb, unsigned int parm); +int snd_hdac_codec_write(struct hdac_device *hdac, hda_nid_t nid, + int flags, unsigned int verb, unsigned int parm); +bool snd_hdac_check_power_state(struct hdac_device *hdac, + hda_nid_t nid, unsigned int target_state); /** * snd_hdac_read_parm - read a codec parameter * @codec: the codec object diff --git a/sound/hda/hdac_device.c b/sound/hda/hdac_device.c index db96042a497f..b3b0ad289df1 100644 --- a/sound/hda/hdac_device.c +++ b/sound/hda/hdac_device.c @@ -952,3 +952,84 @@ bool snd_hdac_is_supported_format(struct hdac_device *codec, hda_nid_t nid, return true; } EXPORT_SYMBOL_GPL(snd_hdac_is_supported_format); + +static unsigned int codec_read(struct hdac_device *hdac, hda_nid_t nid, + int flags, unsigned int verb, unsigned int parm) +{ + unsigned int cmd = snd_hdac_make_cmd(hdac, nid, verb, parm); + unsigned int res; + + if (snd_hdac_exec_verb(hdac, cmd, flags, &res)) + return -1; + + return res; +} + +static int codec_write(struct hdac_device *hdac, hda_nid_t nid, + int flags, unsigned int verb, unsigned int parm) +{ + unsigned int cmd = snd_hdac_make_cmd(hdac, nid, verb, parm); + + return snd_hdac_exec_verb(hdac, cmd, flags, NULL); +} + +/** + * snd_hdac_codec_read - send a command and get the response + * @hdac: the HDAC device + * @nid: NID to send the command + * @flags: optional bit flags + * @verb: the verb to send + * @parm: the parameter for the verb + * + * Send a single command and read the corresponding response. + * + * Returns the obtained response value, or -1 for an error. + */ +int snd_hdac_codec_read(struct hdac_device *hdac, hda_nid_t nid, + int flags, unsigned int verb, unsigned int parm) +{ + return codec_read(hdac, nid, flags, verb, parm); +} +EXPORT_SYMBOL_GPL(snd_hdac_codec_read); + +/** + * snd_hdac_codec_write - send a single command without waiting for response + * @hdac: the HDAC device + * @nid: NID to send the command + * @flags: optional bit flags + * @verb: the verb to send + * @parm: the parameter for the verb + * + * Send a single command without waiting for response. + * + * Returns 0 if successful, or a negative error code. + */ +int snd_hdac_codec_write(struct hdac_device *hdac, hda_nid_t nid, + int flags, unsigned int verb, unsigned int parm) +{ + return codec_write(hdac, nid, flags, verb, parm); +} +EXPORT_SYMBOL_GPL(snd_hdac_codec_write); + +/* + * snd_hdac_check_power_state: check whether the actual power state matches + * with the target state + * + * @hdac: the HDAC device + * @nid: NID to send the command + * @target_state: target state to check for + * + * Return true if state matches, false if not + */ +bool snd_hdac_check_power_state(struct hdac_device *hdac, + hda_nid_t nid, unsigned int target_state) +{ + unsigned int state = codec_read(hdac, nid, 0, + AC_VERB_GET_POWER_STATE, 0); + + if (state & AC_PWRST_ERROR) + return true; + state = (state >> 4) & 0x0f; + return (state == target_state); +} +EXPORT_SYMBOL_GPL(snd_hdac_check_power_state); -- 2.4.3

2 2

[alsa-devel] [PATCH] ASoC: Document DAI signal polarity
by Anatol Pomozov 08 Oct '15

08 Oct '15

Currently there is no clear definition of what FSYNC polarity is. Different drivers use its own definition of what is "normal" and what is "inverted" fsync. This leads to compatibility problems between drivers. For example TegraX1 driver assumes that DSP-A format with frames starting at rising FSYNC edge has "inverted" polarity, while RT5677 assumes it is "normal" polarity. Explicitly specify meaning of BCLK/FSYNC polarity to avoid future compatibility problems. Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> --- include/sound/soc-dai.h | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index 2df96b1..91e2e61 100644 --- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h @@ -48,10 +48,25 @@ struct snd_compr_stream; #define SND_SOC_DAIFMT_GATED (0 << 4) /* clock is gated */ /* - * DAI hardware signal inversions. + * DAI hardware signal polarity. * * Specifies whether the DAI can also support inverted clocks for the specified * format. + * + * BCLK: + * - "normal" polarity means signal is available at rising edge of BCLK + * - "inverted" polarity means signal is available at falling edge of BCLK + * + * FSYNC "normal" polarity depends on the frame format: + * - I2S: frame consists of left then right channel data. Left channel starts + * with falling FSYNC edge, right channel starts with rising FSYNC edge. + * - Left/Right Justified: frame consists of left then right channel data. + * Left channel starts with rising FSYNC edge, right channel starts with + * falling FSYNC edge. + * - DSP A/B: Frame starts with rising FSYNC edge. + * - AC97: Frame starts with rising FSYNC edge. + * + * "Negative" FSYNC polarity is the one opposite of "normal" polarity. */ #define SND_SOC_DAIFMT_NB_NF (0 << 8) /* normal bit clock + frame */ #define SND_SOC_DAIFMT_NB_IF (2 << 8) /* normal BCLK + inv FRM */ -- 2.6.0.rc2.230.g3dd15c0

1 0

[alsa-devel] [PATCH v2 0/3] ASoC: da7213: Add DT support for codec
by Adam Thomson 08 Oct '15

08 Oct '15

This patch set adds DT support to the codec driver, and supporting bindings documentation. Patch set is based against v4.3-rc4 Changes in v2: - Split mclk data support changes into separate patch - Use of_match_ptr() for match table assignment - Only call clk_prepare_enable/disable() if mclk data provided (not NULL). - Add error checking for clk_prepare_enable() usage. Adam Thomson (3): ASoC: da7213: Add DT support to codec driver ASoC: da7213: Add support to handle mclk data provided to driver ASoC: da7213: Add bindings documentation for codec driver Documentation/devicetree/bindings/sound/da7213.txt | 41 +++++ include/sound/da7213.h | 3 - sound/soc/codecs/da7213.c | 190 +++++++++++++++++++-- sound/soc/codecs/da7213.h | 8 +- 4 files changed, 221 insertions(+), 21 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/da7213.txt -- 1.9.3

5 9

[alsa-devel] USB audio device startup question
by Ricard Wanderlof 08 Oct '15

08 Oct '15

(This is in reference to getting the Zoom R16 to work, but the main query in this post is of a more general nature). In trying to get a Zoom R16 in audio interface mode to work in Linux I'm trying to understand how the USB-audio (snd-usb-audio module) subsystem works in Linux. I've looked in the USB audio version 1 and 2 documents, as well as the USB 2.0 standard, but there are some things that don't seem to be well defined there, like exactly how the audio data is packaged in the isochronous transfer packets. I've been using Wireshark to visualize the USB communication, and also comparing with the corresponding transfers on a Windows box by dumping the traffic with USBPcap. The only other USB audio interface I have access to here is an Edirol UA-5. I've noted that when plugging in the UA-5, there's period of about 15 seconds during which capture and playback are set up and audio data transferred, after which the interface is shut down again. When enabling the R16, during the corresponding initial period I see playback data but no capture data during this phase. I don't know if that is significant or not, for instance, if the lack of capture data during this phase is because the playback is not working as it should. My question is: what governs this startup phase, can someone point to a specific part of the code or some documentation describing what is supposed to go on here? Is it some sort of device test period to determine that the device actually works? The problem with the R16 is that although capture works fine, playback doesn't result in any audio. With the correct quirk set up (most importantly, using a 24 bit format), aplay appears to work fine with no errors, neither are there any complaints from dmesg, and looking at the communication I can see outgoing isochronous data from the host being transferred fine. More work needs to be done, but I've looked at the startup of the Windows driver which is deceptively simple: it basically just sets the appropriate capture and playback interfaces, together with sending off some sample rate USB control commands, the isochronous link comes up and that seems to be it. I've tried to emulate the specific USB control commands in Linux, as well as add some delays that there appear to be in the Windows driver, but so far it hasn't made a difference. /Ricard -- Ricard Wolf Wanderlöf ricardw(at)axis.com Axis Communications AB, Lund, Sweden www.axis.com Phone +46 46 272 2016 Fax +46 46 13 61 30

2 1

[alsa-devel] [PATCH] ASoC: rt5645: Remove __initdata annotation from dmi_platform_intel_broadwell
by Jarkko Nikula 08 Oct '15

08 Oct '15

Fix the "Section mismatch" warning when this driver is built as module by removing the __initdata annotation from dmi_platform_intel_broadwell[]. Signed-off-by: Jarkko Nikula <jarkko.nikula(a)linux.intel.com> --- sound/soc/codecs/rt5645.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index 4c4fe6b456d5..89ba4ffdbee7 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -3244,7 +3244,7 @@ static int buddy_quirk_cb(const struct dmi_system_id *id) return 1; } -static struct dmi_system_id dmi_platform_intel_broadwell[] __initdata = { +static struct dmi_system_id dmi_platform_intel_broadwell[] = { { .ident = "Chrome Buddy", .callback = buddy_quirk_cb, -- 2.6.1

1 1

[alsa-devel] [tinycompress] [PATCH] build: Fix make distcheck
by arun＠accosted.net 08 Oct '15

08 Oct '15

From: Arun Raghavan <git(a)arunraghavan.net> srcdir may not be the same as builddir, so use the correct variable for the include path. --- src/lib/Makefile.am | 2 +- src/utils/Makefile.am | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 6f900ac..4baeab5 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -2,4 +2,4 @@ tinycompressdir = $(libdir) tinycompress_LTLIBRARIES = libtinycompress.la libtinycompress_la_SOURCES = compress.c -libtinycompress_la_CFLAGS = -I $(top_builddir)/include +libtinycompress_la_CFLAGS = -I$(top_srcdir)/include diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am index 6a89c45..5f685e3 100644 --- a/src/utils/Makefile.am +++ b/src/utils/Makefile.am @@ -3,8 +3,8 @@ bin_PROGRAMS = cplay crecord cplay_SOURCES = cplay.c crecord_SOURCES = crec.c -cplay_CFLAGS = -I$(top_builddir)/include -crecord_CFLAGS = -I$(top_builddir)/include +cplay_CFLAGS = -I$(top_srcdir)/include +crecord_CFLAGS = -I$(top_srcdir)/include cplay_LDADD = $(top_builddir)/src/lib/libtinycompress.la -- 2.4.3

2 1

[alsa-devel] [PATCH 0/2] ASoC: rockchip: i2s: add 8 channels capture and lrck-mode
by Sugar Zhang 08 Oct '15

08 Oct '15

Support max 8 channels capture. support lrck clk mode configuration, there are 3 modes: - txrx: lrck_tx and lrck_rx are different. - tx_share: lrck_tx is shared with lrck_rx. - rx_share: lrck_rx is shared with lrck_tx. Sugar Zhang (2): ASoC: rockchip: i2s: add 8 channels capture and lrck-mode support Documentation: DT bindings: rockchip-i2s: add capture and lrck-mode .../devicetree/bindings/sound/rockchip-i2s.txt | 5 +++ sound/soc/rockchip/rockchip_i2s.c | 48 +++++++++++++++++++++- sound/soc/rockchip/rockchip_i2s.h | 23 +++++++++++ 3 files changed, 74 insertions(+), 2 deletions(-) -- 2.3.6

4 16

[alsa-devel] [PATCH 0/2] *** wm8962 regmap related fix ***
by Jiada Wang 08 Oct '15

08 Oct '15

This patch set aims to fix issues in wm8962 codec driver related to regmap, currently any attempt to read from ALC Coefficient register will fail when wm8962 is in suspend mode. As ALC2 register is volatile register, it can't be read when cache_only flag is set. Another issue is, if wm8962's regulator is set to 'regulator-always-on' mode, then after wm8962 is resumed from suspend, wm8962 codec is reset, but cache_dirty flag isn't set, this cause difference between actual wm8962 HW and regmap cache. Jiada Wang (2): ASoC: WM8962: mark cache_dirty flag after software reset in pm_resume ASoC: Codec: wm8962: declare ALC Coefficients as 4 separate registers sound/soc/codecs/wm8962.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) -- 2.4.5

2 6

[alsa-devel] Audio routing in the tlv320aic3104
by Rick Mann 07 Oct '15

07 Oct '15

I've managed to get a hacky, fragile config working, in the sense that it sends my tlv320aic3104 samples from speaker-test, and the clocks and data all look good on the oscilloscope, and it ping-pongs between the left and right channel. But it's outputting the signal on the HPLOUT/HPROUT pins, not the L&R Line Out pins. My DTS has this: fragment@3 { target = <&ocp>; __overlay__ { sound { compatible = "ti,da830-evm-audio"; ti,model = "DA830 EVM"; ti,audio-codec = <&tlv320aic3x>; ti,mcasp-controller = <&mcasp0>; ti,codec-clock-rate = <12000000>; ti,audio-routing = "Line Out", "LLOUT", "Line Out", "RLOUT"; }; }; }; The original had: "Headphone Jack", "HPLOUT", "Headphone Jack", "HPROUT", "LINE1L", "Line In", "LINE1R", "Line In"; I also have an asound.state file I got from the Audio Cape: https://raw.githubusercontent.com/CircuitCo/BeagleBone-Audio/files/asound.s… I don't really know how to interpret that file. One resource online said it held the current state of the system. I guess that suggests I should play with amixer. But how does the DTS routing come into play? Thanks, -- Rick Mann rmann(a)latencyzero.com

2 3

[alsa-devel] [GIT PULL] ASoC fixes for v4.3
by Mark Brown 07 Oct '15

07 Oct '15

The following changes since commit 049e6dde7e57f0054fdc49102e7ef4830c698b46: Linux 4.3-rc4 (2015-10-04 16:57:17 +0100) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-fix-v4.3-rc4 for you to fetch changes up to e4fc141d2a022a63c87a4851b3c688eca6a1647b: Merge remote-tracking branches 'asoc/fix/tlv320aic3x' and 'asoc/fix/wm8962' into asoc-linus (2015-10-07 16:07:50 +0100) ---------------------------------------------------------------- ASoC: Fixes for v4.3 Quite a few fixes here but they're all very small and driver specific, none of them really stand out if you aren't using the relevant hardware but they're all useful if you do happen to have an affected device. ---------------------------------------------------------------- Andreas Dannenberg (1): ASoC: tas2552: fix dBscale-min declaration Benoît Thébaudeau (1): ASoC: imx-ssi: Fix DAI hardware signal inversions Gianluca Renzi (2): ASoC: sgtl5000: fix error message output for MicBias voltage ASoC: sgtl5000: fix wrong register MIC_BIAS_VOLTAGE setup on probe Jiada Wang (1): ASoC: wm8962: balance pm_runtime_enable Lars-Peter Clausen (1): ASoC: db1200: Fix DAI link format for db1300 and db1550 Mark Brown (3): MAINTAINERS: Remove wm97xx entry Merge remote-tracking branches 'asoc/fix/db1200', 'asoc/fix/dwc', 'asoc/fix/imx-ssi', 'asoc/fix/maintainers', 'asoc/fix/rt5645', 'asoc/fix/sgtl5000' and 'asoc/fix/tas2552' into asoc-linus Merge remote-tracking branches 'asoc/fix/tlv320aic3x' and 'asoc/fix/wm8962' into asoc-linus Oder Chiou (1): ASoC: rt5645: Correct the naming and setting of ADC Boost Volume Control Rick Mann (1): ASoC: tlv320aic3x: Prevent writing reserved registers on tlv320aic3104 CODECs Yitian Bu (1): ASoC: dwc: correct irq clear method yitian (1): ASoC: dwc: fix dma stop transferring issue MAINTAINERS | 9 --------- sound/soc/au1x/db1200.c | 4 ++++ sound/soc/codecs/rt5645.c | 6 +++--- sound/soc/codecs/rt5645.h | 16 +++++++++------- sound/soc/codecs/sgtl5000.c | 6 +++--- sound/soc/codecs/tas2552.c | 2 +- sound/soc/codecs/tlv320aic3x.c | 19 +++++++++++-------- sound/soc/codecs/wm8962.c | 5 ++++- sound/soc/dwc/designware_i2s.c | 19 ++++++++++++++----- sound/soc/fsl/imx-ssi.c | 19 +++++++++---------- 10 files changed, 58 insertions(+), 47 deletions(-)

1 0

[alsa-devel] [PATCH v4 0/8] Add DSP topology management for SKL
by Vinod Koul 07 Oct '15

07 Oct '15

The SKL driver does not code DSP topology in driver. With this series the ASoC topology framework is used to parse the topology information to create widgets, controls and route map for the FW topology. It adds routines for SKL DSP module configuration, compute resources for modules, initialize and bind the pipe modules. It uses the SKL IPC library added earlier to send IPC for initialize the module, bind/unbind modules. Last patch in this series removes the unused dais. changes in v4: - rename resource allocators and add resource deallocator - remove bind_unbind and add in callng fn - fix some 80char warns - some minor cleanup at odd places changes in v3: - removeno/less logic wrappers - remove most of debug prints, few kept - use asoc widget list macros instead of using list_for_xxx - fix one instance of no empty line between two functions - fix tplg event ID > 255 - add more comments for locking, usage of widget list and few other places, fixed few error prints, add file name etc changes in v2: - add more explanation in changelog and code - add explanation of MCPS - fix whitespace issues - remove skl widget check on event handler as it is redundant - add switch for depth - add else for direction based code - remove cast for NHLT blob query - make debug prints to error - remove dump info - clean some debug prints Jeeja KP (5): ASoC: Intel: Skylake: Add pipe and modules handlers ASoC: Intel: Skylake: Add module configuration helpers ASoC: Intel: Skylake: Initialize and load DSP controls ASoC: Intel: Skylake: Add DSP support and enable it ASoC: Intel: Skylake: Initialize NHLT table Vinod Koul (3): ASoC: Intel: Skylake: add DSP platform widget event handlers ASoC: Intel: Skylake: Add FE and BE hw_params handling ASoC: Intel: Skylake: Add topology core init and handlers sound/soc/intel/Kconfig | 1 + sound/soc/intel/skylake/Makefile | 3 +- sound/soc/intel/skylake/skl-pcm.c | 141 ++- sound/soc/intel/skylake/skl-topology.c | 1238 ++++++++++++++++++++++++++ sound/soc/intel/skylake/skl-topology.h | 28 + sound/soc/intel/skylake/skl-tplg-interface.h | 80 ++ sound/soc/intel/skylake/skl.c | 29 +- sound/soc/intel/skylake/skl.h | 11 + 8 files changed, 1495 insertions(+), 36 deletions(-) create mode 100644 sound/soc/intel/skylake/skl-topology.c -- 2.4.3

3 15

[alsa-devel] [PATCH v3 0/8] Add DSP topology management for SKL
by Vinod Koul 07 Oct '15

07 Oct '15

The SKL driver does not code DSP topology in driver. With this series the ASoC topology framework is used to parse the topology information to create widgets, controls and route map for the FW topology. It adds routines for SKL DSP module configuration, compute resources for modules, initialize and bind the pipe modules. It uses the SKL IPC library added earlier to send IPC for initialize the module, bind/unbind modules. Last patch in this series removes the unused dais. changes in v3: - removeno/less logic wrappers - remove most of debug prints, few kept - use asoc widget list macros instead of using list_for_xxx - fix one instance of no empty line between two functions - fix tplg event ID > 255 - add more comments for locking, usage of widget list and few other places, fixed few error prints, add file name etc changes in v2: - add more explanation in changelog and code - add explanation of MCPS - fix whitespace issues - remove skl widget check on event handler as it is redundant - add switch for depth - add else for direction based code - remove cast for NHLT blob query - make debug prints to error - remove dump info - clean some debug prints Jeeja KP (6): ASoC: Intel: Skylake: Add pipe and modules handlers ASoC: Intel: Skylake: Add module configuration helpers ASoC: Intel: Skylake: add DSP platform widget event handlers ASoC: Intel: Skylake: Initialize and load DSP controls ASoC: Intel: Skylake: Add DSP support and enable it ASoC: Intel: Skylake: Initialize NHLT table Vinod Koul (2): ASoC: Intel: Skylake: Add FE and BE hw_params handling ASoC: Intel: Skylake: Add topology core init and handlers sound/soc/intel/Kconfig | 1 + sound/soc/intel/skylake/Makefile | 3 +- sound/soc/intel/skylake/skl-pcm.c | 143 +++- sound/soc/intel/skylake/skl-topology.c | 1185 ++++++++++++++++++++++++++ sound/soc/intel/skylake/skl-topology.h | 28 + sound/soc/intel/skylake/skl-tplg-interface.h | 80 ++ sound/soc/intel/skylake/skl.c | 29 +- sound/soc/intel/skylake/skl.h | 11 + 8 files changed, 1443 insertions(+), 37 deletions(-) create mode 100644 sound/soc/intel/skylake/skl-topology.c -- 1.9.1

3 11

[alsa-devel] [PATCH 00/13] Add DSP topology management for SKL
by Subhransu S. Prusty 07 Oct '15

07 Oct '15

The SKL driver does not code DSP topology in driver. With this series the soc topology framework is used to parse the topology information to create widgets, controls and route map for the FW topology. It adds routines for SKL DSP module configuration, add building blocks to instanatiate modules and pipes. It uses SKL IPC library added earlier to send IPC for initialize the module, bind/unbind modules, create pipeline and manage them. Last patch in this series removes the unused dais. Hardik T Shah (1): ASoC: Intel: Skylake: Add helpers for SRC and converter modules Jeeja KP (12): ASoC: Intel: Skylake: Add helpers for DSP module configuration ASoC: Intel: Skylake: Add DSP module init and binding routines ASoC: Intel: Skylake: Add pipe management helpers ASoC: Intel: Skylake: Add pipe and modules handlers ASoC: Intel: Skylake: Add module configuration helpers ASoC: Intel: Skylake: add DSP platform widget event handlers ASoC: Intel: Skylake: Add FE and BE hw_params handling ASoC: Intel: Skylake: Add topology core init and handlers ASoC: Intel: Skylake: Initialize and load DSP controls ASoC: Intel: Skylake: Add DSP support and enable it ASoC: Intel: Skylake: Initialize NHLT table ASoC: Intel: Skylake: Remove CPU dai that is not used sound/soc/intel/skylake/Makefile | 3 +- sound/soc/intel/skylake/skl-messages.c | 751 +++++++++++++++ sound/soc/intel/skylake/skl-pcm.c | 173 ++-- sound/soc/intel/skylake/skl-topology.c | 1264 ++++++++++++++++++++++++++ sound/soc/intel/skylake/skl-topology.h | 307 +++++++ sound/soc/intel/skylake/skl-tplg-interface.h | 166 ++++ sound/soc/intel/skylake/skl.c | 29 +- sound/soc/intel/skylake/skl.h | 11 + 8 files changed, 2636 insertions(+), 68 deletions(-) create mode 100644 sound/soc/intel/skylake/skl-topology.c create mode 100644 sound/soc/intel/skylake/skl-topology.h create mode 100644 sound/soc/intel/skylake/skl-tplg-interface.h -- 2.4.3

2 17

[alsa-devel] [PATCH] ALSA: bebob: support Firewire I/O card of Mackie Onyx 1220/1620/1640
by Takashi Sakamoto 07 Oct '15

07 Oct '15

Current ALSA BeBoB drivers has an entry for this model, while the value of vendor ID seems to be wrong according to an user's report. The vendor had released no updated firmware, thus we can judge that this model had not changed the content of its config ROM. It's reasonable to fix the ID according to the report. $ ./linux-firewire-utils/src/crpp < /sys/bus/firewire/devices/fw1/config_rom ROM header and bus information block ----------------------------------------------------------------- 400 0425720f bus_info_length 4, crc_length 37, crc 29199 404 31333934 bus_name "1394" 408 f0646122 irmc 1, cmc 1, isc 1, bmc 1, pmc 0, cyc_clk_acc 100, max_rec 6 (128), max_rom 1, gen 2, spd 2 (S400) 40c 00000ff2 company_id 00000f | 410 00004697 device_id f200004697 | EUI-64 00000ff200004697 root directory ----------------------------------------------------------------- 414 000859be directory_length 8, crc 22974 418 04000082 hardware version 41c 0c0083c0 node capabilities per IEEE 1394 420 03000ff2 vendor 424 8100000a --> descriptor leaf at 44c 428 17010065 model 42c 8100000d --> descriptor leaf at 460 430 13000910 version 434 d1000001 --> unit directory at 438 unit directory at 438 ----------------------------------------------------------------- 438 0004ccec directory_length 4, crc 52460 43c 1200a02d specifier id: 1394 TA 440 13010001 version: AV/C 444 17010065 model 448 8100000d --> descriptor leaf at 47c descriptor leaf at 44c ----------------------------------------------------------------- 44c 0004152a leaf_length 4, crc 5418 450 00000000 textual descriptor 454 00000000 minimal ASCII 458 4d61636b "Mack" 45c 69650000 "ie" descriptor leaf at 460 ----------------------------------------------------------------- 460 000612b5 leaf_length 6, crc 4789 464 00000000 textual descriptor 468 00000000 minimal ASCII 46c 4f6e7978 "Onyx" 470 20466972 " Fir" 474 65776972 "ewir" 478 65000000 "e" descriptor leaf at 47c ----------------------------------------------------------------- 47c 000612b5 leaf_length 6, crc 4789 480 00000000 textual descriptor 484 00000000 minimal ASCII 488 4f6e7978 "Onyx" 48c 20466972 " Fir" 490 65776972 "ewir" 494 65000000 "e" $ cat /proc/asound/card3/firewire/firmware Manufacturer: bridgeCo Protocol Ver: 1 Build Ver: 0 GUID: 0x00000FF200004697 Model ID: 0x82 Model Rev: 1 Firmware Date: 20040430 Firmware Time: 131527 Firmware ID: 0x10065 Firmware Ver: 2320 Base Addr: 0x20080000 Max Size: 1572864 Loader Date: 20040430 Loader Time: 112036 Reported-by: Andrzej Gansiniec <andrzej(a)gansiniec.pl> Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- sound/firewire/bebob/bebob.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sound/firewire/bebob/bebob.c b/sound/firewire/bebob/bebob.c index 27a04ac..0ed5e5f 100644 --- a/sound/firewire/bebob/bebob.c +++ b/sound/firewire/bebob/bebob.c @@ -41,7 +41,8 @@ static DECLARE_BITMAP(devices_used, SNDRV_CARDS); #define VEN_EDIROL 0x000040ab #define VEN_PRESONUS 0x00000a92 #define VEN_BRIDGECO 0x000007f5 -#define VEN_MACKIE 0x0000000f +#define VEN_MACKIE1 0x0000000f +#define VEN_MACKIE2 0x00000ff2 #define VEN_STANTON 0x00001260 #define VEN_TASCAM 0x0000022e #define VEN_BEHRINGER 0x00001564 @@ -360,9 +361,9 @@ static const struct ieee1394_device_id bebob_id_table[] = { /* BridgeCo, Audio5 */ SND_BEBOB_DEV_ENTRY(VEN_BRIDGECO, 0x00010049, &spec_normal), /* Mackie, Onyx 1220/1620/1640 (Firewire I/O Card) */ - SND_BEBOB_DEV_ENTRY(VEN_MACKIE, 0x00010065, &spec_normal), + SND_BEBOB_DEV_ENTRY(VEN_MACKIE2, 0x00010065, &spec_normal), /* Mackie, d.2 (Firewire Option) */ - SND_BEBOB_DEV_ENTRY(VEN_MACKIE, 0x00010067, &spec_normal), + SND_BEBOB_DEV_ENTRY(VEN_MACKIE1, 0x00010067, &spec_normal), /* Stanton, ScratchAmp */ SND_BEBOB_DEV_ENTRY(VEN_STANTON, 0x00000001, &spec_normal), /* Tascam, IF-FW DM */ -- 2.1.4

3 3

[alsa-devel] Applied "ASoC: rsnd: Remove obsolete platform data support" to the asoc tree
by Mark Brown 07 Oct '15

07 Oct '15

The patch ASoC: rsnd: Remove obsolete platform data support has been applied to the asoc tree at git://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 dcc448e619194098b24477a6d56af50c57f26f1d Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven <geert+renesas(a)glider.be> Date: Wed, 7 Oct 2015 12:42:22 +0200 Subject: [PATCH] ASoC: rsnd: Remove obsolete platform data support Since commit 3d7608e4c169af03 ("ARM: shmobile: bockw: remove legacy board file and config"), Renesas R-Car SoCs are only supported in generic DT-only ARM multi-platform builds. The driver doesn't need to use platform data anymore, hence remove platform data configuration. Move <sound/rcar_snd.h> to sound/soc/sh/rcar/, as it's no longer needed by platform code. Signed-off-by: Geert Uytterhoeven <geert+renesas(a)glider.be> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/sh/rcar/core.c | 19 +++++-------------- {include/sound => sound/soc/sh/rcar}/rcar_snd.h | 0 sound/soc/sh/rcar/rsnd.h | 3 ++- sound/soc/sh/rcar/ssi.c | 3 --- 4 files changed, 7 insertions(+), 18 deletions(-) rename {include/sound => sound/soc/sh/rcar}/rcar_snd.h (100%) diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index eec294d..6ef9a88 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -1236,20 +1236,11 @@ static int rsnd_probe(struct platform_device *pdev) }; int ret, i; - info = NULL; - of_data = NULL; - if (of_id) { - info = devm_kzalloc(&pdev->dev, - sizeof(struct rcar_snd_info), GFP_KERNEL); - of_data = of_id->data; - } else { - info = pdev->dev.platform_data; - } - - if (!info) { - dev_err(dev, "driver needs R-Car sound information\n"); - return -ENODEV; - } + info = devm_kzalloc(&pdev->dev, sizeof(struct rcar_snd_info), + GFP_KERNEL); + if (!info) + return -ENOMEM; + of_data = of_id->data; /* * init priv data diff --git a/include/sound/rcar_snd.h b/sound/soc/sh/rcar/rcar_snd.h similarity index 100% rename from include/sound/rcar_snd.h rename to sound/soc/sh/rcar/rcar_snd.h diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h index e4068d7..e9fef53 100644 --- a/sound/soc/sh/rcar/rsnd.h +++ b/sound/soc/sh/rcar/rsnd.h @@ -21,10 +21,11 @@ #include <linux/of_irq.h> #include <linux/sh_dma.h> #include <linux/workqueue.h> -#include <sound/rcar_snd.h> #include <sound/soc.h> #include <sound/pcm_params.h> +#include "rcar_snd.h" + /* * pseudo register * diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index 5e05f942..842a35b 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c @@ -700,9 +700,6 @@ static void rsnd_of_parse_ssi(struct platform_device *pdev, struct device *dev = &pdev->dev; int nr, i; - if (!of_data) - return; - node = rsnd_ssi_of_node(priv); if (!node) return; -- 2.5.0

1 0

[alsa-devel] Applied "ASoC: da7213: Add DT support to codec driver" to the asoc tree
by Mark Brown 07 Oct '15

07 Oct '15

The patch ASoC: da7213: Add DT support to codec driver has been applied to the asoc tree at git://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 e90996a3ea224fbeb459b8052ecd366d7990e1f3 Mon Sep 17 00:00:00 2001 From: Adam Thomson <Adam.Thomson.Opensource(a)diasemi.com> Date: Wed, 7 Oct 2015 14:27:08 +0100 Subject: [PATCH] ASoC: da7213: Add DT support to codec driver This patch adds support for DT bindings in the codec driver. As part of this support, the mclk data can now be provided and used to control the mclk during codec operation. Signed-off-by: Adam Thomson <Adam.Thomson.Opensource(a)diasemi.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/codecs/da7213.c | 123 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 118 insertions(+), 5 deletions(-) diff --git a/sound/soc/codecs/da7213.c b/sound/soc/codecs/da7213.c index a9c86ef..ab1486b 100644 --- a/sound/soc/codecs/da7213.c +++ b/sound/soc/codecs/da7213.c @@ -1387,10 +1387,118 @@ static int da7213_set_bias_level(struct snd_soc_codec *codec, return 0; } +/* DT */ +static const struct of_device_id da7213_of_match[] = { + { .compatible = "dlg,da7213", }, + { } +}; +MODULE_DEVICE_TABLE(of, da7213_of_match); + +static enum da7213_micbias_voltage + da7213_of_micbias_lvl(struct snd_soc_codec *codec, u32 val) +{ + switch (val) { + case 1600: + return DA7213_MICBIAS_1_6V; + case 2200: + return DA7213_MICBIAS_2_2V; + case 2500: + return DA7213_MICBIAS_2_5V; + case 3000: + return DA7213_MICBIAS_3_0V; + default: + dev_warn(codec->dev, "Invalid micbias level\n"); + return DA7213_MICBIAS_2_2V; + } +} + +static enum da7213_dmic_data_sel + da7213_of_dmic_data_sel(struct snd_soc_codec *codec, const char *str) +{ + if (!strcmp(str, "lrise_rfall")) { + return DA7213_DMIC_DATA_LRISE_RFALL; + } else if (!strcmp(str, "lfall_rrise")) { + return DA7213_DMIC_DATA_LFALL_RRISE; + } else { + dev_warn(codec->dev, "Invalid DMIC data select type\n"); + return DA7213_DMIC_DATA_LRISE_RFALL; + } +} + +static enum da7213_dmic_samplephase + da7213_of_dmic_samplephase(struct snd_soc_codec *codec, const char *str) +{ + if (!strcmp(str, "on_clkedge")) { + return DA7213_DMIC_SAMPLE_ON_CLKEDGE; + } else if (!strcmp(str, "between_clkedge")) { + return DA7213_DMIC_SAMPLE_BETWEEN_CLKEDGE; + } else { + dev_warn(codec->dev, "Invalid DMIC sample phase\n"); + return DA7213_DMIC_SAMPLE_ON_CLKEDGE; + } +} + +static enum da7213_dmic_clk_rate + da7213_of_dmic_clkrate(struct snd_soc_codec *codec, u32 val) +{ + switch (val) { + case 1500000: + return DA7213_DMIC_CLK_1_5MHZ; + case 3000000: + return DA7213_DMIC_CLK_3_0MHZ; + default: + dev_warn(codec->dev, "Invalid DMIC clock rate\n"); + return DA7213_DMIC_CLK_1_5MHZ; + } +} + +static struct da7213_platform_data + *da7213_of_to_pdata(struct snd_soc_codec *codec) +{ + struct device_node *np = codec->dev->of_node; + struct da7213_platform_data *pdata; + const char *of_str; + u32 of_val32; + + pdata = devm_kzalloc(codec->dev, sizeof(*pdata), GFP_KERNEL); + if (!pdata) { + dev_warn(codec->dev, "Failed to allocate memory for pdata\n"); + return NULL; + } + + if (of_property_read_u32(np, "dlg,micbias1-lvl", &of_val32) >= 0) + pdata->micbias1_lvl = da7213_of_micbias_lvl(codec, of_val32); + else + pdata->micbias1_lvl = DA7213_MICBIAS_2_2V; + + if (of_property_read_u32(np, "dlg,micbias2-lvl", &of_val32) >= 0) + pdata->micbias2_lvl = da7213_of_micbias_lvl(codec, of_val32); + else + pdata->micbias2_lvl = DA7213_MICBIAS_2_2V; + + if (!of_property_read_string(np, "dlg,dmic-data-sel", &of_str)) + pdata->dmic_data_sel = da7213_of_dmic_data_sel(codec, of_str); + else + pdata->dmic_data_sel = DA7213_DMIC_DATA_LRISE_RFALL; + + if (!of_property_read_string(np, "dlg,dmic-samplephase", &of_str)) + pdata->dmic_samplephase = + da7213_of_dmic_samplephase(codec, of_str); + else + pdata->dmic_samplephase = DA7213_DMIC_SAMPLE_ON_CLKEDGE; + + if (of_property_read_u32(np, "dlg,dmic-clkrate", &of_val32) >= 0) + pdata->dmic_clk_rate = da7213_of_dmic_clkrate(codec, of_val32); + else + pdata->dmic_clk_rate = DA7213_DMIC_CLK_3_0MHZ; + + return pdata; +} + + static int da7213_probe(struct snd_soc_codec *codec) { struct da7213_priv *da7213 = snd_soc_codec_get_drvdata(codec); - struct da7213_platform_data *pdata = da7213->pdata; /* Default to using ALC auto offset calibration mode. */ snd_soc_update_bits(codec, DA7213_ALC_CTRL1, @@ -1450,8 +1558,15 @@ static int da7213_probe(struct snd_soc_codec *codec) snd_soc_update_bits(codec, DA7213_LINE_CTRL, DA7213_LINE_AMP_OE, DA7213_LINE_AMP_OE); + /* Handle DT/Platform data */ + if (codec->dev->of_node) + da7213->pdata = da7213_of_to_pdata(codec); + else + da7213->pdata = dev_get_platdata(codec->dev); + /* Set platform data values */ if (da7213->pdata) { + struct da7213_platform_data *pdata = da7213->pdata; u8 micbias_lvl = 0, dmic_cfg = 0; /* Set Mic Bias voltages */ @@ -1507,6 +1622,7 @@ static int da7213_probe(struct snd_soc_codec *codec) /* Set MCLK squaring */ da7213->mclk_squarer_en = pdata->mclk_squaring; } + return 0; } @@ -1537,7 +1653,6 @@ static int da7213_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) { struct da7213_priv *da7213; - struct da7213_platform_data *pdata = dev_get_platdata(&i2c->dev); int ret; da7213 = devm_kzalloc(&i2c->dev, sizeof(struct da7213_priv), @@ -1545,9 +1660,6 @@ static int da7213_i2c_probe(struct i2c_client *i2c, if (!da7213) return -ENOMEM; - if (pdata) - da7213->pdata = pdata; - i2c_set_clientdata(i2c, da7213); da7213->regmap = devm_regmap_init_i2c(i2c, &da7213_regmap_config); @@ -1582,6 +1694,7 @@ MODULE_DEVICE_TABLE(i2c, da7213_i2c_id); static struct i2c_driver da7213_i2c_driver = { .driver = { .name = "da7213", + .of_match_table = of_match_ptr(da7213_of_match), }, .probe = da7213_i2c_probe, .remove = da7213_remove, -- 2.5.0

1 0

[alsa-devel] Applied "ASoC: da7213: Add support to handle mclk data provided to driver" to the asoc tree
by Mark Brown 07 Oct '15

07 Oct '15

The patch ASoC: da7213: Add support to handle mclk data provided to driver has been applied to the asoc tree at git://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 6e7c444318699496e6e6f30c875cf67534aeccc6 Mon Sep 17 00:00:00 2001 From: Adam Thomson <Adam.Thomson.Opensource(a)diasemi.com> Date: Wed, 7 Oct 2015 14:27:11 +0100 Subject: [PATCH] ASoC: da7213: Add support to handle mclk data provided to driver Driver now can make use of mclk data, if provided, to set, enable and disable the clock source. As part of this, the choice to enable clock squaring is dealt with as part of dai_sysclk() call rather than as platform data. Signed-off-by: Adam Thomson <Adam.Thomson.Opensource(a)diasemi.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- include/sound/da7213.h | 3 --- sound/soc/codecs/da7213.c | 67 +++++++++++++++++++++++++++++++++++++++-------- sound/soc/codecs/da7213.h | 8 ++++-- 3 files changed, 62 insertions(+), 16 deletions(-) diff --git a/include/sound/da7213.h b/include/sound/da7213.h index 673f5c3..e7eac89 100644 --- a/include/sound/da7213.h +++ b/include/sound/da7213.h @@ -44,9 +44,6 @@ struct da7213_platform_data { enum da7213_dmic_data_sel dmic_data_sel; enum da7213_dmic_samplephase dmic_samplephase; enum da7213_dmic_clk_rate dmic_clk_rate; - - /* MCLK squaring config */ - bool mclk_squaring; }; #endif /* _DA7213_PDATA_H */ diff --git a/sound/soc/codecs/da7213.c b/sound/soc/codecs/da7213.c index ab1486b..7278f93 100644 --- a/sound/soc/codecs/da7213.c +++ b/sound/soc/codecs/da7213.c @@ -12,6 +12,7 @@ * option) any later version. */ +#include <linux/clk.h> #include <linux/delay.h> #include <linux/i2c.h> #include <linux/regmap.h> @@ -1222,23 +1223,44 @@ static int da7213_set_dai_sysclk(struct snd_soc_dai *codec_dai, { struct snd_soc_codec *codec = codec_dai->codec; struct da7213_priv *da7213 = snd_soc_codec_get_drvdata(codec); + int ret = 0; + + if ((da7213->clk_src == clk_id) && (da7213->mclk_rate == freq)) + return 0; + + if (((freq < 5000000) && (freq != 32768)) || (freq > 54000000)) { + dev_err(codec_dai->dev, "Unsupported MCLK value %d\n", + freq); + return -EINVAL; + } switch (clk_id) { case DA7213_CLKSRC_MCLK: - if ((freq == 32768) || - ((freq >= 5000000) && (freq <= 54000000))) { - da7213->mclk_rate = freq; - return 0; - } else { - dev_err(codec_dai->dev, "Unsupported MCLK value %d\n", - freq); - return -EINVAL; - } + da7213->mclk_squarer_en = false; + break; + case DA7213_CLKSRC_MCLK_SQR: + da7213->mclk_squarer_en = true; break; default: dev_err(codec_dai->dev, "Unknown clock source %d\n", clk_id); return -EINVAL; } + + da7213->clk_src = clk_id; + + if (da7213->mclk) { + freq = clk_round_rate(da7213->mclk, freq); + ret = clk_set_rate(da7213->mclk, freq); + if (ret) { + dev_err(codec_dai->dev, "Failed to set clock rate %d\n", + freq); + return ret; + } + } + + da7213->mclk_rate = freq; + + return 0; } /* Supported PLL input frequencies are 5MHz - 54MHz. */ @@ -1366,12 +1388,25 @@ static struct snd_soc_dai_driver da7213_dai = { static int da7213_set_bias_level(struct snd_soc_codec *codec, enum snd_soc_bias_level level) { + struct da7213_priv *da7213 = snd_soc_codec_get_drvdata(codec); + int ret; + switch (level) { case SND_SOC_BIAS_ON: case SND_SOC_BIAS_PREPARE: break; case SND_SOC_BIAS_STANDBY: if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_OFF) { + /* MCLK */ + if (da7213->mclk) { + ret = clk_prepare_enable(da7213->mclk); + if (ret) { + dev_err(codec->dev, + "Failed to enable mclk\n"); + return ret; + } + } + /* Enable VMID reference & master bias */ snd_soc_update_bits(codec, DA7213_REFERENCES, DA7213_VMID_EN | DA7213_BIAS_EN, @@ -1382,6 +1417,10 @@ static int da7213_set_bias_level(struct snd_soc_codec *codec, /* Disable VMID reference & master bias */ snd_soc_update_bits(codec, DA7213_REFERENCES, DA7213_VMID_EN | DA7213_BIAS_EN, 0); + + /* MCLK */ + if (da7213->mclk) + clk_disable_unprepare(da7213->mclk); break; } return 0; @@ -1618,9 +1657,15 @@ static int da7213_probe(struct snd_soc_codec *codec) DA7213_DMIC_DATA_SEL_MASK | DA7213_DMIC_SAMPLEPHASE_MASK | DA7213_DMIC_CLK_RATE_MASK, dmic_cfg); + } - /* Set MCLK squaring */ - da7213->mclk_squarer_en = pdata->mclk_squaring; + /* Check if MCLK provided */ + da7213->mclk = devm_clk_get(codec->dev, "mclk"); + if (IS_ERR(da7213->mclk)) { + if (PTR_ERR(da7213->mclk) != -ENOENT) + return PTR_ERR(da7213->mclk); + else + da7213->mclk = NULL; } return 0; diff --git a/sound/soc/codecs/da7213.h b/sound/soc/codecs/da7213.h index 9cb9ddd..030fd69 100644 --- a/sound/soc/codecs/da7213.h +++ b/sound/soc/codecs/da7213.h @@ -13,6 +13,7 @@ #ifndef _DA7213_H #define _DA7213_H +#include <linux/clk.h> #include <linux/regmap.h> #include <sound/da7213.h> @@ -504,14 +505,17 @@ #define DA7213_PLL_INDIV_20_40_MHZ_VAL 8 #define DA7213_PLL_INDIV_40_54_MHZ_VAL 16 -enum clk_src { - DA7213_CLKSRC_MCLK +enum da7213_clk_src { + DA7213_CLKSRC_MCLK = 0, + DA7213_CLKSRC_MCLK_SQR, }; /* Codec private data */ struct da7213_priv { struct regmap *regmap; + struct clk *mclk; unsigned int mclk_rate; + int clk_src; bool master; bool mclk_squarer_en; bool srm_en; -- 2.5.0

1 0

[alsa-devel] [PATCH 0/2] ASoC: da7213: Add DT support for codec
by Adam Thomson 07 Oct '15

07 Oct '15

This patch set adds DT support to the codec driver, and supporting bindings documentation. Patch set is based against v4.3-rc4 Adam Thomson (2): ASoC: da7213: Add DT support to codec driver ASoC: da7213: Add bindings documentation for codec driver Documentation/devicetree/bindings/sound/da7213.txt | 41 +++++ sound/soc/codecs/da7213.c | 181 +++++++++++++++++++-- sound/soc/codecs/da7213.h | 8 +- 3 files changed, 212 insertions(+), 18 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/da7213.txt -- 1.9.3

3 5

[alsa-devel] Applied "ASoC: rsnd: Remove obsolete platform data support" to the asoc tree
by Mark Brown 07 Oct '15

07 Oct '15

The patch ASoC: rsnd: Remove obsolete platform data support has been applied to the asoc tree at git://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 971a41f034ce46c82f3ab7abebe14c2d1bc54e17 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven <geert+renesas(a)glider.be> Date: Wed, 7 Oct 2015 12:42:22 +0200 Subject: [PATCH] ASoC: rsnd: Remove obsolete platform data support Since commit 3d7608e4c169af03 ("ARM: shmobile: bockw: remove legacy board file and config"), Renesas R-Car SoCs are only supported in generic DT-only ARM multi-platform builds. The driver doesn't need to use platform data anymore, hence remove platform data configuration. Move <sound/rcar_snd.h> to sound/soc/sh/rcar/, as it's no longer needed by platform code. Signed-off-by: Geert Uytterhoeven <geert+renesas(a)glider.be> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/sh/rcar/core.c | 19 +++++-------------- {include/sound => sound/soc/sh/rcar}/rcar_snd.h | 0 sound/soc/sh/rcar/rsnd.h | 3 ++- sound/soc/sh/rcar/ssi.c | 3 --- 4 files changed, 7 insertions(+), 18 deletions(-) rename {include/sound => sound/soc/sh/rcar}/rcar_snd.h (100%) diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index f3feed5..00bf1ff 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -1224,20 +1224,11 @@ static int rsnd_probe(struct platform_device *pdev) }; int ret, i; - info = NULL; - of_data = NULL; - if (of_id) { - info = devm_kzalloc(&pdev->dev, - sizeof(struct rcar_snd_info), GFP_KERNEL); - of_data = of_id->data; - } else { - info = pdev->dev.platform_data; - } - - if (!info) { - dev_err(dev, "driver needs R-Car sound information\n"); - return -ENODEV; - } + info = devm_kzalloc(&pdev->dev, sizeof(struct rcar_snd_info), + GFP_KERNEL); + if (!info) + return -ENOMEM; + of_data = of_id->data; /* * init priv data diff --git a/include/sound/rcar_snd.h b/sound/soc/sh/rcar/rcar_snd.h similarity index 100% rename from include/sound/rcar_snd.h rename to sound/soc/sh/rcar/rcar_snd.h diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h index 7a0e52b..f604f69 100644 --- a/sound/soc/sh/rcar/rsnd.h +++ b/sound/soc/sh/rcar/rsnd.h @@ -21,10 +21,11 @@ #include <linux/of_irq.h> #include <linux/sh_dma.h> #include <linux/workqueue.h> -#include <sound/rcar_snd.h> #include <sound/soc.h> #include <sound/pcm_params.h> +#include "rcar_snd.h" + /* * pseudo register * diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index d45b9a7..3f5f195 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c @@ -697,9 +697,6 @@ static void rsnd_of_parse_ssi(struct platform_device *pdev, struct device *dev = &pdev->dev; int nr, i; - if (!of_data) - return; - node = rsnd_ssi_of_node(priv); if (!node) return; -- 2.5.0

1 0

[alsa-devel] [PATCH] ASoC: sun4i-codec: Remove the routing property
by Maxime Ripard 07 Oct '15

07 Oct '15

Most of the boards have their headphone jack directly connected to the matching pins of the SoCs. Since most of the time we will have the same routing path, it makes no sense to put that in the DTS, since it will only be some useless duplication there. It also fixes the following warning messages that were seen so far, on boards where we were using the bindings in the documentation example. sun4i-codec 1c22c00.codec: ASoC: no sink widget found for Headphone Jack sun4i-codec 1c22c00.codec: ASoC: Failed to add route HP Left -> direct -> Headphone Jack sun4i-codec 1c22c00.codec: ASoC: no sink widget found for Headphone Jack sun4i-codec 1c22c00.codec: ASoC: Failed to add route HP Right -> direct -> Headphone Jack Reported-by: Priit Laes <plaes(a)plaes.org> Signed-off-by: Maxime Ripard <maxime.ripard(a)free-electrons.com> --- Documentation/devicetree/bindings/sound/sun4i-codec.txt | 6 ------ sound/soc/sunxi/sun4i-codec.c | 7 ------- 2 files changed, 13 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/sun4i-codec.txt b/Documentation/devicetree/bindings/sound/sun4i-codec.txt index 680144b74ae9..c92966bd5488 100644 --- a/Documentation/devicetree/bindings/sound/sun4i-codec.txt +++ b/Documentation/devicetree/bindings/sound/sun4i-codec.txt @@ -13,10 +13,6 @@ Required properties: - clock-names: should contain followings: - "apb": the parent APB clock for this controller - "codec": the parent module clock -- routing : A list of the connections between audio components. Each - entry is a pair of strings, the first being the connection's sink, - the second being the connection's source. - Example: codec: codec@01c22c00 { @@ -28,6 +24,4 @@ codec: codec@01c22c00 { clock-names = "apb", "codec"; dmas = <&dma 0 19>, <&dma 0 19>; dma-names = "rx", "tx"; - routing = "Headphone Jack", "HP Right", - "Headphone Jack", "HP Left"; }; diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c index 47780552dcd0..bcbf4da168b6 100644 --- a/sound/soc/sunxi/sun4i-codec.c +++ b/sound/soc/sunxi/sun4i-codec.c @@ -571,7 +571,6 @@ static struct snd_soc_dai_link *sun4i_codec_create_link(struct device *dev, static struct snd_soc_card *sun4i_codec_create_card(struct device *dev) { struct snd_soc_card *card; - int ret; card = devm_kzalloc(dev, sizeof(*card), GFP_KERNEL); if (!card) @@ -584,12 +583,6 @@ static struct snd_soc_card *sun4i_codec_create_card(struct device *dev) card->dev = dev; card->name = "sun4i-codec"; - ret = snd_soc_of_parse_audio_routing(card, "routing"); - if (ret) { - dev_err(dev, "Failed to create our audio routing\n"); - return NULL; - } - return card; }; -- 2.5.3

2 1

[alsa-devel] [PATCH 0/2] ASoC: da7219: Improve mclk error checking, use of_match_ptr
by Adam Thomson 07 Oct '15

07 Oct '15

This patch set contains a couple of small updates/fixes: - Use of of_match_ptr() for assigning match table to driver structure - Only enable/disable mclk if it has been provided to the driver. - Add error checking of clk_prepare_enable. Patch set is based on changes introduced under patch: 'ASoC: da7219: Improve error handling for regulator supplies' (Commit 4e929134eb8271abc9c52c371e056debfea6898b , kernel/git/broonie/sound.git) Adam Thomson (2): ASoC: da7219: Use of_match_ptr() when assigning match table ASoC: da7219: Improve error checking of mclk enable/disable sound/soc/codecs/da7219.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) -- 1.9.3

2 4

[alsa-devel] [PATCH 00/18] ALSA: hdac: move hdac helpers to core
by Vinod Koul 07 Oct '15

07 Oct '15

Hi Takashi, Here is the second version which updates the users. This update was done using coccinelle scripts. I also noticed that the coccinelle is reformaing the change lines, but changes looked good to me so I have kept them, please do let me know if you would like these to be removed. Subhransu S. Prusty (1): ALSA: hdac: Copy codec helpers to core Vinod Koul (17): ALSA: hda: move hda beep to use hdac helpers ALSA: hda: move hda_eld to use hdac helpers ALSA: hda: move hda_generic to use hdac helpers ALSA: hda: move hda_hwdep to use hdac helpers ALSA: hda: move hda_jack to use hdac helpers ALSA: hda: move hda_proc to use hdac helpers ALSA: hda: move patch_analog to use hdac helpers ALSA: hda: move patch_ca0132.c to use hdac helpers ALSA: hda: move patch_cirrus to use hdac helpers ALSA: hda: move to use hdac helpers ALSA: hda: move patch_hdmi to use hdac helpers ALSA: hda: move patch_realtek to use hdac helpers ALSA: hda: move patch_si3054 to use hdac helpers ALSA: hda: move patch_sigmatel to use hdac helpers ALSA: hda: move patch_via to use hdac helpers ALSA: hda: move hda_codec to use hdac helpers ALSA: hda: remove the old helpers include/sound/hdaudio.h | 6 + sound/hda/hdac_device.c | 81 ++++++++++++ sound/pci/hda/hda_beep.c | 4 +- sound/pci/hda/hda_codec.c | 128 +++++++----------- sound/pci/hda/hda_codec.h | 5 - sound/pci/hda/hda_eld.c | 65 +++++++--- sound/pci/hda/hda_generic.c | 9 +- sound/pci/hda/hda_hwdep.c | 4 +- sound/pci/hda/hda_jack.c | 8 +- sound/pci/hda/hda_local.h | 13 -- sound/pci/hda/hda_proc.c | 80 ++++++------ sound/pci/hda/patch_analog.c | 10 +- sound/pci/hda/patch_ca0132.c | 223 ++++++++++++++++---------------- sound/pci/hda/patch_cirrus.c | 52 ++++---- sound/pci/hda/patch_conexant.c | 20 +-- sound/pci/hda/patch_hdmi.c | 285 +++++++++++++++++++++-------------------- sound/pci/hda/patch_realtek.c | 136 +++++++++++--------- sound/pci/hda/patch_si3054.c | 10 +- sound/pci/hda/patch_sigmatel.c | 78 +++++------ sound/pci/hda/patch_via.c | 14 +- 20 files changed, 660 insertions(+), 571 deletions(-) -- 2.4.3

3 20

[alsa-devel] [PATCH] ASoC: rsnd: Remove obsolete platform data support
by Geert Uytterhoeven 07 Oct '15

07 Oct '15

Since commit 3d7608e4c169af03 ("ARM: shmobile: bockw: remove legacy board file and config"), Renesas R-Car SoCs are only supported in generic DT-only ARM multi-platform builds. The driver doesn't need to use platform data anymore, hence remove platform data configuration. Move <sound/rcar_snd.h> to sound/soc/sh/rcar/, as it's no longer needed by platform code. Signed-off-by: Geert Uytterhoeven <geert+renesas(a)glider.be> --- Commit 3d7608e4c169af03 is now in arm-soc/for-next. --- sound/soc/sh/rcar/core.c | 19 +++++-------------- {include/sound => sound/soc/sh/rcar}/rcar_snd.h | 0 sound/soc/sh/rcar/rsnd.h | 3 ++- sound/soc/sh/rcar/ssi.c | 3 --- 4 files changed, 7 insertions(+), 18 deletions(-) rename {include/sound => sound/soc/sh/rcar}/rcar_snd.h (100%) diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index eec294da81e3..6ef9a884ca7c 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -1236,20 +1236,11 @@ static int rsnd_probe(struct platform_device *pdev) }; int ret, i; - info = NULL; - of_data = NULL; - if (of_id) { - info = devm_kzalloc(&pdev->dev, - sizeof(struct rcar_snd_info), GFP_KERNEL); - of_data = of_id->data; - } else { - info = pdev->dev.platform_data; - } - - if (!info) { - dev_err(dev, "driver needs R-Car sound information\n"); - return -ENODEV; - } + info = devm_kzalloc(&pdev->dev, sizeof(struct rcar_snd_info), + GFP_KERNEL); + if (!info) + return -ENOMEM; + of_data = of_id->data; /* * init priv data diff --git a/include/sound/rcar_snd.h b/sound/soc/sh/rcar/rcar_snd.h similarity index 100% rename from include/sound/rcar_snd.h rename to sound/soc/sh/rcar/rcar_snd.h diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h index e4068d78616c..e9fef53968b4 100644 --- a/sound/soc/sh/rcar/rsnd.h +++ b/sound/soc/sh/rcar/rsnd.h @@ -21,10 +21,11 @@ #include <linux/of_irq.h> #include <linux/sh_dma.h> #include <linux/workqueue.h> -#include <sound/rcar_snd.h> #include <sound/soc.h> #include <sound/pcm_params.h> +#include "rcar_snd.h" + /* * pseudo register * diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index 5e05f9422073..842a35b1363a 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c @@ -700,9 +700,6 @@ static void rsnd_of_parse_ssi(struct platform_device *pdev, struct device *dev = &pdev->dev; int nr, i; - if (!of_data) - return; - node = rsnd_ssi_of_node(priv); if (!node) return; -- 1.9.1

1 0

[alsa-devel] Applied "ASoC: Intel: use dw_dmac autoconfiguration" to the asoc tree
by Mark Brown 07 Oct '15

07 Oct '15

The patch ASoC: Intel: use dw_dmac autoconfiguration has been applied to the asoc tree at git://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 b5e5a4549c8b88a880fa3866fa3803ea9396ba03 Mon Sep 17 00:00:00 2001 From: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> Date: Mon, 5 Oct 2015 14:53:50 +0300 Subject: [PATCH] ASoC: Intel: use dw_dmac autoconfiguration Instead of hardconding a platform data for dw_dmac let's use it's own autoconfiguration feature. Thus, remove hardcoded values. Acked-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> Cc: Mark Brown <broonie(a)kernel.org> Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/intel/common/sst-firmware.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/sound/soc/intel/common/sst-firmware.c b/sound/soc/intel/common/sst-firmware.c index ebcca6d..1636a1e 100644 --- a/sound/soc/intel/common/sst-firmware.c +++ b/sound/soc/intel/common/sst-firmware.c @@ -26,7 +26,6 @@ #include <linux/acpi.h> /* supported DMA engine drivers */ -#include <linux/platform_data/dma-dw.h> #include <linux/dma/dw.h> #include <asm/page.h> @@ -169,12 +168,6 @@ err: return ret; } -static struct dw_dma_platform_data dw_pdata = { - .is_private = 1, - .chan_allocation_order = CHAN_ALLOCATION_ASCENDING, - .chan_priority = CHAN_PRIORITY_ASCENDING, -}; - static struct dw_dma_chip *dw_probe(struct device *dev, struct resource *mem, int irq) { @@ -195,7 +188,8 @@ static struct dw_dma_chip *dw_probe(struct device *dev, struct resource *mem, return ERR_PTR(err); chip->dev = dev; - err = dw_dma_probe(chip, &dw_pdata); + + err = dw_dma_probe(chip, NULL); if (err) return ERR_PTR(err); -- 2.5.0

1 0

[alsa-devel] [PATCH] ASoC: nau8825: Add driver for headset chip Nuvoton 8825
by Anatol Pomozov 07 Oct '15

07 Oct '15

Sponsored-by: Google Chromium project Signed-off-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> --- .../devicetree/bindings/sound/nau8825.txt | 102 ++ sound/soc/codecs/Kconfig | 4 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/nau8825.c | 1107 ++++++++++++++++++++ sound/soc/codecs/nau8825.h | 323 ++++++ 5 files changed, 1538 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/nau8825.txt create mode 100644 sound/soc/codecs/nau8825.c create mode 100644 sound/soc/codecs/nau8825.h diff --git a/Documentation/devicetree/bindings/sound/nau8825.txt b/Documentation/devicetree/bindings/sound/nau8825.txt new file mode 100644 index 0000000..d337423 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/nau8825.txt @@ -0,0 +1,102 @@ +Nuvoton NAU8825 audio codec + +This device supports I2C only. + +Required properties: + - compatible : Must be "nuvoton,nau8825" + + - reg : the I2C address of the device. This is either 0x1a (CSB=0) or 0x1b (CSB=1). + +Optional properties: + - nuvoton,jkdet-enable: Enable jack detection via JKDET pin. + - nuvoton,jkdet-pull-enable: Enable JKDET pin pull. If set - pin pull enabled, + otherwise pin in high impedance state. + - nuvoton,jkdet-pull-up: Pull-up JKDET pin. If set then JKDET pin is pull up, otherwise pull down. + - nuvoton,jkdet-polarity: JKDET pin polarity. 0 - active high, 1 - active low. + + - nuvoton,vref-impedance: VREF Impedance selection + 0 - Open + 1 - 25 kOhm + 2 - 125 kOhm + 3 - 2.5 kOhm + + - nuvoton,micbias-voltage: Micbias voltage level. + 0 - VDDA + 1 - VDDA + 2 - VDDA * 1.1 + 3 - VDDA * 1.2 + 4 - VDDA * 1.3 + 5 - VDDA * 1.4 + 6 - VDDA * 1.53 + 7 - VDDA * 1.53 + + - nuvoton,sar-threshold-num: Number of buttons supported + - nuvoton,sar-threshold: Impedance threshold for each button. Array that contains up to 8 buttons configuration. SAR value is calculated as + SAR = 255 * MICBIAS / SAR_VOLTAGE * R / (2000 + R) + where MICBIAS is configured by 'nuvoton,micbias-voltage', SAR_VOLTAGE is configured by 'nuvoton,sar-voltage', R - button impedance. + Refer datasheet section 10.2 for more information about threshold calculation. + + - nuvoton,sar-hysteresis: Button impedance measurement hysteresis. + + - nuvoton,sar-voltage: Reference voltage for button impedance measurement. + 0 - VDDA + 1 - VDDA + 2 - VDDA * 1.1 + 3 - VDDA * 1.2 + 4 - VDDA * 1.3 + 5 - VDDA * 1.4 + 6 - VDDA * 1.53 + 7 - VDDA * 1.53 + + - nuvoton,sar-compare-time: SAR compare time + 0 - 500 ns + 1 - 1 us + 2 - 2 us + 3 - 4 us + + - nuvoton,sar-sampling-time: SAR sampling time + 0 - 2 us + 1 - 4 us + 2 - 8 us + 3 - 16 us + + - nuvoton,short-key-debounce: Button short key press debounce time. + 0 - 30 ms + 1 - 50 ms + 2 - 100 ms + 3 - 30 ms + + - nuvoton,jack-insert-debounce: number from 0 to 7 that sets debounce time to 2^(n+2) ms + - nuvoton,jack-eject-debounce: number from 0 to 7 that sets debounce time to 2^(n+2) ms + + - clocks: list of phandle and clock specifier pairs according to common clock bindings for the + clocks described in clock-names + - clock-names: should include "mclk" for the MCLK master clock + +Example: + + headset: nau8825@1a { + compatible = "nuvoton,nau8825"; + reg = <0x1a>; + interrupt-parent = <&gpio>; + interrupts = <TEGRA_GPIO(E, 6) IRQ_TYPE_LEVEL_LOW>; + nuvoton,jkdet-enable; + nuvoton,jkdet-pull-enable; + nuvoton,jkdet-pull-up; + nuvoton,jkdet-polarity = <GPIO_ACTIVE_LOW>; + nuvoton,vref-impedance = <2>; + nuvoton,micbias-voltage = <6>; + // Setup 4 buttons impedance according to Android specification + nuvoton,sar-threshold-num = <4>; + nuvoton,sar-threshold = <0xc 0x1e 0x38 0x60>; + nuvoton,sar-hysteresis = <1>; + nuvoton,sar-voltage = <0>; + nuvoton,sar-compare-time = <0>; + nuvoton,sar-sampling-time = <0>; + nuvoton,short-key-debounce = <2>; + nuvoton,jack-insert-debounce = <7>; + nuvoton,jack-eject-debounce = <7>; + + clock-names = "mclk"; + clocks = <&tegra_car TEGRA210_CLK_CLK_OUT_2>; + }; diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 70e5a75..e1103e2 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -80,6 +80,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_MAX9877 if I2C select SND_SOC_MC13783 if MFD_MC13XXX select SND_SOC_ML26124 if I2C + select SND_SOC_NAU8825 if I2C select SND_SOC_PCM1681 if I2C select SND_SOC_PCM1792A if SPI_MASTER select SND_SOC_PCM3008 @@ -897,6 +898,9 @@ config SND_SOC_MC13783 config SND_SOC_ML26124 tristate +config SND_SOC_NAU8825 + tristate + config SND_SOC_TPA6130A2 tristate "Texas Instruments TPA6130A2 headphone amplifier" depends on I2C diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index be1491a..02284b9 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -73,6 +73,7 @@ snd-soc-max98925-objs := max98925.o snd-soc-max9850-objs := max9850.o snd-soc-mc13783-objs := mc13783.o snd-soc-ml26124-objs := ml26124.o +snd-soc-nau8825-objs := nau8825.o snd-soc-pcm1681-objs := pcm1681.o snd-soc-pcm1792a-codec-objs := pcm1792a.o snd-soc-pcm3008-objs := pcm3008.o @@ -265,6 +266,7 @@ obj-$(CONFIG_SND_SOC_MAX98925) += snd-soc-max98925.o obj-$(CONFIG_SND_SOC_MAX9850) += snd-soc-max9850.o obj-$(CONFIG_SND_SOC_MC13783) += snd-soc-mc13783.o obj-$(CONFIG_SND_SOC_ML26124) += snd-soc-ml26124.o +obj-$(CONFIG_SND_SOC_NAU8825) += snd-soc-nau8825.o obj-$(CONFIG_SND_SOC_PCM1681) += snd-soc-pcm1681.o obj-$(CONFIG_SND_SOC_PCM1792A) += snd-soc-pcm1792a-codec.o obj-$(CONFIG_SND_SOC_PCM3008) += snd-soc-pcm3008.o diff --git a/sound/soc/codecs/nau8825.c b/sound/soc/codecs/nau8825.c new file mode 100644 index 0000000..f31a500 --- /dev/null +++ b/sound/soc/codecs/nau8825.c @@ -0,0 +1,1107 @@ +/* + * Nuvoton NAU8825 audio codec driver + * + * Copyright 2015 Google Chromium project. + * Author: Anatol Pomozov <anatol(a)chromium.org> + * Copyright 2015 Nuvoton Technology Corp. + * Co-author: Meng-Huang Kuo <mhkuo(a)nuvoton.com> + * + * Licensed under the GPL-2. + */ + +#include <linux/module.h> +#include <linux/delay.h> +#include <linux/init.h> +#include <linux/i2c.h> +#include <linux/regmap.h> +#include <linux/slab.h> +#include <linux/clk.h> + +#include <sound/initval.h> +#include <sound/tlv.h> +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/soc.h> +#include <sound/jack.h> + + +#include "nau8825.h" + +static const struct reg_default nau8825_reg_defaults[] = { + { NAU8825_REG_ENA_CTRL, 0x00ff }, + { NAU8825_REG_CLK_DIVIDER, 0x0050 }, + { NAU8825_REG_FLL1, 0x0 }, + { NAU8825_REG_FLL2, 0x3126 }, + { NAU8825_REG_FLL3, 0x0008 }, + { NAU8825_REG_FLL4, 0x0010 }, + { NAU8825_REG_FLL5, 0x0 }, + { NAU8825_REG_FLL6, 0x6000 }, + { NAU8825_REG_FLL_VCO_RSV, 0xf13c }, + { NAU8825_REG_HSD_CTRL, 0x000c }, + { NAU8825_REG_JACK_DET_CTRL, 0x0 }, + { NAU8825_REG_INTERRUPT_MASK, 0x0 }, + { NAU8825_REG_INTERRUPT_DIS_CTRL, 0xffff }, + { NAU8825_REG_SAR_CTRL, 0x0015 }, + { NAU8825_REG_KEYDET_CTRL, 0x0110 }, + { NAU8825_REG_VDET_THRESHOLD_1, 0x0 }, + { NAU8825_REG_VDET_THRESHOLD_2, 0x0 }, + { NAU8825_REG_VDET_THRESHOLD_3, 0x0 }, + { NAU8825_REG_VDET_THRESHOLD_4, 0x0 }, + { NAU8825_REG_GPIO34_CTRL, 0x0 }, + { NAU8825_REG_GPIO12_CTRL, 0x0 }, + { NAU8825_REG_TDM_CTRL, 0x0 }, + { NAU8825_REG_I2S_PCM_CTRL1, 0x000b }, + { NAU8825_REG_I2S_PCM_CTRL2, 0x8010 }, + { NAU8825_REG_LEFT_TIME_SLOT, 0x0 }, + { NAU8825_REG_RIGHT_TIME_SLOT, 0x0 }, + { NAU8825_REG_BIQ_CTRL, 0x0 }, + { NAU8825_REG_BIQ_COF1, 0x0 }, + { NAU8825_REG_BIQ_COF2, 0x0 }, + { NAU8825_REG_BIQ_COF3, 0x0 }, + { NAU8825_REG_BIQ_COF4, 0x0 }, + { NAU8825_REG_BIQ_COF5, 0x0 }, + { NAU8825_REG_BIQ_COF6, 0x0 }, + { NAU8825_REG_BIQ_COF7, 0x0 }, + { NAU8825_REG_BIQ_COF8, 0x0 }, + { NAU8825_REG_BIQ_COF9, 0x0 }, + { NAU8825_REG_BIQ_COF10, 0x0 }, + { NAU8825_REG_ADC_RATE, 0x0010 }, + { NAU8825_REG_DAC_CTRL1, 0x0001 }, + { NAU8825_REG_DAC_CTRL2, 0x0 }, + { NAU8825_REG_DAC_DGAIN_CTRL, 0x0 }, + { NAU8825_REG_ADC_DGAIN_CTRL, 0x00cf }, + { NAU8825_REG_MUTE_CTRL, 0x0 }, + { NAU8825_REG_HSVOL_CTRL, 0x0 }, + { NAU8825_REG_DACL_CTRL, 0x02cf }, + { NAU8825_REG_DACR_CTRL, 0x00cf }, + { NAU8825_REG_ADC_DRC_KNEE_IP12, 0x1486 }, + { NAU8825_REG_ADC_DRC_KNEE_IP34, 0x0f12 }, + { NAU8825_REG_ADC_DRC_SLOPES, 0x25ff }, + { NAU8825_REG_ADC_DRC_ATKDCY, 0x3457 }, + { NAU8825_REG_DAC_DRC_KNEE_IP12, 0x1486 }, + { NAU8825_REG_DAC_DRC_KNEE_IP34, 0x0f12 }, + { NAU8825_REG_DAC_DRC_SLOPES, 0x25f9 }, + { NAU8825_REG_DAC_DRC_ATKDCY, 0x3457 }, + { NAU8825_REG_IMM_MODE_CTRL, 0x0 }, + { NAU8825_REG_CLASSG_CTRL, 0x0 }, + { NAU8825_REG_OPT_EFUSE_CTRL, 0x0 }, + { NAU8825_REG_MISC_CTRL, 0x0 }, + { NAU8825_REG_BIAS_ADJ, 0x0 }, + { NAU8825_REG_TRIM_SETTINGS, 0x0 }, + { NAU8825_REG_ANALOG_CONTROL_1, 0x0 }, + { NAU8825_REG_ANALOG_CONTROL_2, 0x0 }, + { NAU8825_REG_ANALOG_ADC_1, 0x0011 }, + { NAU8825_REG_ANALOG_ADC_2, 0x0020 }, + { NAU8825_REG_RDAC, 0x0008 }, + { NAU8825_REG_MIC_BIAS, 0x0006 }, + { NAU8825_REG_BOOST, 0x0 }, + { NAU8825_REG_FEPGA, 0x0 }, + { NAU8825_REG_POWER_UP_CONTROL, 0x0 }, + { NAU8825_REG_CHARGE_PUMP, 0x0 }, +}; + +static bool nau8825_readable_reg(struct device *dev, unsigned int reg) +{ + switch (reg) { + case NAU8825_REG_ENA_CTRL: + case NAU8825_REG_CLK_DIVIDER ... NAU8825_REG_FLL_VCO_RSV: + case NAU8825_REG_HSD_CTRL ... NAU8825_REG_JACK_DET_CTRL: + case NAU8825_REG_INTERRUPT_MASK ... NAU8825_REG_KEYDET_CTRL: + case NAU8825_REG_VDET_THRESHOLD_1 ... NAU8825_REG_DACR_CTRL: + case NAU8825_REG_ADC_DRC_KNEE_IP12 ... NAU8825_REG_ADC_DRC_ATKDCY: + case NAU8825_REG_DAC_DRC_KNEE_IP12 ... NAU8825_REG_DAC_DRC_ATKDCY: + case NAU8825_REG_IMM_MODE_CTRL ... NAU8825_REG_IMM_RMS_R: + case NAU8825_REG_CLASSG_CTRL ... NAU8825_REG_OPT_EFUSE_CTRL: + case NAU8825_REG_MISC_CTRL: + case NAU8825_REG_I2C_DEVICE_ID ... NAU8825_REG_SARDOUT_RAM_STATUS: + case NAU8825_REG_BIAS_ADJ: + case NAU8825_REG_TRIM_SETTINGS ... NAU8825_REG_ANALOG_CONTROL_2: + case NAU8825_REG_ANALOG_ADC_1 ... NAU8825_REG_MIC_BIAS: + case NAU8825_REG_BOOST ... NAU8825_REG_FEPGA: + case NAU8825_REG_POWER_UP_CONTROL ... NAU8825_REG_GENERAL_STATUS: + return true; + default: + return false; + } + +} + +static bool nau8825_writeable_reg(struct device *dev, unsigned int reg) +{ + switch (reg) { + case NAU8825_REG_RESET ... NAU8825_REG_ENA_CTRL: + case NAU8825_REG_CLK_DIVIDER ... NAU8825_REG_FLL_VCO_RSV: + case NAU8825_REG_HSD_CTRL ... NAU8825_REG_JACK_DET_CTRL: + case NAU8825_REG_INTERRUPT_MASK: + case NAU8825_REG_INT_CLR_KEY_STATUS ... NAU8825_REG_KEYDET_CTRL: + case NAU8825_REG_VDET_THRESHOLD_1 ... NAU8825_REG_DACR_CTRL: + case NAU8825_REG_ADC_DRC_KNEE_IP12 ... NAU8825_REG_ADC_DRC_ATKDCY: + case NAU8825_REG_DAC_DRC_KNEE_IP12 ... NAU8825_REG_DAC_DRC_ATKDCY: + case NAU8825_REG_IMM_MODE_CTRL: + case NAU8825_REG_CLASSG_CTRL ... NAU8825_REG_OPT_EFUSE_CTRL: + case NAU8825_REG_MISC_CTRL: + case NAU8825_REG_BIAS_ADJ: + case NAU8825_REG_TRIM_SETTINGS ... NAU8825_REG_ANALOG_CONTROL_2: + case NAU8825_REG_ANALOG_ADC_1 ... NAU8825_REG_MIC_BIAS: + case NAU8825_REG_BOOST ... NAU8825_REG_FEPGA: + case NAU8825_REG_POWER_UP_CONTROL ... NAU8825_REG_CHARGE_PUMP: + return true; + default: + return false; + } +} + +static bool nau8825_volatile_reg(struct device *dev, unsigned int reg) +{ + switch (reg) { + case NAU8825_REG_RESET: + case NAU8825_REG_IRQ_STATUS: + case NAU8825_REG_INT_CLR_KEY_STATUS: + case NAU8825_REG_IMM_RMS_L: + case NAU8825_REG_IMM_RMS_R: + case NAU8825_REG_I2C_DEVICE_ID: + case NAU8825_REG_SARDOUT_RAM_STATUS: + case NAU8825_REG_CHARGE_PUMP_INPUT_READ: + case NAU8825_REG_GENERAL_STATUS: + return true; + default: + return false; + } +} + +static int nau8825_pump_event(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *kcontrol, int event) +{ + switch (event) { + case SND_SOC_DAPM_POST_PMU: + /* Prevent startup click by letting charge pump to ramp up */ + msleep(10); + break; + default: + return -EINVAL; + } + + return 0; +} + +static const char * const nau8825_adc_decimation[] = { + "32", "64", "128", "256" +}; + +static const struct soc_enum nau8825_adc_decimation_enum = + SOC_ENUM_SINGLE(NAU8825_REG_ADC_RATE, NAU8825_ADC_SYNC_DOWN_SFT, + ARRAY_SIZE(nau8825_adc_decimation), nau8825_adc_decimation); + +static const char * const nau8825_dac_oversampl[] = { + "64", "256", "128", "", "32" +}; + +static const struct soc_enum nau8825_dac_oversampl_enum = + SOC_ENUM_SINGLE(NAU8825_REG_DAC_CTRL1, NAU8825_DAC_OVERSAMPLE_SFT, + ARRAY_SIZE(nau8825_dac_oversampl), nau8825_dac_oversampl); + +static const DECLARE_TLV_DB_MINMAX_MUTE(adc_vol_tlv, -10300, 2400); +static const DECLARE_TLV_DB_MINMAX_MUTE(sidetone_vol_tlv, -4200, 0); +static const DECLARE_TLV_DB_MINMAX(dac_vol_tlv, -5400, 0); +static const DECLARE_TLV_DB_MINMAX(fepga_gain_tlv, -100, 3600); +static const DECLARE_TLV_DB_MINMAX_MUTE(crosstalk_vol_tlv, -9600, 2400); + +static const struct snd_kcontrol_new nau8825_controls[] = { + SOC_SINGLE_TLV("Mic Volume", NAU8825_REG_ADC_DGAIN_CTRL, + 0, 0xff, 0, adc_vol_tlv), + SOC_DOUBLE_TLV("Headphone Bypass Volume", NAU8825_REG_ADC_DGAIN_CTRL, + 12, 8, 0x0f, 0, sidetone_vol_tlv), + SOC_DOUBLE_TLV("Headphone Volume", NAU8825_REG_HSVOL_CTRL, + 6, 0, 0x3f, 1, dac_vol_tlv), + SOC_SINGLE_TLV("Frontend PGA Volume", NAU8825_REG_POWER_UP_CONTROL, + 8, 37, 0, fepga_gain_tlv), + SOC_DOUBLE_TLV("Headphone Crosstalk Volume", NAU8825_REG_DAC_DGAIN_CTRL, + 0, 8, 0xff, 0, crosstalk_vol_tlv), + + SOC_ENUM("ADC Decimation Rate", nau8825_adc_decimation_enum), + SOC_ENUM("DAC Oversampling Rate", nau8825_dac_oversampl_enum), +}; + +/* DAC Mux 0x33[9] and 0x34[9] */ +static const char * const nau8825_dac_src[] = { + "DACL", "DACR", +}; + +static SOC_ENUM_SINGLE_DECL( + nau8825_dacl_enum, NAU8825_REG_DACL_CTRL, + NAU8825_DACL_CH_SEL_SFT, nau8825_dac_src); + +static SOC_ENUM_SINGLE_DECL( + nau8825_dacr_enum, NAU8825_REG_DACR_CTRL, + NAU8825_DACR_CH_SEL_SFT, nau8825_dac_src); + +static const struct snd_kcontrol_new nau8825_dacl_mux = + SOC_DAPM_ENUM("DACL Source", nau8825_dacl_enum); + +static const struct snd_kcontrol_new nau8825_dacr_mux = + SOC_DAPM_ENUM("DACR Source", nau8825_dacr_enum); + + +static const struct snd_soc_dapm_widget nau8825_dapm_widgets[] = { + SND_SOC_DAPM_AIF_OUT("AIFTX", "Capture", 0, NAU8825_REG_I2S_PCM_CTRL2, + 15, 1), + + SND_SOC_DAPM_INPUT("MIC"), + SND_SOC_DAPM_MICBIAS("MICBIAS", NAU8825_REG_MIC_BIAS, 8, 0), + + SND_SOC_DAPM_PGA("Frontend PGA", NAU8825_REG_POWER_UP_CONTROL, 14, 0, + NULL, 0), + + SND_SOC_DAPM_ADC("ADC", NULL, NAU8825_REG_ENA_CTRL, 8, 0), + SND_SOC_DAPM_SUPPLY("ADC Clock", NAU8825_REG_ENA_CTRL, 7, 0, NULL, 0), + SND_SOC_DAPM_SUPPLY("ADC Power", NAU8825_REG_ANALOG_ADC_2, 6, 0, NULL, + 0), + + /* ADC for button press detection */ + SND_SOC_DAPM_ADC("SAR", NULL, NAU8825_REG_SAR_CTRL, + NAU8825_SAR_ADC_EN_SFT, 0), + + SND_SOC_DAPM_DAC("ADACL", NULL, NAU8825_REG_RDAC, 12, 0), + SND_SOC_DAPM_DAC("ADACR", NULL, NAU8825_REG_RDAC, 13, 0), + SND_SOC_DAPM_SUPPLY("ADACL Clock", NAU8825_REG_RDAC, 8, 0, NULL, 0), + SND_SOC_DAPM_SUPPLY("ADACR Clock", NAU8825_REG_RDAC, 9, 0, NULL, 0), + + SND_SOC_DAPM_DAC("DDACR", NULL, NAU8825_REG_ENA_CTRL, + NAU8825_ENABLE_DACR_SFT, 0), + SND_SOC_DAPM_DAC("DDACL", NULL, NAU8825_REG_ENA_CTRL, + NAU8825_ENABLE_DACL_SFT, 0), + SND_SOC_DAPM_SUPPLY("DDAC Clock", NAU8825_REG_ENA_CTRL, 6, 0, NULL, 0), + + SND_SOC_DAPM_MUX("DACL Mux", SND_SOC_NOPM, 0, 0, &nau8825_dacl_mux), + SND_SOC_DAPM_MUX("DACR Mux", SND_SOC_NOPM, 0, 0, &nau8825_dacr_mux), + + SND_SOC_DAPM_PGA("HP amp L", NAU8825_REG_CLASSG_CTRL, 1, 0, NULL, 0), + SND_SOC_DAPM_PGA("HP amp R", NAU8825_REG_CLASSG_CTRL, 2, 0, NULL, 0), + SND_SOC_DAPM_SUPPLY("HP amp power", NAU8825_REG_CLASSG_CTRL, 0, 0, NULL, + 0), + + SND_SOC_DAPM_SUPPLY("Charge Pump", NAU8825_REG_CHARGE_PUMP, 5, 0, + nau8825_pump_event, SND_SOC_DAPM_POST_PMU), + + SND_SOC_DAPM_PGA("Output Driver R Stage 1", + NAU8825_REG_POWER_UP_CONTROL, 5, 0, NULL, 0), + SND_SOC_DAPM_PGA("Output Driver L Stage 1", + NAU8825_REG_POWER_UP_CONTROL, 4, 0, NULL, 0), + SND_SOC_DAPM_PGA("Output Driver R Stage 2", + NAU8825_REG_POWER_UP_CONTROL, 3, 0, NULL, 0), + SND_SOC_DAPM_PGA("Output Driver L Stage 2", + NAU8825_REG_POWER_UP_CONTROL, 2, 0, NULL, 0), + SND_SOC_DAPM_PGA_S("Output Driver R Stage 3", 1, + NAU8825_REG_POWER_UP_CONTROL, 1, 0, NULL, 0), + SND_SOC_DAPM_PGA_S("Output Driver L Stage 3", 1, + NAU8825_REG_POWER_UP_CONTROL, 0, 0, NULL, 0), + + SND_SOC_DAPM_PGA_S("Output DACL", 2, NAU8825_REG_CHARGE_PUMP, 8, 1, NULL, 0), + SND_SOC_DAPM_PGA_S("Output DACR", 2, NAU8825_REG_CHARGE_PUMP, 9, 1, NULL, 0), + + SND_SOC_DAPM_OUTPUT("HPOL"), + SND_SOC_DAPM_OUTPUT("HPOR"), +}; + +static const struct snd_soc_dapm_route nau8825_dapm_routes[] = { + {"Frontend PGA", NULL, "MIC"}, + {"ADC", NULL, "Frontend PGA"}, + {"ADC", NULL, "ADC Clock"}, + {"ADC", NULL, "ADC Power"}, + {"AIFTX", NULL, "ADC"}, + + {"DDACL", NULL, "Playback"}, + {"DDACR", NULL, "Playback"}, + {"DDACL", NULL, "DDAC Clock"}, + {"DDACR", NULL, "DDAC Clock"}, + {"DACL Mux", "DACL", "DDACL"}, + {"DACL Mux", "DACR", "DDACR"}, + {"DACR Mux", "DACL", "DDACL"}, + {"DACR Mux", "DACR", "DDACR"}, + {"HP amp L", NULL, "DACL Mux"}, + {"HP amp R", NULL, "DACR Mux"}, + {"HP amp L", NULL, "HP amp power"}, + {"HP amp R", NULL, "HP amp power"}, + {"ADACL", NULL, "HP amp L"}, + {"ADACR", NULL, "HP amp R"}, + {"ADACL", NULL, "ADACL Clock"}, + {"ADACR", NULL, "ADACR Clock"}, + {"Output Driver L Stage 1", NULL, "ADACL"}, + {"Output Driver R Stage 1", NULL, "ADACR"}, + {"Output Driver L Stage 2", NULL, "Output Driver L Stage 1"}, + {"Output Driver R Stage 2", NULL, "Output Driver R Stage 1"}, + {"Output Driver L Stage 3", NULL, "Output Driver L Stage 2"}, + {"Output Driver R Stage 3", NULL, "Output Driver R Stage 2"}, + {"Output DACL", NULL, "Output Driver L Stage 3"}, + {"Output DACR", NULL, "Output Driver R Stage 3"}, + {"HPOL", NULL, "Output DACL"}, + {"HPOR", NULL, "Output DACR"}, + {"HPOL", NULL, "Charge Pump"}, + {"HPOR", NULL, "Charge Pump"}, +}; + +static int nau8825_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params, + struct snd_soc_dai *dai) +{ + struct snd_soc_codec *codec = dai->codec; + struct nau8825 *nau8825 = snd_soc_codec_get_drvdata(codec); + unsigned int val_len = 0; + + switch (params_width(params)) { + case 16: + val_len |= NAU8825_I2S_DL_16; + break; + case 20: + val_len |= NAU8825_I2S_DL_20; + break; + case 24: + val_len |= NAU8825_I2S_DL_24; + break; + case 32: + val_len |= NAU8825_I2S_DL_32; + break; + default: + return -EINVAL; + } + + regmap_update_bits(nau8825->regmap, NAU8825_REG_I2S_PCM_CTRL1, + NAU8825_I2S_DL_MASK, val_len); + + return 0; +} + +static int nau8825_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) +{ + struct snd_soc_codec *codec = codec_dai->codec; + struct nau8825 *nau8825 = snd_soc_codec_get_drvdata(codec); + unsigned int ctrl1_val = 0, ctrl2_val = 0; + + switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { + case SND_SOC_DAIFMT_CBM_CFM: + ctrl2_val |= NAU8825_I2S_MS_MASTER; + break; + case SND_SOC_DAIFMT_CBS_CFS: + break; + default: + return -EINVAL; + } + + switch (fmt & SND_SOC_DAIFMT_INV_MASK) { + case SND_SOC_DAIFMT_NB_NF: + break; + case SND_SOC_DAIFMT_IB_NF: + ctrl1_val |= NAU8825_I2S_BP_INV; + break; + default: + return -EINVAL; + } + + switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { + case SND_SOC_DAIFMT_I2S: + ctrl1_val |= NAU8825_I2S_DF_I2S; + break; + case SND_SOC_DAIFMT_LEFT_J: + ctrl1_val |= NAU8825_I2S_DF_LEFT; + break; + case SND_SOC_DAIFMT_RIGHT_J: + ctrl1_val |= NAU8825_I2S_DF_RIGTH; + break; + case SND_SOC_DAIFMT_DSP_A: + ctrl1_val |= NAU8825_I2S_DF_PCM_AB; + break; + case SND_SOC_DAIFMT_DSP_B: + ctrl1_val |= NAU8825_I2S_DF_PCM_AB; + ctrl1_val |= NAU8825_I2S_PCMB_EN; + break; + default: + return -EINVAL; + } + + regmap_update_bits(nau8825->regmap, NAU8825_REG_I2S_PCM_CTRL1, + NAU8825_I2S_DL_MASK | NAU8825_I2S_DF_MASK | + NAU8825_I2S_BP_MASK | NAU8825_I2S_PCMB_MASK, + ctrl1_val); + regmap_update_bits(nau8825->regmap, NAU8825_REG_I2S_PCM_CTRL2, + NAU8825_I2S_MS_MASK, ctrl2_val); + + return 0; +} + +static const struct snd_soc_dai_ops nau8825_dai_ops = { + .hw_params = nau8825_hw_params, + .set_fmt = nau8825_set_dai_fmt, +}; + +#define NAU8825_RATES SNDRV_PCM_RATE_8000_192000 +#define NAU8825_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE \ + | SNDRV_PCM_FMTBIT_S24_3LE | SNDRV_PCM_FMTBIT_S32_LE) + +static struct snd_soc_dai_driver nau8825_dai = { + .name = "nau8825-hifi", + .playback = { + .stream_name = "Playback", + .channels_min = 1, + .channels_max = 2, + .rates = NAU8825_RATES, + .formats = NAU8825_FORMATS, + }, + .capture = { + .stream_name = "Capture", + .channels_min = 1, + .channels_max = 1, + .rates = NAU8825_RATES, + .formats = NAU8825_FORMATS, + }, + .ops = &nau8825_dai_ops, +}; + +/** + * nau8825_enable_jack_detect - Specify a jack for event reporting + * + * @component: component to register the jack with + * @jack: jack to use to report headset and button events on + * + * After this function has been called the headset insert/remove and button + * events will be routed to the given jack. Jack can be null to stop + * reporting. + */ +int nau8825_enable_jack_detect(struct snd_soc_codec *codec, + struct snd_soc_jack *jack) +{ + struct nau8825 *nau8825 = snd_soc_codec_get_drvdata(codec); + struct regmap *regmap = nau8825->regmap; + + nau8825->jack = jack; + + /* Ground HP Outputs[1:0], needed for headset auto detection + * Enable Automatic Mic/Gnd switching reading on insert interrupt[6] + */ + regmap_update_bits(regmap, NAU8825_REG_HSD_CTRL, + NAU8825_HSD_AUTO_MODE | NAU8825_SPKR_DWN1R | NAU8825_SPKR_DWN1L, + NAU8825_HSD_AUTO_MODE | NAU8825_SPKR_DWN1R | NAU8825_SPKR_DWN1L); + + regmap_update_bits(regmap, NAU8825_REG_INTERRUPT_MASK, + NAU8825_IRQ_HEADSET_COMPLETE_EN | NAU8825_IRQ_EJECT_EN, 0); + + return 0; +} +EXPORT_SYMBOL_GPL(nau8825_enable_jack_detect); + + +static bool nau8825_is_jack_inserted(struct regmap *regmap) +{ + int status; + + regmap_read(regmap, NAU8825_REG_I2C_DEVICE_ID, &status); + return !(status & NAU8825_GPIO2JD1); +} + +static void nau8825_restart_jack_detection(struct regmap *regmap) +{ + /* this will restart the entire jack detection process including MIC/GND + * switching and create interrupts. We have to go from 0 to 1 and back + * to 0 to restart. + */ + regmap_update_bits(regmap, NAU8825_REG_JACK_DET_CTRL, + NAU8825_JACK_DET_RESTART, NAU8825_JACK_DET_RESTART); + regmap_update_bits(regmap, NAU8825_REG_JACK_DET_CTRL, + NAU8825_JACK_DET_RESTART, 0); +} + +static void nau8825_eject_jack(struct nau8825 *nau8825) +{ + struct snd_soc_dapm_context *dapm = nau8825->dapm; + struct regmap *regmap = nau8825->regmap; + + snd_soc_dapm_disable_pin(dapm, "SAR"); + snd_soc_dapm_disable_pin(dapm, "MICBIAS"); + /* Detach 2kOhm Resistors from MICBIAS to MICGND1/2 */ + regmap_update_bits(regmap, NAU8825_REG_MIC_BIAS, + NAU8825_MICBIAS_JKSLV | NAU8825_MICBIAS_JKR2, 0); + /* ground HPL/HPR, MICGRND1/2 */ + regmap_update_bits(regmap, NAU8825_REG_HSD_CTRL, 0xf, 0xf); + + snd_soc_dapm_sync(dapm); +} + +static int nau8825_button_decode(int value) +{ + int buttons = 0; + + /* The chip supports up to 8 buttons, but ALSA defines only 6 buttons */ + if (value & BIT(0)) + buttons |= SND_JACK_BTN_0; + if (value & BIT(1)) + buttons |= SND_JACK_BTN_1; + if (value & BIT(2)) + buttons |= SND_JACK_BTN_2; + if (value & BIT(3)) + buttons |= SND_JACK_BTN_3; + if (value & BIT(4)) + buttons |= SND_JACK_BTN_4; + if (value & BIT(5)) + buttons |= SND_JACK_BTN_5; + + return buttons; +} + +static int nau8825_jack_insert(struct nau8825 *nau8825) +{ + struct regmap *regmap = nau8825->regmap; + struct snd_soc_dapm_context *dapm = nau8825->dapm; + int jack_status_reg, mic_detected; + int type = 0; + + regmap_read(regmap, NAU8825_REG_GENERAL_STATUS, &jack_status_reg); + mic_detected = (jack_status_reg >> 10) & 3; + + switch (mic_detected) { + case 0: + /* no mic */ + type = SND_JACK_HEADPHONE; + break; + case 1: + dev_dbg(nau8825->dev, "OMTP (micgnd1) mic connected\n"); + type = SND_JACK_HEADSET; + + /* Unground MICGND1 */ + regmap_update_bits(regmap, NAU8825_REG_HSD_CTRL, 3 << 2, + 1 << 2); + /* Attach 2kOhm Resistor from MICBIAS to MICGND1 */ + regmap_update_bits(regmap, NAU8825_REG_MIC_BIAS, + NAU8825_MICBIAS_JKSLV | NAU8825_MICBIAS_JKR2, + NAU8825_MICBIAS_JKR2); + /* Attach SARADC to MICGND1 */ + regmap_update_bits(regmap, NAU8825_REG_SAR_CTRL, + NAU8825_SAR_INPUT_MASK, + NAU8825_SAR_INPUT_JKR2); + + snd_soc_dapm_force_enable_pin(dapm, "MICBIAS"); + snd_soc_dapm_force_enable_pin(dapm, "SAR"); + snd_soc_dapm_sync(dapm); + break; + case 2: + case 3: + dev_dbg(nau8825->dev, "CTIA (micgnd2) mic connected\n"); + type = SND_JACK_HEADSET; + + /* Unground MICGND2 */ + regmap_update_bits(regmap, NAU8825_REG_HSD_CTRL, 3 << 2, + 2 << 2); + /* Attach 2kOhm Resistor from MICBIAS to MICGND2 */ + regmap_update_bits(regmap, NAU8825_REG_MIC_BIAS, + NAU8825_MICBIAS_JKSLV | NAU8825_MICBIAS_JKR2, + NAU8825_MICBIAS_JKSLV); + /* Attach SARADC to MICGND2 */ + regmap_update_bits(regmap, NAU8825_REG_SAR_CTRL, + NAU8825_SAR_INPUT_MASK, + NAU8825_SAR_INPUT_JKSLV); + + snd_soc_dapm_force_enable_pin(dapm, "MICBIAS"); + snd_soc_dapm_force_enable_pin(dapm, "SAR"); + snd_soc_dapm_sync(dapm); + break; + } + + if (type & SND_JACK_HEADPHONE) { + /* Unground HPL/R */ + regmap_update_bits(regmap, NAU8825_REG_HSD_CTRL, 0x3, 0); + } + + return type; +} + +#define NAU8825_BUTTONS (SND_JACK_BTN_0 | SND_JACK_BTN_1 | \ + SND_JACK_BTN_2 | SND_JACK_BTN_3) + +static irqreturn_t nau8825_interrupt(int irq, void *data) +{ + struct nau8825 *nau8825 = (struct nau8825 *)data; + struct regmap *regmap = nau8825->regmap; + int active_irq, clear_irq = 0, event = 0, event_mask = 0; + + regmap_read(regmap, NAU8825_REG_IRQ_STATUS, &active_irq); + + if ((active_irq & NAU8825_JACK_EJECTION_IRQ_MASK) == + NAU8825_JACK_EJECTION_DETECTED) { + + nau8825_eject_jack(nau8825); + event_mask |= SND_JACK_HEADSET; + clear_irq = NAU8825_JACK_EJECTION_IRQ_MASK; + } else if (active_irq & NAU8825_KEY_SHORT_PRESS_IRQ) { + int key_status; + + regmap_read(regmap, NAU8825_REG_INT_CLR_KEY_STATUS, + &key_status); + + /* upper 8 bits of the register are for short pressed keys, + * lower 8 bits - for long pressed buttons + */ + nau8825->button_pressed = nau8825_button_decode( + key_status >> 8); + + event |= nau8825->button_pressed; + event_mask |= NAU8825_BUTTONS; + clear_irq = NAU8825_KEY_SHORT_PRESS_IRQ; + } else if (active_irq & NAU8825_KEY_RELEASE_IRQ) { + event_mask = NAU8825_BUTTONS; + clear_irq = NAU8825_KEY_RELEASE_IRQ; + } else if (active_irq & NAU8825_HEADSET_COMPLETION_IRQ) { + if (nau8825_is_jack_inserted(regmap)) { + event |= nau8825_jack_insert(nau8825); + } else { + dev_warn(nau8825->dev, "Headset completion IRQ fired but no headset connected\n"); + nau8825_eject_jack(nau8825); + } + + event_mask |= SND_JACK_HEADSET; + clear_irq = NAU8825_HEADSET_COMPLETION_IRQ; + } + + if (!clear_irq) + clear_irq = active_irq; + /* clears the rightmost interruption */ + regmap_write(regmap, NAU8825_REG_INT_CLR_KEY_STATUS, clear_irq); + + if (event_mask) + snd_soc_jack_report(nau8825->jack, event, event_mask); + + return IRQ_HANDLED; +} + +static void nau8825_setup_buttons(struct nau8825 *nau8825) +{ + struct regmap *regmap = nau8825->regmap; + + regmap_update_bits(regmap, NAU8825_REG_SAR_CTRL, + NAU8825_SAR_TRACKING_GAIN_MASK, + nau8825->sar_voltage << NAU8825_SAR_TRACKING_GAIN_SFT); + regmap_update_bits(regmap, NAU8825_REG_SAR_CTRL, + NAU8825_SAR_COMPARE_TIME_MASK, + nau8825->sar_compare_time << NAU8825_SAR_COMPARE_TIME_SFT); + regmap_update_bits(regmap, NAU8825_REG_SAR_CTRL, + NAU8825_SAR_SAMPLING_TIME_MASK, + nau8825->sar_sampling_time << NAU8825_SAR_SAMPLING_TIME_SFT); + + regmap_update_bits(regmap, NAU8825_REG_KEYDET_CTRL, + NAU8825_KEYDET_LEVELS_NR_MASK, + (nau8825->sar_threshold_num - 1) << NAU8825_KEYDET_LEVELS_NR_SFT); + regmap_update_bits(regmap, NAU8825_REG_KEYDET_CTRL, + NAU8825_KEYDET_HYSTERESIS_MASK, + nau8825->sar_hysteresis << NAU8825_KEYDET_HYSTERESIS_SFT); + regmap_update_bits(regmap, NAU8825_REG_KEYDET_CTRL, + NAU8825_KEYDET_SHORTKEY_DEBOUNCE_MASK, + nau8825->key_debounce << NAU8825_KEYDET_SHORTKEY_DEBOUNCE_SFT); + + regmap_write(regmap, NAU8825_REG_VDET_THRESHOLD_1, + (nau8825->sar_threshold[0] << 8) | nau8825->sar_threshold[1]); + regmap_write(regmap, NAU8825_REG_VDET_THRESHOLD_2, + (nau8825->sar_threshold[2] << 8) | nau8825->sar_threshold[3]); + regmap_write(regmap, NAU8825_REG_VDET_THRESHOLD_3, + (nau8825->sar_threshold[4] << 8) | nau8825->sar_threshold[5]); + regmap_write(regmap, NAU8825_REG_VDET_THRESHOLD_4, + (nau8825->sar_threshold[6] << 8) | nau8825->sar_threshold[7]); + + /* Enable short press and release interruptions */ + regmap_update_bits(regmap, NAU8825_REG_INTERRUPT_MASK, + NAU8825_IRQ_KEY_SHORT_PRESS_EN | NAU8825_IRQ_KEY_RELEASE_EN, + 0); +} + +static void nau8825_init_regs(struct nau8825 *nau8825) +{ + struct regmap *regmap = nau8825->regmap; + + /* Enable Bias/Vmid */ + regmap_update_bits(nau8825->regmap, NAU8825_REG_BIAS_ADJ, + NAU8825_BIAS_VMID, NAU8825_BIAS_VMID); + regmap_update_bits(nau8825->regmap, NAU8825_REG_BOOST, + NAU8825_GLOBAL_BIAS_EN, NAU8825_GLOBAL_BIAS_EN); + + /* VMID Tieoff */ + regmap_update_bits(regmap, NAU8825_REG_BIAS_ADJ, + NAU8825_BIAS_VMID_SEL_MASK, + nau8825->vref_impedance << NAU8825_BIAS_VMID_SEL_SFT); + /* Disable Boost Driver, Automatic Short circuit protection enable */ + regmap_update_bits(regmap, NAU8825_REG_BOOST, + NAU8825_PRECHARGE_DIS | NAU8825_HP_BOOST_G_DIS | + NAU8825_SHORT_SHUTDOWN_EN, + NAU8825_PRECHARGE_DIS | NAU8825_HP_BOOST_G_DIS | + NAU8825_SHORT_SHUTDOWN_EN); + + regmap_update_bits(regmap, NAU8825_REG_GPIO12_CTRL, + NAU8825_JKDET_OUTPUT_EN, + nau8825->jkdet_enable ? 0 : NAU8825_JKDET_OUTPUT_EN); + regmap_update_bits(regmap, NAU8825_REG_GPIO12_CTRL, + NAU8825_JKDET_PULL_EN, + nau8825->jkdet_pull_enable ? 0 : NAU8825_JKDET_PULL_EN); + regmap_update_bits(regmap, NAU8825_REG_GPIO12_CTRL, + NAU8825_JKDET_PULL_UP, + nau8825->jkdet_pull_up ? NAU8825_JKDET_PULL_UP : 0); + regmap_update_bits(regmap, NAU8825_REG_JACK_DET_CTRL, + NAU8825_JACK_POLARITY, + /* jkdet_polarity - 1 is for active-low */ + nau8825->jkdet_polarity ? 0 : NAU8825_JACK_POLARITY); + + regmap_update_bits(regmap, NAU8825_REG_JACK_DET_CTRL, + NAU8825_JACK_INSERT_DEBOUNCE_MASK, + nau8825->jack_insert_debounce << NAU8825_JACK_INSERT_DEBOUNCE_SFT); + regmap_update_bits(regmap, NAU8825_REG_JACK_DET_CTRL, + NAU8825_JACK_EJECT_DEBOUNCE_MASK, + nau8825->jack_eject_debounce << NAU8825_JACK_EJECT_DEBOUNCE_SFT); + + /* Mask unneeded IRQs: 1 - disable, 0 - enable */ + regmap_update_bits(regmap, NAU8825_REG_INTERRUPT_MASK, 0x7ff, 0x7ff); + + regmap_update_bits(regmap, NAU8825_REG_MIC_BIAS, + NAU8825_MICBIAS_VOLTAGE_MASK, nau8825->micbias_voltage); + + if (nau8825->sar_threshold_num) + nau8825_setup_buttons(nau8825); + + /* Default oversampling/decimations settings are unusable + * (audible hiss). Set it to something better. + */ + regmap_update_bits(regmap, NAU8825_REG_ADC_RATE, + NAU8825_ADC_SYNC_DOWN_MASK, NAU8825_ADC_SYNC_DOWN_128); + regmap_update_bits(regmap, NAU8825_REG_DAC_CTRL1, + NAU8825_DAC_OVERSAMPLE_MASK, NAU8825_DAC_OVERSAMPLE_128); +} + +static const struct regmap_config nau8825_regmap_config = { + .val_bits = 16, + .reg_bits = 16, + + .max_register = NAU8825_REG_MAX, + .readable_reg = nau8825_readable_reg, + .writeable_reg = nau8825_writeable_reg, + .volatile_reg = nau8825_volatile_reg, + + .cache_type = REGCACHE_RBTREE, + .reg_defaults = nau8825_reg_defaults, + .num_reg_defaults = ARRAY_SIZE(nau8825_reg_defaults), +}; + +static int nau8825_codec_probe(struct snd_soc_codec *codec) +{ + struct nau8825 *nau8825 = snd_soc_codec_get_drvdata(codec); + struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); + + nau8825->dapm = dapm; + + /* The interrupt clock is gated by x1[10:8], + * one of them needs to be enabled all the time for + * interrupts to happen. + */ + snd_soc_dapm_force_enable_pin(dapm, "DDACR"); + snd_soc_dapm_sync(dapm); + + /* Unmask interruptions. Handler uses dapm object so we can enable + * interruptions only after dapm is fully initialized. + */ + regmap_write(nau8825->regmap, NAU8825_REG_INTERRUPT_DIS_CTRL, 0); + nau8825_restart_jack_detection(nau8825->regmap); + + return 0; +} + +static int nau8825_configure_sysclk(struct nau8825 *nau8825, int clk_id, + unsigned int freq) +{ + struct regmap *regmap = nau8825->regmap; + int ret; + + switch (clk_id) { + case NAU8825_CLK_MCLK: + regmap_update_bits(regmap, NAU8825_REG_CLK_DIVIDER, + NAU8825_CLK_SRC_MASK, NAU8825_CLK_SRC_MCLK); + regmap_update_bits(regmap, NAU8825_REG_FLL6, NAU8825_DCO_EN, 0); + + /* We selected MCLK source but the clock itself managed externally */ + if (!nau8825->mclk) + break; + + if (!nau8825->mclk_freq) { + ret = clk_prepare_enable(nau8825->mclk); + if (ret) { + dev_err(nau8825->dev, "Unable to prepare codec mclk\n"); + return ret; + } + } + + if (nau8825->mclk_freq != freq) { + nau8825->mclk_freq = freq; + + freq = clk_round_rate(nau8825->mclk, freq); + ret = clk_set_rate(nau8825->mclk, freq); + if (ret) { + dev_err(nau8825->dev, "Unable to set mclk rate\n"); + return ret; + } + } + + break; + case NAU8825_CLK_INTERNAL: + regmap_update_bits(regmap, NAU8825_REG_FLL6, NAU8825_DCO_EN, + NAU8825_DCO_EN); + regmap_update_bits(regmap, NAU8825_REG_CLK_DIVIDER, + NAU8825_CLK_SRC_MASK, NAU8825_CLK_SRC_VCO); + + if (nau8825->mclk_freq) { + clk_disable_unprepare(nau8825->mclk); + nau8825->mclk_freq = 0; + } + + break; + default: + dev_err(nau8825->dev, "Invalid clock id (%d)\n", clk_id); + return -EINVAL; + } + + dev_dbg(nau8825->dev, "Sysclk is %dHz and clock id is %d\n", freq, + clk_id); + return 0; +} + +static int nau8825_set_sysclk(struct snd_soc_codec *codec, int clk_id, + int source, unsigned int freq, int dir) +{ + struct nau8825 *nau8825 = snd_soc_codec_get_drvdata(codec); + + return nau8825_configure_sysclk(nau8825, clk_id, freq); +} + +static int nau8825_set_bias_level(struct snd_soc_codec *codec, + enum snd_soc_bias_level level) +{ + struct nau8825 *nau8825 = snd_soc_codec_get_drvdata(codec); + int ret; + + switch (level) { + case SND_SOC_BIAS_ON: + break; + + case SND_SOC_BIAS_PREPARE: + break; + + case SND_SOC_BIAS_STANDBY: + if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_OFF) { + if (nau8825->mclk_freq) { + ret = clk_prepare_enable(nau8825->mclk); + if (ret) { + dev_err(nau8825->dev, "Unable to prepare codec mclk\n"); + return ret; + } + } + + ret = regcache_sync(nau8825->regmap); + if (ret) { + dev_err(codec->dev, + "Failed to sync cache: %d\n", ret); + return ret; + } + } + + break; + + case SND_SOC_BIAS_OFF: + if (nau8825->mclk_freq) + clk_disable_unprepare(nau8825->mclk); + + regcache_mark_dirty(nau8825->regmap); + break; + } + return 0; +} + +static struct snd_soc_codec_driver nau8825_codec_driver = { + .probe = nau8825_codec_probe, + .set_sysclk = nau8825_set_sysclk, + .set_bias_level = nau8825_set_bias_level, + .suspend_bias_off = true, + + .controls = nau8825_controls, + .num_controls = ARRAY_SIZE(nau8825_controls), + .dapm_widgets = nau8825_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(nau8825_dapm_widgets), + .dapm_routes = nau8825_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(nau8825_dapm_routes), +}; + +static void nau8825_reset_chip(struct regmap *regmap) +{ + regmap_write(regmap, NAU8825_REG_RESET, 0x00); + regmap_write(regmap, NAU8825_REG_RESET, 0x00); +} + +static int nau8825_read_device_properties(struct device *dev, + struct nau8825 *nau8825) { + + nau8825->jkdet_enable = device_property_read_bool(dev, + "nuvoton,jkdet-enable"); + nau8825->jkdet_pull_enable = device_property_read_bool(dev, + "nuvoton,jkdet-pull-enable"); + nau8825->jkdet_pull_up = device_property_read_bool(dev, + "nuvoton,jkdet-pull-up"); + device_property_read_u32(dev, "nuvoton,jkdet-polarity", + &nau8825->jkdet_polarity); + device_property_read_u32(dev, "nuvoton,micbias-voltage", + &nau8825->micbias_voltage); + device_property_read_u32(dev, "nuvoton,vref-impedance", + &nau8825->vref_impedance); + device_property_read_u32(dev, "nuvoton,sar-threshold-num", + &nau8825->sar_threshold_num); + device_property_read_u32_array(dev, "nuvoton,sar-threshold", + nau8825->sar_threshold, nau8825->sar_threshold_num); + device_property_read_u32(dev, "nuvoton,sar-hysteresis", + &nau8825->sar_hysteresis); + device_property_read_u32(dev, "nuvoton,sar-voltage", + &nau8825->sar_voltage); + device_property_read_u32(dev, "nuvoton,sar-compare-time", + &nau8825->sar_compare_time); + device_property_read_u32(dev, "nuvoton,sar-sampling-time", + &nau8825->sar_sampling_time); + device_property_read_u32(dev, "nuvoton,short-key-debounce", + &nau8825->key_debounce); + device_property_read_u32(dev, "nuvoton,jack-insert-debounce", + &nau8825->jack_insert_debounce); + device_property_read_u32(dev, "nuvoton,jack-eject-debounce", + &nau8825->jack_eject_debounce); + + nau8825->mclk = devm_clk_get(dev, "mclk"); + if (PTR_ERR(nau8825->mclk) == -EPROBE_DEFER) { + return -EPROBE_DEFER; + } else if (PTR_ERR(nau8825->mclk) == -ENOENT) { + /* The MCLK is managed externally or not used at all */ + nau8825->mclk = NULL; + dev_info(dev, "No 'mclk' clock found, assume MCLK is managed externally"); + } else if (IS_ERR(nau8825->mclk)) { + return -EINVAL; + } + + return 0; +} + +static int nau8825_setup_irq(struct nau8825 *nau8825) +{ + struct regmap *regmap = nau8825->regmap; + int ret; + + /* IRQ Output Enable */ + regmap_update_bits(regmap, NAU8825_REG_INTERRUPT_MASK, + NAU8825_IRQ_OUTPUT_EN, NAU8825_IRQ_OUTPUT_EN); + + /* Enable internal VCO needed for interruptions */ + nau8825_configure_sysclk(nau8825, NAU8825_CLK_INTERNAL, 0); + + /* Enable DDACR needed for interrupts + * It is the same as force_enable_pin("DDACR") we do later + */ + regmap_update_bits(regmap, NAU8825_REG_ENA_CTRL, + NAU8825_ENABLE_DACR, NAU8825_ENABLE_DACR); + + /* Chip needs one FSCLK cycle in order to generate interrupts, + * as we cannot guarantee one will be provided by the system. Turning + * master mode on then off enables us to generate that FSCLK cycle + * with a minimum of contention on the clock bus. + */ + regmap_update_bits(regmap, NAU8825_REG_I2S_PCM_CTRL2, + NAU8825_I2S_MS_MASK, NAU8825_I2S_MS_MASTER); + regmap_update_bits(regmap, NAU8825_REG_I2S_PCM_CTRL2, + NAU8825_I2S_MS_MASK, NAU8825_I2S_MS_SLAVE); + + ret = devm_request_threaded_irq(nau8825->dev, nau8825->irq, NULL, + nau8825_interrupt, IRQF_TRIGGER_LOW | IRQF_ONESHOT, + "nau8825", nau8825); + + if (ret) { + dev_err(nau8825->dev, "Cannot request irq %d (%d)\n", + nau8825->irq, ret); + return ret; + } + + return 0; +} + +static int nau8825_i2c_probe(struct i2c_client *i2c, + const struct i2c_device_id *id) +{ + struct device *dev = &i2c->dev; + struct nau8825 *nau8825 = dev_get_platdata(&i2c->dev); + int ret, value; + + if (!nau8825) { + nau8825 = devm_kzalloc(dev, sizeof(*nau8825), GFP_KERNEL); + if (!nau8825) + return -ENOMEM; + ret = nau8825_read_device_properties(dev, nau8825); + if (ret) + return ret; + } + + i2c_set_clientdata(i2c, nau8825); + + nau8825->regmap = devm_regmap_init_i2c(i2c, &nau8825_regmap_config); + if (IS_ERR(nau8825->regmap)) + return PTR_ERR(nau8825->regmap); + nau8825->dev = dev; + nau8825->irq = i2c->irq; + + nau8825_reset_chip(nau8825->regmap); + ret = regmap_read(nau8825->regmap, NAU8825_REG_I2C_DEVICE_ID, &value); + if (ret < 0) { + dev_err(dev, "Failed to read device id from the NAU8825: %d\n", + ret); + return ret; + } + if ((value & NAU8825_SOFTWARE_ID_MASK) != + NAU8825_SOFTWARE_ID_NAU8825) { + dev_err(dev, "Not a NAU8825 chip\n"); + return -ENODEV; + } + + nau8825_init_regs(nau8825); + + if (i2c->irq) + nau8825_setup_irq(nau8825); + + return snd_soc_register_codec(&i2c->dev, &nau8825_codec_driver, + &nau8825_dai, 1); +} + +static int nau8825_i2c_remove(struct i2c_client *client) +{ + snd_soc_unregister_codec(&client->dev); + return 0; +} + +static const struct i2c_device_id nau8825_i2c_ids[] = { + { "nau8825", 0 }, + { } +}; + +#ifdef CONFIG_OF +static const struct of_device_id nau8825_of_ids[] = { + { .compatible = "nuvoton,nau8825", }, + {} +}; +MODULE_DEVICE_TABLE(of, nau8825_of_ids); +#endif + +static struct i2c_driver nau8825_driver = { + .driver = { + .name = "nau8825", + .owner = THIS_MODULE, + .of_match_table = of_match_ptr(nau8825_of_ids), + }, + .probe = nau8825_i2c_probe, + .remove = nau8825_i2c_remove, + .id_table = nau8825_i2c_ids, +}; +module_i2c_driver(nau8825_driver); + +MODULE_DESCRIPTION("ASoC nau8825 driver"); +MODULE_AUTHOR("Anatol Pomozov <anatol(a)chromium.org>"); +MODULE_LICENSE("GPL"); diff --git a/sound/soc/codecs/nau8825.h b/sound/soc/codecs/nau8825.h new file mode 100644 index 0000000..8774923 --- /dev/null +++ b/sound/soc/codecs/nau8825.h @@ -0,0 +1,323 @@ +/* + * NAU8825 ALSA SoC audio driver + * + * Copyright 2015 Google Inc. + * Author: Anatol Pomozov <anatol.pomozov(a)chrominium.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#ifndef __NAU8825_H__ +#define __NAU8825_H__ + +#define NAU8825_REG_RESET 0x00 +#define NAU8825_REG_ENA_CTRL 0x01 +#define NAU8825_REG_CLK_DIVIDER 0x03 +#define NAU8825_REG_FLL1 0x04 +#define NAU8825_REG_FLL2 0x05 +#define NAU8825_REG_FLL3 0x06 +#define NAU8825_REG_FLL4 0x07 +#define NAU8825_REG_FLL5 0x08 +#define NAU8825_REG_FLL6 0x09 +#define NAU8825_REG_FLL_VCO_RSV 0x0a +#define NAU8825_REG_HSD_CTRL 0x0c +#define NAU8825_REG_JACK_DET_CTRL 0x0d +#define NAU8825_REG_INTERRUPT_MASK 0x0f +#define NAU8825_REG_IRQ_STATUS 0x10 +#define NAU8825_REG_INT_CLR_KEY_STATUS 0x11 +#define NAU8825_REG_INTERRUPT_DIS_CTRL 0x12 +#define NAU8825_REG_SAR_CTRL 0x13 +#define NAU8825_REG_KEYDET_CTRL 0x14 +#define NAU8825_REG_VDET_THRESHOLD_1 0x15 +#define NAU8825_REG_VDET_THRESHOLD_2 0x16 +#define NAU8825_REG_VDET_THRESHOLD_3 0x17 +#define NAU8825_REG_VDET_THRESHOLD_4 0x18 +#define NAU8825_REG_GPIO34_CTRL 0x19 +#define NAU8825_REG_GPIO12_CTRL 0x1a +#define NAU8825_REG_TDM_CTRL 0x1b +#define NAU8825_REG_I2S_PCM_CTRL1 0x1c +#define NAU8825_REG_I2S_PCM_CTRL2 0x1d +#define NAU8825_REG_LEFT_TIME_SLOT 0x1e +#define NAU8825_REG_RIGHT_TIME_SLOT 0x1f +#define NAU8825_REG_BIQ_CTRL 0x20 +#define NAU8825_REG_BIQ_COF1 0x21 +#define NAU8825_REG_BIQ_COF2 0x22 +#define NAU8825_REG_BIQ_COF3 0x23 +#define NAU8825_REG_BIQ_COF4 0x24 +#define NAU8825_REG_BIQ_COF5 0x25 +#define NAU8825_REG_BIQ_COF6 0x26 +#define NAU8825_REG_BIQ_COF7 0x27 +#define NAU8825_REG_BIQ_COF8 0x28 +#define NAU8825_REG_BIQ_COF9 0x29 +#define NAU8825_REG_BIQ_COF10 0x2a +#define NAU8825_REG_ADC_RATE 0x2b +#define NAU8825_REG_DAC_CTRL1 0x2c +#define NAU8825_REG_DAC_CTRL2 0x2d +#define NAU8825_REG_DAC_DGAIN_CTRL 0x2f +#define NAU8825_REG_ADC_DGAIN_CTRL 0x30 +#define NAU8825_REG_MUTE_CTRL 0x31 +#define NAU8825_REG_HSVOL_CTRL 0x32 +#define NAU8825_REG_DACL_CTRL 0x33 +#define NAU8825_REG_DACR_CTRL 0x34 +#define NAU8825_REG_ADC_DRC_KNEE_IP12 0x38 +#define NAU8825_REG_ADC_DRC_KNEE_IP34 0x39 +#define NAU8825_REG_ADC_DRC_SLOPES 0x3a +#define NAU8825_REG_ADC_DRC_ATKDCY 0x3b +#define NAU8825_REG_DAC_DRC_KNEE_IP12 0x45 +#define NAU8825_REG_DAC_DRC_KNEE_IP34 0x46 +#define NAU8825_REG_DAC_DRC_SLOPES 0x47 +#define NAU8825_REG_DAC_DRC_ATKDCY 0x48 +#define NAU8825_REG_IMM_MODE_CTRL 0x4c +#define NAU8825_REG_IMM_RMS_L 0x4d +#define NAU8825_REG_IMM_RMS_R 0x4e +#define NAU8825_REG_CLASSG_CTRL 0x50 +#define NAU8825_REG_OPT_EFUSE_CTRL 0x51 +#define NAU8825_REG_MISC_CTRL 0x55 +#define NAU8825_REG_I2C_DEVICE_ID 0x58 +#define NAU8825_REG_SARDOUT_RAM_STATUS 0x59 +#define NAU8825_REG_BIAS_ADJ 0x66 +#define NAU8825_REG_TRIM_SETTINGS 0x68 +#define NAU8825_REG_ANALOG_CONTROL_1 0x69 +#define NAU8825_REG_ANALOG_CONTROL_2 0x6a +#define NAU8825_REG_ANALOG_ADC_1 0x71 +#define NAU8825_REG_ANALOG_ADC_2 0x72 +#define NAU8825_REG_RDAC 0x73 +#define NAU8825_REG_MIC_BIAS 0x74 +#define NAU8825_REG_BOOST 0x76 +#define NAU8825_REG_FEPGA 0x77 +#define NAU8825_REG_POWER_UP_CONTROL 0x7f +#define NAU8825_REG_CHARGE_PUMP 0x80 +#define NAU8825_REG_CHARGE_PUMP_INPUT_READ 0x81 +#define NAU8825_REG_GENERAL_STATUS 0x82 +#define NAU8825_REG_MAX NAU8825_REG_GENERAL_STATUS + +/* ENA_CTRL (0x1) */ +#define NAU8825_ENABLE_DACR_SFT 10 +#define NAU8825_ENABLE_DACR (1 << NAU8825_ENABLE_DACR_SFT) +#define NAU8825_ENABLE_DACL_SFT 9 +#define NAU8825_ENABLE_ADC_SFT 8 +#define NAU8825_ENABLE_SAR_SFT 1 + +/* CLK_DIVIDER (0x3) */ +#define NAU8825_CLK_SRC_SFT 15 +#define NAU8825_CLK_SRC_MASK (1 << NAU8825_CLK_SRC_SFT) +#define NAU8825_CLK_SRC_VCO (1 << NAU8825_CLK_SRC_SFT) +#define NAU8825_CLK_SRC_MCLK (0 << NAU8825_CLK_SRC_SFT) + +/* FLL6 (0x9) */ +#define NAU8825_DCO_EN (1 << 15) + +/* HSD_CTRL (0xc) */ +#define NAU8825_HSD_AUTO_MODE (1 << 6) +/* 0 - short to GND, 1 - open */ +#define NAU8825_SPKR_DWN1R (1 << 1) +#define NAU8825_SPKR_DWN1L (1 << 0) + +/* JACK_DET_CTRL (0xd) */ +#define NAU8825_JACK_DET_RESTART (1 << 9) +#define NAU8825_JACK_INSERT_DEBOUNCE_SFT 5 +#define NAU8825_JACK_INSERT_DEBOUNCE_MASK (0x7 << NAU8825_JACK_INSERT_DEBOUNCE_SFT) +#define NAU8825_JACK_EJECT_DEBOUNCE_SFT 2 +#define NAU8825_JACK_EJECT_DEBOUNCE_MASK (0x7 << NAU8825_JACK_EJECT_DEBOUNCE_SFT) +#define NAU8825_JACK_POLARITY (1 << 1) /* 0 - active low, 1 - active high */ + +/* INTERRUPT_MASK (0xf) */ +#define NAU8825_IRQ_OUTPUT_EN (1 << 11) +#define NAU8825_IRQ_HEADSET_COMPLETE_EN (1 << 10) +#define NAU8825_IRQ_KEY_RELEASE_EN (1 << 7) +#define NAU8825_IRQ_KEY_SHORT_PRESS_EN (1 << 5) +#define NAU8825_IRQ_EJECT_EN (1 << 2) + +/* IRQ_STATUS (0x10) */ +#define NAU8825_HEADSET_COMPLETION_IRQ (1 << 10) +#define NAU8825_SHORT_CIRCUIT_IRQ (1 << 9) +#define NAU8825_IMPEDANCE_MEAS_IRQ (1 << 8) +#define NAU8825_KEY_IRQ_MASK (0x7 << 5) +#define NAU8825_KEY_RELEASE_IRQ (1 << 7) +#define NAU8825_KEY_LONG_PRESS_IRQ (1 << 6) +#define NAU8825_KEY_SHORT_PRESS_IRQ (1 << 5) +#define NAU8825_MIC_DETECTION_IRQ (1 << 4) +#define NAU8825_JACK_EJECTION_IRQ_MASK (3 << 2) +#define NAU8825_JACK_EJECTION_DETECTED (1 << 2) +#define NAU8825_JACK_INSERTION_IRQ_MASK (3 << 0) +#define NAU8825_JACK_INSERTION_DETECTED (1 << 0) + +/* INTERRUPT_DIS_CTRL (0x12) */ +#define NAU8825_IRQ_HEADSET_COMPLETE_DIS (1 << 10) +#define NAU8825_IRQ_KEY_RELEASE_DIS (1 << 7) +#define NAU8825_IRQ_KEY_SHORT_PRESS_DIS (1 << 5) +#define NAU8825_IRQ_EJECT_DIS (1 << 2) + +/* SAR_CTRL (0x13) */ +#define NAU8825_SAR_ADC_EN_SFT 12 +#define NAU8825_SAR_ADC_EN (1 << NAU8825_SAR_ADC_EN_SFT) +#define NAU8825_SAR_INPUT_MASK (1 << 11) +#define NAU8825_SAR_INPUT_JKSLV (1 << 11) +#define NAU8825_SAR_INPUT_JKR2 (0 << 11) +#define NAU8825_SAR_TRACKING_GAIN_SFT 8 +#define NAU8825_SAR_TRACKING_GAIN_MASK (0x7 << NAU8825_SAR_TRACKING_GAIN_SFT) +#define NAU8825_SAR_COMPARE_TIME_SFT 2 +#define NAU8825_SAR_COMPARE_TIME_MASK (3 << 2) +#define NAU8825_SAR_SAMPLING_TIME_SFT 0 +#define NAU8825_SAR_SAMPLING_TIME_MASK (3 << 0) + +/* KEYDET_CTRL (0x14) */ +#define NAU8825_KEYDET_SHORTKEY_DEBOUNCE_SFT 12 +#define NAU8825_KEYDET_SHORTKEY_DEBOUNCE_MASK (0x3 << NAU8825_KEYDET_SHORTKEY_DEBOUNCE_SFT) +#define NAU8825_KEYDET_LEVELS_NR_SFT 8 +#define NAU8825_KEYDET_LEVELS_NR_MASK (0x7 << 8) +#define NAU8825_KEYDET_HYSTERESIS_SFT 0 +#define NAU8825_KEYDET_HYSTERESIS_MASK 0xf + +/* GPIO12_CTRL (0x1a) */ +#define NAU8825_JKDET_PULL_UP (1 << 11) /* 0 - pull down, 1 - pull up */ +#define NAU8825_JKDET_PULL_EN (1 << 9) /* 0 - enable pull, 1 - disable */ +#define NAU8825_JKDET_OUTPUT_EN (1 << 8) /* 0 - enable input, 1 - enable output */ + +/* I2S_PCM_CTRL1 (0x1c) */ +#define NAU8825_I2S_BP_SFT 7 +#define NAU8825_I2S_BP_MASK (1 << NAU8825_I2S_BP_SFT) +#define NAU8825_I2S_BP_INV (1 << NAU8825_I2S_BP_SFT) +#define NAU8825_I2S_PCMB_SFT 6 +#define NAU8825_I2S_PCMB_MASK (1 << NAU8825_I2S_PCMB_SFT) +#define NAU8825_I2S_PCMB_EN (1 << NAU8825_I2S_PCMB_SFT) +#define NAU8825_I2S_DL_SFT 2 +#define NAU8825_I2S_DL_MASK (0x3 << NAU8825_I2S_DL_SFT) +#define NAU8825_I2S_DL_16 (0 << NAU8825_I2S_DL_SFT) +#define NAU8825_I2S_DL_20 (1 << NAU8825_I2S_DL_SFT) +#define NAU8825_I2S_DL_24 (2 << NAU8825_I2S_DL_SFT) +#define NAU8825_I2S_DL_32 (3 << NAU8825_I2S_DL_SFT) +#define NAU8825_I2S_DF_SFT 0 +#define NAU8825_I2S_DF_MASK (0x3 << NAU8825_I2S_DF_SFT) +#define NAU8825_I2S_DF_RIGTH (0 << NAU8825_I2S_DF_SFT) +#define NAU8825_I2S_DF_LEFT (1 << NAU8825_I2S_DF_SFT) +#define NAU8825_I2S_DF_I2S (2 << NAU8825_I2S_DF_SFT) +#define NAU8825_I2S_DF_PCM_AB (3 << NAU8825_I2S_DF_SFT) + +/* I2S_PCM_CTRL2 (0x1d) */ +#define NAU8825_I2S_TRISTATE (1 << 15) /* 0 - normal mode, 1 - Hi-Z output */ +#define NAU8825_I2S_MS_SFT 3 +#define NAU8825_I2S_MS_MASK (1 << NAU8825_I2S_MS_SFT) +#define NAU8825_I2S_MS_MASTER (1 << NAU8825_I2S_MS_SFT) +#define NAU8825_I2S_MS_SLAVE (0 << NAU8825_I2S_MS_SFT) + +/* ADC_RATE (0x2b) */ +#define NAU8825_ADC_SYNC_DOWN_SFT 0 +#define NAU8825_ADC_SYNC_DOWN_MASK 0x3 +#define NAU8825_ADC_SYNC_DOWN_32 0 +#define NAU8825_ADC_SYNC_DOWN_64 1 +#define NAU8825_ADC_SYNC_DOWN_128 2 +#define NAU8825_ADC_SYNC_DOWN_256 3 + +/* DAC_CTRL1 (0x2c) */ +#define NAU8825_DAC_CLIP_OFF (1 << 7) +#define NAU8825_DAC_OVERSAMPLE_SFT 0 +#define NAU8825_DAC_OVERSAMPLE_MASK 0x7 +#define NAU8825_DAC_OVERSAMPLE_64 0 +#define NAU8825_DAC_OVERSAMPLE_256 1 +#define NAU8825_DAC_OVERSAMPLE_128 2 +#define NAU8825_DAC_OVERSAMPLE_32 4 + +/* MUTE_CTRL (0x31) */ +#define NAU8825_DAC_ZERO_CROSSING_EN (1 << 9) +#define NAU8825_DAC_SOFT_MUTE (1 << 9) + +/* HSVOL_CTRL (0x32) */ +#define NAU8825_HP_MUTE (1 << 15) + +/* DACL_CTRL (0x33) */ +#define NAU8825_DACL_CH_SEL_SFT 9 + +/* DACR_CTRL (0x34) */ +#define NAU8825_DACR_CH_SEL_SFT 9 + +/* I2C_DEVICE_ID (0x58) */ +#define NAU8825_GPIO2JD1 (1 << 7) +#define NAU8825_SOFTWARE_ID_MASK 0x3 +#define NAU8825_SOFTWARE_ID_NAU8825 0x0 + +/* BIAS_ADJ (0x66) */ +#define NAU8825_BIAS_VMID (1 << 6) +#define NAU8825_BIAS_VMID_SEL_SFT 4 +#define NAU8825_BIAS_VMID_SEL_MASK (3 << NAU8825_BIAS_VMID_SEL_SFT) + +/* ANALOG_CONTROL_2 (0x6a) */ +#define NAU8825_HP_NON_CLASSG_CURRENT_2xADJ (1 << 12) +#define NAU8825_DAC_CAPACITOR_MSB (1 << 1) +#define NAU8825_DAC_CAPACITOR_LSB (1 << 0) + +/* ANALOG_ADC_2 (0x72) */ +#define NAU8825_ADC_VREFSEL_MASK (0x3 << 8) +#define NAU8825_ADC_VREFSEL_ANALOG (0 << 8) +#define NAU8825_ADC_VREFSEL_VMID (1 << 8) +#define NAU8825_ADC_VREFSEL_VMID_PLUS_0_5DB (2 << 8) +#define NAU8825_ADC_VREFSEL_VMID_PLUS_1DB (3 << 8) +#define NAU8825_POWERUP_ADCL (1 << 6) + +/* MIC_BIAS (0x74) */ +#define NAU8825_MICBIAS_JKSLV (1 << 14) +#define NAU8825_MICBIAS_JKR2 (1 << 12) +#define NAU8825_MICBIAS_POWERUP_SFT 8 +#define NAU8825_MICBIAS_VOLTAGE_SFT 0 +#define NAU8825_MICBIAS_VOLTAGE_MASK 0x7 + +/* BOOST (0x76) */ +#define NAU8825_PRECHARGE_DIS (1 << 13) +#define NAU8825_GLOBAL_BIAS_EN (1 << 12) +#define NAU8825_HP_BOOST_G_DIS (1 << 8) +#define NAU8825_SHORT_SHUTDOWN_EN (1 << 6) + +/* POWER_UP_CONTROL (0x7f) */ +#define NAU8825_POWERUP_INTEGR_R (1 << 5) +#define NAU8825_POWERUP_INTEGR_L (1 << 4) +#define NAU8825_POWERUP_DRV_IN_R (1 << 3) +#define NAU8825_POWERUP_DRV_IN_L (1 << 2) +#define NAU8825_POWERUP_HP_DRV_R (1 << 1) +#define NAU8825_POWERUP_HP_DRV_L (1 << 0) + +/* CHARGE_PUMP (0x80) */ +#define NAU8825_JAMNODCLOW (1 << 10) +#define NAU8825_POWER_DOWN_DACR (1 << 9) +#define NAU8825_POWER_DOWN_DACL (1 << 8) +#define NAU8825_CHANRGE_PUMP_EN (1 << 5) + + +/* System Clock Source */ +enum { + NAU8825_CLK_MCLK = 0, + NAU8825_CLK_INTERNAL, +}; + +struct nau8825 { + struct device *dev; + struct regmap *regmap; + struct snd_soc_dapm_context *dapm; + struct snd_soc_jack *jack; + struct clk *mclk; + int irq; + int mclk_freq; /* 0 - mclk is disabled */ + int button_pressed; + int micbias_voltage; + int vref_impedance; + bool jkdet_enable; + bool jkdet_pull_enable; + bool jkdet_pull_up; + int jkdet_polarity; + int sar_threshold_num; + int sar_threshold[8]; + int sar_hysteresis; + int sar_voltage; + int sar_compare_time; + int sar_sampling_time; + int key_debounce; + int jack_insert_debounce; + int jack_eject_debounce; +}; + +int nau8825_enable_jack_detect(struct snd_soc_codec *codec, + struct snd_soc_jack *jack); + + +#endif /* __NAU8825_H__ */ -- 2.6.0.rc2.230.g3dd15c0

3 5

[alsa-devel] [PATCH v2 0/8] ASoC: topology: ABI - Add support for PCM, BE & CC link
by mengdong.lin＠intel.com 07 Oct '15

07 Oct '15

From: Mengdong Lin <mengdong.lin(a)intel.com> This series includes topology ABI update to support PCM (FE DAI/DAI links), BE and CC DAI links. Bump the ABI version to 4. Mengdong Lin (2): ASoC: topology: ABI - Change stream formats to a bitwise flag ASoC: topology: ABI - Remove tdm_slot & dai_fmt from snd_soc_tplg_stream Vedang Patel (6): ASoC: topology: ABI - Add PCM Support and bump ABI version to 4 ASoC: topology: ABI - Remove unused struct snd_soc_tplg_stream_config ASoC: topology: ABI - Use __le32 instead of __u32 in snd_soc_tplg_dapm_widget ASoC: topology: ABI - Add name element to snd_soc_tplg_stream ASoC: topology: ABI - Add the type for BE DAI link ASoC: topology: ABI - Add configuration for BE & Codec-Codec DAI Links include/uapi/sound/asoc.h | 76 +++++++++++++++++++++++++---------------------- sound/soc/soc-topology.c | 4 +-- 2 files changed, 43 insertions(+), 37 deletions(-) -- 1.9.1

7 21

[alsa-devel] [PATCH RFC V2 0/5] another generic audio hdmi codec proposal
by Arnaud Pouliquen 07 Oct '15

07 Oct '15

Version 2: This version integrates missing features upgraded to be aligned when possible with patch set: [PATCH RFC v4 0/8] Implement generic ASoC HDMI codec and use it in tda998x It does not support the abort callback, the mute and syclk ops. This could be added in V3 or separate patch if justified. [RFC 1/5]video: hdmi: add help function for N and CTS - Replace real frequency value by enum in switch case Notice that this patch is independant from the rest of the implentation [RFC 2/5]drm: add helper functions to add audio capabilities for bridge - extend audio bridge ops [RFC 3/5]ASoC: codec: hdmi drm codec driver aligned when possible with hdmi-codec.c implementation . ELD management for alsa contraints . Support of SPDIF and I2S mode . hwparam ond set_fmt functions implemented [RFC 4/5]drm: sti: connect audio driver => Implementation for STI platform [RFC 5/5]DT: sti: add audio HDMI dai link in audio card => Devicetree example Version 1: This patch set is a tentative to implement a generic code for the HDMI audio. Main concept are aligned with solution proposeded for TI platform. - ASoC codec driver registered by DRM driver - ASOC driver is a generic driver. - compatible with simple card Difference is that i propose a DRM generic interface based on bridge structure. Advantage is that all data exchanges are done through the DRM API. I think also that some helper functions could been used for N and CTS parameters calculation, as suggested by Russell King in a previous mail. I full aware that some features (like ELD and info frame) are partially or not implemented in my patches. This patch set is more a skeleton than a full implementation... I just post it to suggest a possible DRM API. Arnaud Pouliquen (5): video: hdmi: add helper function for N and CTS drm: add helper function to add audio capabilities for bridge ASoC: codec: hdmi drm codec driver drm: sti: connect audio driver DT: sti: add audio HDMI dai link in audio card arch/arm/boot/dts/stih410.dtsi | 6 +- arch/arm/boot/dts/stihxxx-b2120.dtsi | 21 ++ drivers/gpu/drm/drm_bridge.c | 137 +++++++++++++- drivers/gpu/drm/sti/sti_hdmi.c | 184 ++++++++++++++++-- drivers/gpu/drm/sti/sti_hdmi.h | 3 + drivers/video/hdmi.c | 147 ++++++++++++++ include/drm/drm_crtc.h | 62 ++++++ include/drm/drm_modes.h | 12 ++ include/linux/hdmi.h | 12 ++ include/sound/hdmi_drm.h | 15 ++ sound/soc/codecs/Kconfig | 8 +- sound/soc/codecs/Makefile | 2 + sound/soc/codecs/hdmi_drm.c | 358 +++++++++++++++++++++++++++++++++++ 13 files changed, 951 insertions(+), 16 deletions(-) create mode 100644 include/sound/hdmi_drm.h create mode 100644 sound/soc/codecs/hdmi_drm.c -- 1.9.1

6 16

[alsa-devel] Zoom R16/24 playback slient
by Ricard Wanderlof 07 Oct '15

07 Oct '15

Bringing up an old thread from 2014 since I've gotten access to a Zoom R16 and am keen on getting it to work in full duplex under Linux. Apparently (not yet verified here yet, rebuilding a kernel with the patch applied at the moment), 8 channel capture works with the quirk, but playback doesn't (well, it appears to work, but no sound comes out) and neither does the mixer. > At Sun, 30 Nov 2014 12:08:38 +0200, > Panu Matilainen wrote: > > > > On 11/29/2014 09:39 PM, Takashi Iwai wrote: > > > At Sat, 29 Nov 2014 21:35:04 +0200, > > > Panu Matilainen wrote: > > >> > > >> This makes the midi interface and capture work out of the box with > > >> R16 (and presumably R24 too but untested). Playback stream would also > > >> seem to function fine except for one caveat: no sound is produced, > > >> so it is disabled for now. > > > > [ ... ] > > > > In the meanwhile I started looking at the mixer - this is just guessing > > but maybe its starting with outputs muted which could explain the > > playback stream running but without sound. > > > > The descriptors for interface 0 are garbage but what is there would seem > > to map to logical elements by subtype and terminaltype, after those the> > data doesn't seem to add up (eg number of input/output channels > > missing/wrongly placed etc): > > > > ** UNRECOGNIZED: 0b 24 01 00 01 35 00 03 01 02 03 > > -> Header? > > ** UNRECOGNIZED: 0c 24 02 05 01 01 00 02 03 00 00 00 > > -> USB streaming input terminal? > > ** UNRECOGNIZED: 09 24 03 08 01 03 00 05 00 > > -> Speaker output terminal? > > ** UNRECOGNIZED: 0c 24 02 09 01 02 00 08 00 00 00 00 > > -> Microphone input terminal? > > ** UNRECOGNIZED: 09 24 03 0c 01 01 00 09 00 > > -> USB streaming output terminal? > > > > Anything there that might ring a bell, or other ideas where to start > > poking at this thing? > > Yeah, most of these look almost sane, so any off-by-one firmware > issue? Searching the archives, I could find no further posts on the subject of the R16. Panu, did you do any more work on this? Where does the above output come from, and where could I find information on what type of data is expected? I assume what's expected is something one would get from an USB mixer device? In an earlier incarnation of a patch for the R16 (on the 10th of March 2014), there's a discussion between Jason Mancine and Takashi regarding the .format field in the quirks table (http://mailman.alsa-project.org/pipermail/alsa-devel/2014-March/074117.html) which didn't seem to reach a conclusion; the problem then seemed to be that even when setting the .format to SNDRV_PCM_FMTBIT_S24_3LE, ALSA still setup up a 32 bit transfer. However, Panu's patch also added a small delay in snd_usb_ctl_msg_quirk(), so that perhaps was the real solution to the alleged format problem? (The final patch is much smaller than in this particular thread, possibly due to the use of QUIRK_ANY_INTERFACE since kernel version >3.11 ?) /Ricard -- Ricard Wolf Wanderlöf ricardw(at)axis.com Axis Communications AB, Lund, Sweden www.axis.com Phone +46 46 272 2016 Fax +46 46 13 61 30

3 17

[alsa-devel] [PATCH] ASoC: ad193x-spi: Fixup ad193x_spi_id table
by Axel Lin 07 Oct '15

07 Oct '15

AD1939 is missed from the table, so add it. AD1936 and AD1937 are controlled by I2C interface, so remove them. Fixes: e5224f58e3ef ("ASoC: ad193x: add support to ad1934") Signed-off-by: Axel Lin <axel.lin(a)ingics.com> --- sound/soc/codecs/ad193x-spi.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/codecs/ad193x-spi.c b/sound/soc/codecs/ad193x-spi.c index 364e8211..b55055a 100644 --- a/sound/soc/codecs/ad193x-spi.c +++ b/sound/soc/codecs/ad193x-spi.c @@ -39,9 +39,8 @@ static const struct spi_device_id ad193x_spi_id[] = { { "ad193x", AD193X }, { "ad1933", AD1933 }, { "ad1934", AD1934 }, - { "ad1936", AD193X }, - { "ad1937", AD193X }, { "ad1938", AD193X }, + { "ad1939", AD193X }, { } }; MODULE_DEVICE_TABLE(spi, ad193x_spi_id); -- 2.1.4

3 2