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

[alsa-devel] ASoC TDM channel re-mapping
by Edward Cragg 17 Jun '25

17 Jun '25

Hi, We have an ASoC driver in which we have added support for TDM over an I2S interface. We would like to have the capability of re-mapping the channel ordering, for which i know there is a callback in place to start this process, set_channel_map. The only backend implementation of this is using the ALSA API and the .copy handler in an ALSA PCM driver to mutate data copied out of ALSA before it's DMA'd to hardware. This is in sound/soc/blackfin/bf5xx-i2s-pcm.c The problem we have is that the driver we're using currently uses a dmaengine based PCM driver, and i'm not sure whether this is compatible with using the .copy callback, without reimplementing the driver entirely as an ALSA PCM driver. Since there aren't very many examples in mainline, I was hoping to ask for advice for the best way of doing this. I wondered: - Would it be possible to add a functional copy callback using a dmaengine based PCM driver? - Otherwise, would there be a good way to implement channel remapping in a TDM frame using the dmaengine based PCM driver? or - Would the best way indeed be to reimplement the PCM driver as a normal ALSA PCM driver? Thanks, Ed Cragg

2 2

[alsa-devel] Error patching file pcm_native.c
by Delusion's Master 20 Nov '24

20 Nov '24

Hi, first of all I apologize in case you receive multiple copies of this message, but I forgot to specify a subject in the original mail. I have a problem compiling the latest alsa driver snapshots. Specifically, it's a problem when patching pcm_native.c: [..] copying file alsa-kernel/core/info.c patching file info.c copying file alsa-kernel/core/pcm.c patching file pcm.c Hunk #3 succeeded at 739 (offset 2 lines). Hunk #5 succeeded at 954 (offset 2 lines). Hunk #7 succeeded at 1045 (offset 2 lines). copying file alsa-kernel/core/pcm_native.c patching file pcm_native.c Hunk #4 succeeded at 1544 (offset -25 lines). Hunk #5 succeeded at 2827 (offset 12 lines). Hunk #6 succeeded at 2878 (offset 10 lines). Hunk #7 FAILED at 2906. Hunk #8 FAILED at 2922. Hunk #9 succeeded at 2915 (offset -23 lines). Hunk #10 succeeded at 3036 (offset 10 lines). Hunk #11 succeeded at 3027 (offset -23 lines). Hunk #12 succeeded at 3074 (offset 10 lines). Hunk #13 succeeded at 3098 (offset -23 lines). Hunk #14 succeeded at 3143 (offset 10 lines). Hunk #15 succeeded at 3124 (offset -23 lines). Hunk #16 succeeded at 3214 (offset 10 lines). Hunk #17 succeeded at 3208 (offset -23 lines). Hunk #18 succeeded at 3271 (offset 10 lines). Hunk #19 succeeded at 3304 (offset -23 lines). Hunk #20 succeeded at 3386 (offset 10 lines). Hunk #21 succeeded at 3411 (offset -23 lines). Hunk #22 succeeded at 3456 (offset 10 lines). Hunk #23 succeeded at 3450 (offset -23 lines). Hunk #24 succeeded at 3525 (offset 10 lines). Hunk #25 succeeded at 3644 (offset -23 lines). 2 out of 25 hunks FAILED -- saving rejects to file pcm_native.c.rej make[2]: *** [pcm_native.c] Error 1 It's some days I get this, but I waited to report this since I thought it could be a temporary problem. My OS is Fedora 11 x86_64. Previous snapshots didn't give me this problem, but I can't say which one broke the compilation, since I usually try updated snapshots only at kernel updates. I searched for this error and the only relevant report I could find is this one: http://mailman.alsa-project.org/pipermail/alsa-devel/2009-April/016420.html a report from last April. What could the problem be? Thanks _________________________________________________________________ Invite your mail contacts to join your friends list with Windows Live Spaces. It's easy! http://spaces.live.com/spacesapi.aspx?wx_action=create&wx_url=/friends.aspx…

3 10

[alsa-devel] unsupported variant of snd_hda_intel
by Alexandre 04 Jul '24

04 Jul '24

Hello, I have an Acer Aspire 4736G laptop. The soundcard that is shipped in this laptop is intel-hda based as shown (actually it's a realtek): cat /proc/asound/cards 0 [Intel ]: HDA-Intel - HDA Intel HDA Intel at 0x9b300000 irq 46 Basic sound output is correct but few feature are missing: - internal mic seems to be found but do not works. - sound output stop working when trying to send it using HDMI output - heads do not work when plugged neither when forcing pulseaudio to use it. I have an ubuntu 10.10 which is shipped with alsa 1.0.23. I have googled around and tried loading the snd-hda-intel with several parameters () as found in HD-Audio-Models.txt to no avail. cat /proc/asound/pcm 00-00: ALC888 Analog : ALC888 Analog : playback 1 : capture 1 00-01: ALC888 Digital : ALC888 Digital : playback 1 00-03: NVIDIA HDMI : NVIDIA HDMI : playback 1 Where can I begin to help implement the support for this sound card? I have very skills in developement in general but am ready to try if it is not to hard (I supose I can use previous code for similar models).. I just need a shepherd. Thanks

4 4

[alsa-devel] echo-cancellation plugin advice?
by Max Klein 27 Oct '23

27 Oct '23

> Well, asym wouldn't be the answer. Basically you'll need to open two > slave PCMs in one plugin. So, it's no simple filter-type plugin. > It's doable, but not easy as it sounds, I guess. Takashi, can you please further explain why asym is not the solution and what you see as a problem? I am also trying to figure out if it would be possible to create such a plugin for ALSA? I am still searching for some good starting points on how to write an ALSA plugin... Jean-Marc Valin (http://lists.linuxaudio.org/pipermail/linux-audio-dev/2005-June/012454.html) already released his work as part of speex but as far I know there is no plugin that has been made out of it? Thanks for any hint! -- NEU: FreePhone 3-fach-Flat mit kostenlosem Smartphone! Jetzt informieren: http://mobile.1und1.de/?ac=OM.PW.PW003K20328T7073a

3 2

[alsa-devel] ALSA 1.0.29 release
by Jaroslav Kysela 19 Feb '20

19 Feb '20

Hello all, all userspace packages (except alsa-oss) were released today. You may download them from the ALSA website http://www.alsa-project.org or directly from the FTP server ftp://ftp.alsa-project.org/pub . Full list of changes: http://www.alsa-project.org/main/index.php/Changes_v1.0.28_v1.0.29 Have fun, Jaroslav -- Jaroslav Kysela <perex(a)perex.cz> Linux Kernel Sound Maintainer ALSA Project; Red Hat, Inc.

2 16

[alsa-devel] [PATCH RFC 00/26] Kill set_fs() in ALSA codes
by Takashi Iwai 27 Mar '19

27 Mar '19

Hi, this is a slightly lengthy patchset, basically targeted for 4.13, thus it's still in RFC. The main purpose of this patchset is to get rid of get_fs() / set_fs() usages in ALSA codes. The patchset starts from a patch that looks fairly irrelevant with the goal (the conversion of HD-audio bind-mute code), but it's a step for the long trail. The biggest change in the patchset is the conversion of copy & silence PCM ops into the new copy_silence ops. It helped for reducing the code size and for handling the in-kernel buffer copies. The current patches are found in topic/kill-set_fs branch of my sound.git tree. thanks, Takashi === Takashi Iwai (26): ALSA: hda - Simplify bound-beep mute control for ALC268 ALSA: hda - Move bind-mixer switch codes to generic parser ALSA: hda - Remove the generic bind ctl helpers ALSA: hda - Remove the use of set_fs() ALSA: hda - Fix a typo in comment ALSA: hda - Remove superfluous header inclusions ALSA: opl3: Kill unused set_fs() ALSA: emu10k1: Get rid of set_fs() usage ALSA: pcm: Remove set_fs() in PCM core code ALSA: pcm: Introduce copy_silence PCM ops ALSA: Update document about copy_silence PCM ops ALSA: dummy: Convert to copy_silence ops ALSA: es1938: Convert to copy_silence ops ALSA: korg1212: Convert to copy_silence ops ALSA: nm256: Convert to copy_silence ops ALSA: rme32: Convert to copy_silence ops ALSA: rme96: Convert to copy_silence ops ALSA: rme9652: Convert to copy_silence ops ALSA: hdsp: Convert to copy_silence ops ALSA: gus: Convert to copy_silence ops ALSA: sb: Convert to copy_silence ops ALSA: sh: Convert to copy_silence ops ASoC: blackfin: Convert to copy_silence ops [media] solo6x10: Convert to copy_silence ops ALSA: pcm: Drop the old copy and silence ops ALSA: pcm: Kill set_fs() usage in OSS layer and USB gadget .../sound/kernel-api/writing-an-alsa-driver.rst | 110 +++++---- drivers/media/pci/solo6x10/solo6x10-g723.c | 11 +- drivers/usb/gadget/function/u_uac1.c | 8 +- include/sound/pcm.h | 19 +- sound/core/oss/pcm_oss.c | 62 ++--- sound/core/pcm_compat.c | 22 +- sound/core/pcm_lib.c | 174 +++++++++----- sound/core/pcm_native.c | 122 ++++++---- sound/drivers/dummy.c | 13 +- sound/drivers/opl3/opl3_oss.c | 14 -- sound/isa/gus/gus_pcm.c | 43 +--- sound/isa/sb/emu8000_pcm.c | 99 +++----- sound/pci/emu10k1/emufx.c | 127 ++++++----- sound/pci/es1938.c | 11 +- sound/pci/hda/hda_codec.c | 251 +++------------------ sound/pci/hda/hda_generic.c | 46 +++- sound/pci/hda/hda_local.h | 61 ----- sound/pci/hda/patch_realtek.c | 37 ++- sound/pci/korg1212/korg1212.c | 128 +++-------- sound/pci/nm256/nm256.c | 35 ++- sound/pci/rme32.c | 49 ++-- sound/pci/rme96.c | 52 ++--- sound/pci/rme9652/hdsp.c | 44 ++-- sound/pci/rme9652/rme9652.c | 46 ++-- sound/sh/sh_dac_audio.c | 40 +--- sound/soc/blackfin/bf5xx-ac97-pcm.c | 6 +- sound/soc/blackfin/bf5xx-ac97.c | 18 +- sound/soc/blackfin/bf5xx-i2s-pcm.c | 46 ++-- sound/soc/soc-pcm.c | 3 +- 29 files changed, 696 insertions(+), 1001 deletions(-) -- 2.12.2

3 40

[alsa-devel] [PATCH 0/x] ASoC: replace platform to component
by Kuninori Morimoto 12 Feb '18

12 Feb '18

Hi Mark These are for replace "platform" to "component". It needs 3 steps I think. step1. "component" needs _add_ function, like "platform" step2. "component" level pcm_new/free support step3. replace platform to component We can get platform pointer from rtd->platform on current style. But these are very categorized pointer, in other words, non generic pointer. This cleanup is 1st step of merging all feature into component. I think new style wil be CPU + Codec + Platform = Component I think merging CPU into Component is already done. This patch set merges Platform feature into Component, and remove Platform. Merging Codec into Component is next step. This patch set will add new rtd connected component list. All CPU/Codec/Platform are connected to this list. And we can get each component pointer by using rtd and its driver name. Here, We can replace rtd->platform like below - struct device *dev = rtd->platform->dev; + struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, DRIVER_NAME); + struct device *dev = component->dev; - if(rtd->platform->pcm_new) - rtd->platform->pcm_new(yyy); + for_each_rtdcom(rtd, rtdcom) { + component = rtdcom->component; /* rtd connected CPU/Codec/Platform */ + if (component->pcm_new) + component->pcm_new(yyy); + } Now, only platform has pcm_new/free, but in new style, all component can have it. I will post step1/2/3 patch-set. step1 is normal patches. step2/3 are now still [RFC]. Best regards --- Kuninori Morimoto

2 23

[alsa-devel] [PATCH 4/6] alsa-lib:pcm: fix the hw_ptr update until the boundary available.
by sutar.mounesh＠gmail.com 19 Jan '18

19 Jan '18

From: mahendran.k <mahendran.kuppusamy(a)in.bosch.com> For long time test case, the slave_hw_ptr will exceed the boundary and wraparound the slave_hw_ptr. This slave boundary wraparound will cause the rate->hw_ptr to wraparound irrespective of the rate->boundary availability and due to that the available size goes wrong. Hence, To get the correct available size, - Its necessary to increment the rate->hw_ptr upto the rate->boundary and then wraparound the rate->hw_ptr. - While handling fraction part of slave period, rounded value will be introduced by input_frames(). To eliminate rounding issue on rate->hw_ptr, subtract last rounded value from rate->hw_ptr and add new rounded value of present slave_hw_ptr fraction part to rate->hw_ptr. Signed-off-by: mahendran.k <mahendran.kuppusamy(a)in.bosch.com> Signed-off-by: Mounesh Sutar <mounesh_sutar(a)mentor.com> diff --git a/src/pcm/pcm_rate.c b/src/pcm/pcm_rate.c index 1f830dd..5bee77c 100644 --- a/src/pcm/pcm_rate.c +++ b/src/pcm/pcm_rate.c @@ -50,7 +50,7 @@ typedef struct _snd_pcm_rate snd_pcm_rate_t; struct _snd_pcm_rate { snd_pcm_generic_t gen; - snd_pcm_uframes_t appl_ptr, hw_ptr; + snd_pcm_uframes_t appl_ptr, hw_ptr, last_slave_hw_ptr; snd_pcm_uframes_t last_commit_ptr; snd_pcm_uframes_t orig_avail_min; snd_pcm_sw_params_t sw_params; @@ -563,14 +563,28 @@ static inline void snd_pcm_rate_sync_hwptr0(snd_pcm_t *pcm, snd_pcm_uframes_t sl { snd_pcm_rate_t *rate = pcm->private_data; + snd_pcm_sframes_t slave_hw_ptr_diff = slave_hw_ptr - rate->last_slave_hw_ptr; + snd_pcm_sframes_t last_slave_hw_ptr_frac; + if (pcm->stream != SND_PCM_STREAM_PLAYBACK) return; - /* FIXME: boundary overlap of slave hw_ptr isn't evaluated here! - * e.g. if slave rate is small... - */ - rate->hw_ptr = - (slave_hw_ptr / rate->gen.slave->period_size) * pcm->period_size + - rate->ops.input_frames(rate->obj, slave_hw_ptr % rate->gen.slave->period_size); + + if (slave_hw_ptr_diff < 0) + slave_hw_ptr_diff += rate->gen.slave->boundary; /* slave boundary wraparound */ + else if (slave_hw_ptr_diff == 0) + return; + last_slave_hw_ptr_frac = rate->last_slave_hw_ptr % rate->gen.slave->period_size; + /* While handling fraction part fo slave period, rounded value will be introduced by input_frames(). + * To eliminate rounding issue on rate->hw_ptr, subtract last rounded value from rate->hw_ptr and + * add new rounded value of present slave_hw_ptr fraction part to rate->hw_ptr. Hence, + * rate->hw_ptr += [ (no. of updated slave periods * pcm rate period size) - + * fractional part of last_slave_hw_ptr rounded value + + * fractional part of updated slave hw ptr's rounded value ] */ + rate->hw_ptr += ( + (((last_slave_hw_ptr_frac + slave_hw_ptr_diff) / rate->gen.slave->period_size) * pcm->period_size) - + rate->ops.input_frames(rate->obj, last_slave_hw_ptr_frac) + + rate->ops.input_frames(rate->obj, (last_slave_hw_ptr_frac + slave_hw_ptr_diff) % rate->gen.slave->period_size)); + rate->last_slave_hw_ptr = slave_hw_ptr; rate->hw_ptr %= pcm->boundary; } @@ -635,6 +649,7 @@ static int snd_pcm_rate_prepare(snd_pcm_t *pcm) return err; *pcm->hw.ptr = 0; *pcm->appl.ptr = 0; + rate->last_slave_hw_ptr = 0; err = snd_pcm_rate_init(pcm); if (err < 0) return err; @@ -650,6 +665,7 @@ static int snd_pcm_rate_reset(snd_pcm_t *pcm) return err; *pcm->hw.ptr = 0; *pcm->appl.ptr = 0; + rate->last_slave_hw_ptr = 0; err = snd_pcm_rate_init(pcm); if (err < 0) return err; -- 1.7.9.5

3 2

[alsa-devel] [PATCH] ASoC: nuc900: Fix a loop timeout test
by Dan Carpenter 11 Dec '17

11 Dec '17

We should be finishing the loop with timeout set to zero but because this is a post-op we exit with timeout == -1. Fixes: 1082e2703a2d ("ASoC: NUC900/audio: add nuc900 audio driver support") Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/sound/soc/nuc900/nuc900-ac97.c b/sound/soc/nuc900/nuc900-ac97.c index b6615affe571..fde974d52bb2 100644 --- a/sound/soc/nuc900/nuc900-ac97.c +++ b/sound/soc/nuc900/nuc900-ac97.c @@ -67,7 +67,7 @@ static unsigned short nuc900_ac97_read(struct snd_ac97 *ac97, /* polling the AC_R_FINISH */ while (!(AUDIO_READ(nuc900_audio->mmio + ACTL_ACCON) & AC_R_FINISH) - && timeout--) + && --timeout) mdelay(1); if (!timeout) { @@ -121,7 +121,7 @@ static void nuc900_ac97_write(struct snd_ac97 *ac97, unsigned short reg, /* polling the AC_W_FINISH */ while ((AUDIO_READ(nuc900_audio->mmio + ACTL_ACCON) & AC_W_FINISH) - && timeout--) + && --timeout) mdelay(1); if (!timeout)

2 1

[alsa-devel] LADSPA ALSA plugin
by Robert Bielik 26 Nov '17

26 Nov '17

Hi all, Started experimenting with using LADSPA plugins with the ALSA LADSPA PCM plugin, and it works nicely. However, it seems only the PCM is interface is exposed from the plugin. Question is if there is a way to expose the LADSPA plugin parameters directly to alsamixer ? Regards /Rob

1 1

[alsa-devel] [PATCH 0/7] ALSA: Fine-tuning for several function implementations
by SF Markus Elfring 14 Nov '17

14 Nov '17

From: Markus Elfring <elfring(a)users.sourceforge.net> Date: Tue, 24 Jan 2017 11:02:34 +0100 Some update suggestions were taken into account from static source code analysis. Markus Elfring (7): seq: Delete unnecessary checks in snd_seq_ioctl_query_subs() seq: Delete unnecessary checks in snd_seq_ioctl_get_subscription() seq: Delete unnecessary checks in snd_seq_ioctl_unsubscribe_port() seq: Delete unnecessary checks in snd_seq_ioctl_subscribe_port() seq: Adjust 16 function calls together with a variable assignment dmasound_core: Move two assignments for the variable "ret" in state_open() dmasound_core: Adjust six function calls together with a variable assignment sound/core/seq/seq_clientmgr.c | 163 ++++++++++++++++++++----------------- sound/oss/dmasound/dmasound_core.c | 33 +++++--- 2 files changed, 109 insertions(+), 87 deletions(-) -- 2.11.0

2 9

[alsa-devel] [PATCH 1/1] ASoC: bcm2835-i2s: Support 384k sample rate
by Clive Messer 10 Nov '17

10 Nov '17

Add support for sample rates up to 384k to bcm2835-i2s driver, with SNDRV_PCM_RATE_CONTINUOUS and specifying 8k min and 384k max, for both playback and capture. Signed-off-by: Clive Messer <clive.messer(a)digitaldreamtime.co.uk> --- sound/soc/bcm/bcm2835-i2s.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sound/soc/bcm/bcm2835-i2s.c b/sound/soc/bcm/bcm2835-i2s.c index 6ba2049..4a67db2 100644 --- a/sound/soc/bcm/bcm2835-i2s.c +++ b/sound/soc/bcm/bcm2835-i2s.c @@ -578,7 +578,9 @@ static struct snd_soc_dai_driver bcm2835_i2s_dai = { .playback = { .channels_min = 2, .channels_max = 2, - .rates = SNDRV_PCM_RATE_8000_192000, + .rates = SNDRV_PCM_RATE_CONTINUOUS, + .rate_min = 8000, + .rate_max = 384000, .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE @@ -586,7 +588,9 @@ static struct snd_soc_dai_driver bcm2835_i2s_dai = { .capture = { .channels_min = 2, .channels_max = 2, - .rates = SNDRV_PCM_RATE_8000_192000, + .rates = SNDRV_PCM_RATE_CONTINUOUS, + .rate_min = 8000, + .rate_max = 384000, .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE -- 2.5.5

3 2

[alsa-devel] [PATCH 0/9 v2] Add ASoC support for AMD Stoney APUs
by Alex Deucher 18 Oct '17

18 Oct '17

This patch set updates the AMD GPU and Audio CoProcessor (ACP) audio drivers and the designware i2s driver for Stoney (ST). ST is an APU similar to Carrizo (CZ) which already has ACP audio support. The i2s controller and ACP audio DMA engine are part of the GPU and both need updating so I would like to upstream the whole patch set via one tree if possible. The current code is based on drm-next, but I'm happy to rebase on whatever tree this ends up going through if there are any problems applying. The entire patch set can be viewed here: https://cgit.freedesktop.org/~agd5f/linux/log/?h=stoney_acp Thanks! Alex v2: - Patch 1 is already applied to the audio tree, just including it for completeness since it's required for this patch set and it's not yet in the drm tree. - New patch to share asic types between gpu and audio drivers - ACPI ID changed for rt5650 machine driver - Integrate feedback on other patches Akshu Agrawal (2): drm/amdgpu Moving amdgpu asic types to a separate file ASoC: AMD: Add machine driver for cz rt5650 Vijendar Mukunda (7): ASoC: dwc: Added a quirk DW_I2S_QUIRK_16BIT_IDX_OVERRIDE to dwc driver drm/amd/amdgpu: Added asic_type as ACP DMA driver platform data drm/amd/amdgpu: Added a quirk for Stoney platform ASoC: AMD: disabling memory gating in stoney platform ASoC: AMD: DMA driver changes for Stoney Platform ASoC: AMD: Audio buffer related changes for Stoney drm/amd/amdgpu: Disabling Power Gating for Stoney platform drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 74 ++++++---- drivers/gpu/drm/amd/include/amd_shared.h | 29 +--- include/drm/amd_asic_type.h | 52 +++++++ include/sound/designware_i2s.h | 1 + sound/soc/amd/Kconfig | 7 + sound/soc/amd/Makefile | 2 + sound/soc/amd/acp-pcm-dma.c | 243 ++++++++++++++++++++++++------- sound/soc/amd/acp-rt5645.c | 210 ++++++++++++++++++++++++++ sound/soc/amd/acp.h | 9 ++ sound/soc/dwc/dwc-i2s.c | 6 + 10 files changed, 525 insertions(+), 108 deletions(-) create mode 100644 include/drm/amd_asic_type.h create mode 100644 sound/soc/amd/acp-rt5645.c -- 2.5.5

2 14

[alsa-devel] [PATCH v2 0/2] ASoC: add support for CX2072X CODEC
by simon.ho.cnxt＠gmail.com 13 Oct '17

13 Oct '17

From: Simon Ho <simon.ho(a)conexant.com> Hi Takashi, Mark I corrected the driver based on your input as below. Please help review the code. Mark: - Corrected the coding style. - EQ/DRC settings can be configured from userspace via mixer controls. - Wrongly cast void pointers. - Print I2C error code. - Use memcmp() to check if the new EQ value is different. - Removed unused TDM code. - Removed noisy "out of memory" message. - Corrected ACPI and I2C match table. - Removed unnessary CONFIG_ACPI define. Takashi: - Fixed printf int argument. - Fixed unexpected error code at no MCLK fallback. Thanks, Simon Simon Ho (2): ASoC: cx2072x: Add DT bingings documentation for CX2072X CODEC ASoC: add support for Conexant CX2072X CODEC .../devicetree/bindings/sound/cx2072x.txt | 36 + sound/soc/codecs/Kconfig | 5 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/cx2072x.c | 2253 ++++++++++++++++++++ sound/soc/codecs/cx2072x.h | 319 +++ 5 files changed, 2615 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/cx2072x.txt create mode 100644 sound/soc/codecs/cx2072x.c create mode 100644 sound/soc/codecs/cx2072x.h -- 2.7.4

4 10

[alsa-devel] ASoC Sound Driver I2S over LPE, Intel Baytrail SoC. MinnowBoard Max
by Michael Pogrebinsky 02 Oct '17

02 Oct '17

Hi all, I have the MinnowBoard Max with Baytrail Atom (ValleyView) SoC. I'm attempting to write an Alsa (ASoC) driver for my sound card to work with this board. PCM should work through I2S for this sound card I have. >From my understanding Baytrail's I2S goes over LPE. I read this thread:https://www.mail-archive.com/elinux-minnowboard@lists.elinux.org/msg… So I understand that I need the 3 components for my ASoC driver. However I am having trouble at understanding how to communicate with the LPE to get the I2S working. Here is what I have done so far: I am running Ubuntu 14.04 LTS, kernel : 4.3.0-040300rc4 First of all I downloaded the firmware fw_sst_0f28.bin-48kHz_i2s_master fromhttps://kernel.googlesource.com/pub/scm/linux/kernel/git/firmware/linux… And put it /lib/firmware/intel/. Later I went to the Bios and enabled LPE in PCI mode. I do see the LPE controller now, but it shows as UNCLAIMED. Later I looked at the sound/soc/inte/baytrail/ and from my understanding in order for me to get the I2S working I need to load this module so I did modprobe snd-soc-sst-baytrail-pcm. Later I wrote a simple codec and machine driver (looking at the example of sound/soc/intel/boards/byt_max98090) however everytime I attempt to register the sound card with snd_soc_register_card, I get the following error message in dmesg : "ASoC: CPU DAI baytrail-pcm-audio not registered". >From this I deduct that although I loaded the snd-soc-sst-baytrail-pcm module, the driver has not actually been loaded. I'm clueless on how to proceed from here. I would highly appreciate your help.

3 7

[alsa-devel] [PATCH] ASoC: Intel: Atom: Remove unneeded linux/miscdevice.h include
by Corentin Labbe 19 Sep '17

19 Sep '17

No file in sound/soc/intel/ use any miscdevice. This patch remove this uncessary include. Signed-off-by: Corentin Labbe <clabbe.montjoie(a)gmail.com> --- sound/soc/intel/atom/sst/sst_acpi.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/intel/atom/sst/sst_acpi.c b/sound/soc/intel/atom/sst/sst_acpi.c index f4d92bb..a971a58 100644 --- a/sound/soc/intel/atom/sst/sst_acpi.c +++ b/sound/soc/intel/atom/sst/sst_acpi.c @@ -23,7 +23,6 @@ #include <linux/interrupt.h> #include <linux/slab.h> #include <linux/io.h> -#include <linux/miscdevice.h> #include <linux/platform_device.h> #include <linux/firmware.h> #include <linux/pm_runtime.h> -- 2.10.2

2 1

[alsa-devel] [PATCH v2 00/12] AC97 device/driver model revamp
by Robert Jarzmik 19 Sep '17

19 Sep '17

Hi Lars, Mark, Charles, Lee, This serie has been stalled for almost one year, as I wasn't feeling that well lately. I'm quite better now, so let's get back to it. As it's been so long since the last review, I basically withdrew all my former objections and took into account all remarks regardless of my own judgement. This is especially the case with Lars's review on the bus code, where I tried to address all his comments. For this next round, let's sum up what happened : - I rebased against latest Linus's tree => as Lars had made ports to regmap of several impacted wm97xx drivers, all the better for me. - ALSA: ac97: add an ac97 bus => this addresses Lars's comments => history : https://patchwork.kernel.org/patch/9398229/ => there is one remark which was left out, the drop of the table ac97_controller->codecs. The reason is that there are traversals required in the bus scan and controller removal, and the code is way simpler with a table, and the data structure very compact. - Input: wm97xx: split out touchscreen registering => Charles's comment taken into account => history: http://https://patchwork.kernel.org/patch/9398223/ Have a happy review. -- Robert Robert Jarzmik (11): ALSA: ac97: add an ac97 bus ASoC: add new ac97 bus support ASoC: arm: make pxa2xx-ac97-lib ac97 codec agnostic Input: wm97xx: split out touchscreen registering mfd: wm97xx-core: core support for wm97xx Codec Input: wm97xx: add new AC97 bus support ASoC: wm9713: add ac97 new bus support ASoC: wm9712: add ac97 new bus support ASoC: wm9705: add private structure ASoC: wm9705: add ac97 new bus support ASoC: pxa: switch to new ac97 bus support Takashi Iwai (1): ASoC: Fix use-after-free at card unregistration drivers/input/touchscreen/Kconfig | 2 +- drivers/input/touchscreen/wm97xx-core.c | 252 ++++++++++----- drivers/mfd/Kconfig | 14 + drivers/mfd/Makefile | 1 + drivers/mfd/wm97xx-core.c | 282 +++++++++++++++++ include/linux/mfd/wm97xx.h | 31 ++ include/sound/ac97/codec.h | 118 +++++++ include/sound/ac97/compat.h | 21 ++ include/sound/ac97/controller.h | 85 ++++++ include/sound/pxa2xx-lib.h | 15 +- sound/Kconfig | 2 + sound/Makefile | 1 + sound/ac97/Kconfig | 19 ++ sound/ac97/Makefile | 8 + sound/ac97/ac97_core.h | 10 + sound/ac97/bus.c | 526 ++++++++++++++++++++++++++++++++ sound/ac97/codec.c | 15 + sound/ac97/snd_ac97_compat.c | 105 +++++++ sound/arm/Kconfig | 1 - sound/arm/pxa2xx-ac97-lib.c | 37 ++- sound/arm/pxa2xx-ac97.c | 35 ++- sound/soc/Kconfig | 4 + sound/soc/codecs/Kconfig | 9 +- sound/soc/codecs/wm9705.c | 59 ++-- sound/soc/codecs/wm9712.c | 37 ++- sound/soc/codecs/wm9713.c | 39 ++- sound/soc/pxa/Kconfig | 5 +- sound/soc/pxa/pxa2xx-ac97.c | 43 ++- sound/soc/soc-core.c | 5 +- 29 files changed, 1603 insertions(+), 178 deletions(-) create mode 100644 drivers/mfd/wm97xx-core.c create mode 100644 include/linux/mfd/wm97xx.h create mode 100644 include/sound/ac97/codec.h create mode 100644 include/sound/ac97/compat.h create mode 100644 include/sound/ac97/controller.h create mode 100644 sound/ac97/Kconfig create mode 100644 sound/ac97/Makefile create mode 100644 sound/ac97/ac97_core.h create mode 100644 sound/ac97/bus.c create mode 100644 sound/ac97/codec.c create mode 100644 sound/ac97/snd_ac97_compat.c -- 2.1.4

4 23

[alsa-devel] [PATCH 0/9] AC97 device/driver model revamp
by Robert Jarzmik 19 Sep '17

19 Sep '17

It all started in the pxa device-tree submission here : https://lkml.org/lkml/2016/2/25/965 Last submission was a RFC in here: http://www.gossamer-threads.com/lists/linux/kernel/2446863 It will be maintained in : git fetch https://github.com/rjarzmik/linux.git work/ac97 The driving ideas are still the same, and I put them in [1] for memory. This is the first post RFC submission. In order to make a full demonstration of the framework, wm97xx was converted to an MFD, see [2] for the "why". As this serie is a complete wm9713 change towards the new AC97 bus, here is the patch organization : - 1/9, 2/9, 3/9 and 5/9: the new AC97 bus, for Mark and Takashi to review - 4/9: wm9713 conversion, this one has ugly #ifdefs, should be reviewed more carefully - 6/9: prerequisite for final 9/9, for Marek and Sebastian to approve => this one is independent and can flow through Sebastian's tree in this next-cycle if accepted - 7/9: prerequisite for final 9/9, for Mark/Dmitry => this one is also independent and can flow in this cycle if accepted - 8/9: prerequisite for final 9/9, for Lee to review => this one has a dependency on 2/9, so it probably can't fit in this next-cycle - 9/9: this last one depends on all the patches before, so it can't fit in this next-cycle As a sum-up, I'd like to push for review for this -next cycle at least the patches 1, 2, 3, 5, 6 and 9. Happy review. Robert Jarzmik (9): ALSA: ac97: split out the generic ac97 registers ALSA: ac97: add an ac97 bus ASoC: add new ac97 bus support ASoC: wm9713: add ac97 new bus support ASoC: pxa: switch to new ac97 bus support power_supply: wm97xx_battery: use power_supply_get_drvdata Input: wm97xx: split out touchscreen registering mfd: wm97xx-core: core support for wm97xx Codec Input: wm97xx: add new AC97 bus support drivers/input/touchscreen/Kconfig | 2 +- drivers/input/touchscreen/wm97xx-core.c | 247 +++++++++++----- drivers/mfd/Kconfig | 14 + drivers/mfd/Makefile | 1 + drivers/mfd/wm97xx-core.c | 282 ++++++++++++++++++ drivers/power/supply/wm97xx_battery.c | 25 +- include/linux/mfd/wm97xx.h | 31 ++ include/sound/ac97/codec.h | 115 +++++++ include/sound/ac97/compat.h | 21 ++ include/sound/ac97/controller.h | 85 ++++++ include/sound/ac97/regs.h | 262 ++++++++++++++++ include/sound/ac97_codec.h | 239 +-------------- include/sound/pxa2xx-lib.h | 15 +- sound/Kconfig | 2 + sound/Makefile | 1 + sound/ac97/Kconfig | 19 ++ sound/ac97/Makefile | 8 + sound/ac97/ac97_core.h | 10 + sound/ac97/bus.c | 510 ++++++++++++++++++++++++++++++++ sound/ac97/codec.c | 15 + sound/ac97/snd_ac97_compat.c | 105 +++++++ sound/arm/Kconfig | 1 - sound/arm/pxa2xx-ac97-lib.c | 39 ++- sound/soc/Kconfig | 4 + sound/soc/codecs/Kconfig | 3 +- sound/soc/codecs/wm9713.c | 37 ++- sound/soc/pxa/Kconfig | 5 +- sound/soc/pxa/pxa2xx-ac97.c | 22 +- 28 files changed, 1738 insertions(+), 382 deletions(-) create mode 100644 drivers/mfd/wm97xx-core.c create mode 100644 include/linux/mfd/wm97xx.h create mode 100644 include/sound/ac97/codec.h create mode 100644 include/sound/ac97/compat.h create mode 100644 include/sound/ac97/controller.h create mode 100644 include/sound/ac97/regs.h create mode 100644 sound/ac97/Kconfig create mode 100644 sound/ac97/Makefile create mode 100644 sound/ac97/ac97_core.h create mode 100644 sound/ac97/bus.c create mode 100644 sound/ac97/codec.c create mode 100644 sound/ac97/snd_ac97_compat.c -- 2.1.4 [1] RFC PATCH reminder: Amongst the driving ideas behind this RFC : - use device/driver model for AC'97 device/driver binding is based on vendor_id{1,2} - use auto-probe of the AC'97 bus to enumerate codecs and create devices - be compatible with previous platform_data model for codecs => this enables a smooth transition, where a codec (here wm9713) can be used either through platform_device or automatic discovery - struct snd_ac97 is not used This structure is really heavy, and doesn't represent an AC97 device, but rather an AC'97 codec internals IIUC. I think it's right place would be in include/sound/ac97/codec.h. This is also a problem for regmap adherence, hence the include/sound/ac97/compat.h. - a new AC'97 bus Kconfig is created This was done for a smooth transition ... let's see if it's a good idea. - split the AC'97 into : - the codec - the digital controller - the bus Amongst the things that are not all touched yet : - ac97_codec.c The generic AC'97 codec in sound/pci/ac97/ac97_codec.c has really a lot features, which are not at all PCI related. They could be transfered to sound/ac97, without the pci specific field. => this deserves a deep ahead thinking, which I'll do if the current approach is accepted by the communauty. The most important patch is 2/7 "ALSA: ac97: add an ac97 bus". This is the main evaluation point for the serie, the others are here so that I can test it all. Well, this is a long term effort, which might need a complete rewrite according to the comments it'll get. Let's expose it for comments and see how I can progress with it. [2] As a corollary, wm97xx is changed into a MFD device, which at least spawns: - the touchscreen device - the ac97 codec - the problem to solve was stated in http://www.gossamer-threads.com/lists/linux/kernel/2510113#2510113

9 38

[alsa-devel] [PATCH 0/2] Add ACPI table for the ts3a227e driver
by Thierry Escande 19 Sep '17

19 Sep '17

Hi, This series adds ACPI match table for the ts3a227e driver. The ts3a227e is an Autonomous Audio Accessory Detection and Configuration Switch used to detect audio accessory features like jack plugging and unplugging, mic presence, and button pressed events. This series also fixes a null pointer dereference occurring in the TI max9890 driver when the ts3a227e hardware is present and its driver probed. The jack detection was enabled in the ts3a227e driver before the jack structure was allocated, causing the null pointer access. Regards, Thierry Fang, Yang A (1): ASoC: ts3a227e: add acpi table Thierry Escande (1): ASoc: cht_bsw_max98090_ti: Fix jack initialization sound/soc/codecs/ts3a227e.c | 10 ++++++ sound/soc/intel/boards/cht_bsw_max98090_ti.c | 52 +++++++++++++++++----------- 2 files changed, 41 insertions(+), 21 deletions(-) -- 2.7.4

3 6

[alsa-devel] [PATCH v3 00/11] Add STM32 DFSDM support
by Arnaud Pouliquen 11 Sep '17

11 Sep '17

Hello, I kept it as RFC as i reworked the global design (but also because not full validated...). Regarding Mark and Jonathan's comments, I decided to try an implementation with DMA support in IIO instead of handling it in ASOC. Solution seems more straightforward but as DMA cyclic mode and associated buffer block API is not part of IIO today, I still need some hacks... To be honest, I tried to integrate DMA cyclic management and associated buffer block Consumer API. but no enough expertise on IIO to success... :( Advantage vs V2: - No more data processing need in ASoC , done in IIO - ASoC uses IIO consumer interface ( except for buffer callback) Drawback : - Need to create a "SPI bus" trigger to allo to use Buffer consumer API => Need to find a solution to set this trigger by default in IIO audio driver - No standard buffer management - Implement DMA cyclic in DFSDM IIO driver. - Define specific API to handle buffer callback per period instead of callback per samples generated by iio_push_to_buffers_with_timestamp. V2-V3 delta: - New patches to support ASoC DMA codec in DT - ASoC: Add Bindins for DMIC codec driver. - ASoC: codec: add DT support in dmic codec. - New patches to allow in-kernel set of IIO buffer size and watermark - IIO: consumer: allow to set buffer sizes. - IIO DFSDM drivers - Split audio and ADC support in 2 drivers. - Implement DMA cyclic mode. - Add SPI bus Trigger for buffer management. - IIO sigma delta adc drivers - Suppress "simple and rename driver. - ASoC driver - Suppress DMA engine. - Suppress copy ops. - Use IIO consmumer interface to enable/Disable DFSDM. Regards, Arnaud Arnaud Pouliquen (11): iio: Add hardware consumer support IIO: Add DT bindings for sigma delta adc modulator IIO: ADC: add sigma delta modulator support IIO: add DT bindings for stm32 DFSDM filter IIO: ADC: add stm32 DFSDM support for Sigma delta ADC IIO: ADC: add stm32 DFSDM support for PDM microphone IIO: consumer: allow to set buffer sizes ASoC: Add Bindins for DMIC codec driver ASoC: codec: add DT support in dmic codec ASoC: add bindings for stm32 DFSDM filter ASoC: stm32: add DFSDM DAI support .../bindings/iio/adc/sigma-delta-modulator.txt | 13 + .../bindings/iio/adc/st,stm32-dfsdm-adc.txt | 120 ++++ Documentation/devicetree/bindings/sound/dmic.txt | 11 + .../devicetree/bindings/sound/st,stm32-adfsdm.txt | 41 ++ drivers/iio/Kconfig | 6 + drivers/iio/Makefile | 1 + drivers/iio/adc/Kconfig | 50 ++ drivers/iio/adc/Makefile | 4 + drivers/iio/adc/sd_adc_modulator.c | 98 +++ drivers/iio/adc/stm32-dfsdm-adc.c | 419 ++++++++++++ drivers/iio/adc/stm32-dfsdm-audio.c | 720 +++++++++++++++++++++ drivers/iio/adc/stm32-dfsdm-core.c | 658 +++++++++++++++++++ drivers/iio/adc/stm32-dfsdm.h | 372 +++++++++++ drivers/iio/buffer/industrialio-buffer-cb.c | 12 + drivers/iio/hw_consumer.c | 156 +++++ include/linux/iio/adc/stm32-dfsdm-audio.h | 41 ++ include/linux/iio/consumer.h | 13 + include/linux/iio/hw_consumer.h | 12 + sound/soc/Kconfig | 1 + sound/soc/Makefile | 1 + sound/soc/codecs/dmic.c | 8 + sound/soc/stm/Kconfig | 10 + sound/soc/stm/Makefile | 2 + sound/soc/stm/stm32_adfsdm.c | 362 +++++++++++ 24 files changed, 3131 insertions(+) create mode 100644 Documentation/devicetree/bindings/iio/adc/sigma-delta-modulator.txt create mode 100644 Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.txt create mode 100644 Documentation/devicetree/bindings/sound/dmic.txt create mode 100644 Documentation/devicetree/bindings/sound/st,stm32-adfsdm.txt create mode 100644 drivers/iio/adc/sd_adc_modulator.c create mode 100644 drivers/iio/adc/stm32-dfsdm-adc.c create mode 100644 drivers/iio/adc/stm32-dfsdm-audio.c create mode 100644 drivers/iio/adc/stm32-dfsdm-core.c create mode 100644 drivers/iio/adc/stm32-dfsdm.h create mode 100644 drivers/iio/hw_consumer.c create mode 100644 include/linux/iio/adc/stm32-dfsdm-audio.h create mode 100644 include/linux/iio/hw_consumer.h create mode 100644 sound/soc/stm/Kconfig create mode 100644 sound/soc/stm/Makefile create mode 100644 sound/soc/stm/stm32_adfsdm.c V2: Patch-set associated to this RFC proposes an implementation of the DFSDM features shared between ASoC and IIO frameworks. Patch-set is only a Skeleton of the drivers, so a base to discuss and validate a design. It contains minimum code to allow probing (with DT) and to expose the ASoC and IIO ABI. Hope that is sufficent in a first step to allow to focus on APIs. In this patch-set there are two new APIs used: - IIO in-kern API: based on hw_customer API proposed by Lars - ASOC <-> IIO API inspired by API defined for hdmi-codec for ASoC/DRM interconnect. API is dedicated to DFSDM only. Notice also that this design is based on following assumption: - Audio stream ABI interface is ASoC, no access to data through IIO ABI for PDM. - ASoC DMA should be used for audio transfer as designed for real time stream. - Need some runtime parameters exchange between ASoC and IIO due to the correlation between the sample frequency, the DFSDM decimation factor and the associated scaling. - "ASoC: dmaengine_pcm: add copy support" patch: I added a patch in ASoC that allows to implement a copy function to process data after DMA transfer. Requested, as DFSDM samples captured contain channel ID on 8-LSB bits and need also a potential rescale to present DAT on 24-bits. - "IIO: ADC: add sigma delta modulator support" patch: Simple dummy driver created to support external Sigma delta modulator. It is binded to DFSDM driver through hw_customer API. - 1.9.1

5 35

[alsa-devel] [PATCH] ASoC: improve RT5514 dependencies
by Arnd Bergmann 05 Sep '17

05 Sep '17

With SND_SOC_RT5514_SPI=m and SND_SOC_RT5514=y, we get this link error: sound/soc/codecs/rt5514.o: In function `rt5514_dsp_voice_wake_up_put': rt5514.c:(.text+0x2068): undefined reference to `rt5514_spi_burst_write' rt5514.c:(.text+0x20c8): undefined reference to `rt5514_spi_burst_write' This adds another Kconfig symbol to work around the link error, forcing the main driver to be a loadable module as well if some other driver selects the I2C side to be built-in. Fixes: 2a18483a7fb4 ("ASoC: Intel: Add Kabylake machine driver for RT5514, RT5663 and MAX98927") Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- This can now lead to a configuration with SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH=y and SND_SOC_RT5514=m. I don't know if that is a problem or not. An alternative approach would be to flip the dependency between rt5514_spi.ko and rt5514.ko and avoid having the rt5514_spi_burst_write symbol exported. --- sound/soc/codecs/Kconfig | 7 ++++++- sound/soc/intel/Kconfig | 2 +- sound/soc/mediatek/Kconfig | 2 +- sound/soc/rockchip/Kconfig | 1 - 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 024ddc9938ed..115c6144ca2a 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -117,7 +117,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_RT274 if I2C select SND_SOC_RT286 if I2C select SND_SOC_RT298 if I2C - select SND_SOC_RT5514 if I2C + select SND_SOC_RT5514_I2C if I2C select SND_SOC_RT5616 if I2C select SND_SOC_RT5631 if I2C select SND_SOC_RT5640 if I2C @@ -738,6 +738,11 @@ config SND_SOC_RT298 config SND_SOC_RT5514 tristate + default m if SND_SOC_RT5514_SPI=m + default SND_SOC_RT5514_I2C || SND_SOC_RT5514_SPI + +config SND_SOC_RT5514_I2C + tristate config SND_SOC_RT5514_SPI tristate diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig index b301bfff1c09..f5ef912190ed 100644 --- a/sound/soc/intel/Kconfig +++ b/sound/soc/intel/Kconfig @@ -259,7 +259,7 @@ config SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH select SND_SOC_INTEL_SST select SND_SOC_INTEL_SKYLAKE select SND_SOC_RT5663 - select SND_SOC_RT5514 + select SND_SOC_RT5514_I2C select SND_SOC_MAX98927 select SND_SOC_HDAC_HDMI help diff --git a/sound/soc/mediatek/Kconfig b/sound/soc/mediatek/Kconfig index 5c68797f36c4..6ccf73ae77ca 100644 --- a/sound/soc/mediatek/Kconfig +++ b/sound/soc/mediatek/Kconfig @@ -67,7 +67,7 @@ config SND_SOC_MT8173_RT5650_RT5514 tristate "ASoC Audio driver for MT8173 with RT5650 RT5514 codecs" depends on SND_SOC_MT8173 && I2C select SND_SOC_RT5645 - select SND_SOC_RT5514 + select SND_SOC_RT5514_I2C help This adds ASoC driver for Mediatek MT8173 boards with the RT5650 and RT5514 codecs. diff --git a/sound/soc/rockchip/Kconfig b/sound/soc/rockchip/Kconfig index c84487805876..c1139aecdfbe 100644 --- a/sound/soc/rockchip/Kconfig +++ b/sound/soc/rockchip/Kconfig @@ -65,7 +65,6 @@ config SND_SOC_RK3399_GRU_SOUND depends on SND_SOC_ROCKCHIP && I2C && GPIOLIB && CLKDEV_LOOKUP && SPI select SND_SOC_ROCKCHIP_I2S select SND_SOC_MAX98357A - select SND_SOC_RT5514 select SND_SOC_DA7219 select SND_SOC_RT5514_SPI help -- 2.9.0

3 4

[alsa-devel] [RFC PATCH 0/7] AC97 device/driver model revamp
by Robert Jarzmik 04 Sep '17

04 Sep '17

It all started in the pxa device-tree submission here : https://lkml.org/lkml/2016/2/25/965 It will be maintained in : git fetch https://github.com/rjarzmik/linux.git work/ac97 And now it transformed into this RFC, which would bring a ground for AC'97 devices closer to the linux device/driver model. This is just an RFC to see if we understand each other Mark. Amongst the driving ideas behind this RFC : - use device/driver model for AC'97 device/driver binding is based on vendor_id{1,2} - use auto-probe of the AC'97 bus to enumerate codecs and create devices - be compatible with previous platform_data model for codecs => this enables a smooth transition, where a codec (here wm9713) can be used either through platform_device or automatic discovery - struct snd_ac97 is not used This structure is really heavy, and doesn't represent an AC97 device, but rather an AC'97 codec internals IIUC. I think it's right place would be in include/sound/ac97/codec.h. This is also a problem for regmap adherence, hence the include/sound/ac97/compat.h. - a new AC'97 bus Kconfig is created This was done for a smooth transition ... let's see if it's a good idea. - split the AC'97 into : - the codec - the digital controller - the bus Amongst the things that are not all touched yet : - ac97_codec.c The generic AC'97 codec in sound/pci/ac97/ac97_codec.c has really a lot features, which are not at all PCI related. They could be transfered to sound/ac97, without the pci specific field. => this deserves a deep ahead thinking, which I'll do if the current approach is accepted by the communauty. The most important patch is 2/7 "ALSA: ac97: add an ac97 bus". This is the main evaluation point for the serie, the others are here so that I can test it all. Well, this is a long term effort, which might need a complete rewrite according to the comments it'll get. Let's expose it for comments and see how I can progress with it. Cheers. -- Robert Robert Jarzmik (7): ALSA: ac97: split out the generic ac97 registers ALSA: ac97: add an ac97 bus ASoC: wm9713: add ac97 new bus support ASoC: pxa: switch to new ac97 bus support ARM: pxa: mioa701 remove wm9713 from platform devices ASoC: mioa701_wm9713: convert to new ac97 bus ASoC: add new ac97 bus support arch/arm/mach-pxa/mioa701.c | 1 - include/sound/ac97/codec.h | 98 ++++++++++++ include/sound/ac97/compat.h | 21 +++ include/sound/ac97/controller.h | 39 +++++ include/sound/ac97/regs.h | 262 +++++++++++++++++++++++++++++++ include/sound/ac97_codec.h | 239 +---------------------------- include/sound/pxa2xx-lib.h | 14 +- sound/Kconfig | 7 + sound/Makefile | 1 + sound/ac97/Kconfig | 9 ++ sound/ac97/Makefile | 5 + sound/ac97/ac97_core.h | 10 ++ sound/ac97/bus.c | 330 ++++++++++++++++++++++++++++++++++++++++ sound/ac97/codec.c | 15 ++ sound/ac97/snd_ac97_compat.c | 104 +++++++++++++ sound/arm/Kconfig | 1 - sound/arm/pxa2xx-ac97-lib.c | 31 ++-- sound/soc/Kconfig | 4 + sound/soc/codecs/wm9713.c | 62 +++++++- sound/soc/pxa/Kconfig | 4 +- sound/soc/pxa/mioa701_wm9713.c | 4 +- sound/soc/pxa/pxa2xx-ac97.c | 12 +- 22 files changed, 1000 insertions(+), 273 deletions(-) create mode 100644 include/sound/ac97/codec.h create mode 100644 include/sound/ac97/compat.h create mode 100644 include/sound/ac97/controller.h create mode 100644 include/sound/ac97/regs.h create mode 100644 sound/ac97/Kconfig create mode 100644 sound/ac97/Makefile create mode 100644 sound/ac97/ac97_core.h create mode 100644 sound/ac97/bus.c create mode 100644 sound/ac97/codec.c create mode 100644 sound/ac97/snd_ac97_compat.c -- 2.1.4

3 29

[alsa-devel] [PATCH v4 00/12] AC97 device/driver model revamp
by Robert Jarzmik 04 Sep '17

04 Sep '17

Hi Lars, Mark, Charles, Lee, This is a minor revision after v3, mainly reviews from Takashi, Charles. I did more extensive testing of load/unload of the whole serie, and apart from a bug in wm97xx-core in touchscreen tree (for a which a patch will be sent apart), it seems to work properly. I extracted the diff from the v3 of sound/ac97 which is in [1] for easier spotting of what has globally changed. I would still need a review from you, Lee, for the mfd patch (patch 6/12). Happy review. -- Robert Robert Jarzmik (12): ALSA: ac97: split out the generic ac97 registers ALSA: ac97: add an ac97 bus ASoC: add new ac97 bus support ASoC: arm: make pxa2xx-ac97-lib ac97 codec agnostic Input: wm97xx: split out touchscreen registering mfd: wm97xx-core: core support for wm97xx Codec Input: wm97xx: add new AC97 bus support ASoC: wm9713: add ac97 new bus support ASoC: wm9712: add ac97 new bus support ASoC: wm9705: add private structure ASoC: wm9705: add ac97 new bus support ASoC: pxa: switch to new ac97 bus support drivers/input/touchscreen/Kconfig | 2 +- drivers/input/touchscreen/wm97xx-core.c | 252 ++++++++++----- drivers/mfd/Kconfig | 15 + drivers/mfd/Makefile | 1 + drivers/mfd/wm97xx-core.c | 405 ++++++++++++++++++++++++ include/linux/mfd/wm97xx.h | 31 ++ include/sound/ac97/codec.h | 118 +++++++ include/sound/ac97/compat.h | 21 ++ include/sound/ac97/controller.h | 84 +++++ include/sound/ac97/regs.h | 262 +++++++++++++++ include/sound/ac97_codec.h | 239 +------------- include/sound/pxa2xx-lib.h | 15 +- sound/Kconfig | 2 + sound/Makefile | 1 + sound/ac97/Kconfig | 19 ++ sound/ac97/Makefile | 8 + sound/ac97/ac97_core.h | 10 + sound/ac97/bus.c | 542 ++++++++++++++++++++++++++++++++ sound/ac97/codec.c | 15 + sound/ac97/snd_ac97_compat.c | 105 +++++++ sound/arm/Kconfig | 1 - sound/arm/pxa2xx-ac97-lib.c | 37 ++- sound/arm/pxa2xx-ac97.c | 35 ++- sound/soc/codecs/Kconfig | 9 +- sound/soc/codecs/wm9705.c | 59 ++-- sound/soc/codecs/wm9712.c | 37 ++- sound/soc/codecs/wm9713.c | 39 ++- sound/soc/pxa/Kconfig | 5 +- sound/soc/pxa/pxa2xx-ac97.c | 46 ++- 29 files changed, 2001 insertions(+), 414 deletions(-) create mode 100644 drivers/mfd/wm97xx-core.c create mode 100644 include/linux/mfd/wm97xx.h create mode 100644 include/sound/ac97/codec.h create mode 100644 include/sound/ac97/compat.h create mode 100644 include/sound/ac97/controller.h create mode 100644 include/sound/ac97/regs.h create mode 100644 sound/ac97/Kconfig create mode 100644 sound/ac97/Makefile create mode 100644 sound/ac97/ac97_core.h create mode 100644 sound/ac97/bus.c create mode 100644 sound/ac97/codec.c create mode 100644 sound/ac97/snd_ac97_compat.c -- 2.11.0 [1] sound diff from last revision (git diff submit/ac97-2..submit/ac97-3 sound/ac97 include/sound/ac97) diff --git a/sound/ac97/bus.c b/sound/ac97/bus.c index 7cda8175341e..af618a0e89cb 100644 --- a/sound/ac97/bus.c +++ b/sound/ac97/bus.c @@ -76,7 +76,6 @@ static void ac97_codec_release(struct device *dev) adev = to_ac97_device(dev); ac97_ctrl = adev->ac97_ctrl; ac97_ctrl->codecs[adev->num] = NULL; - sysfs_remove_link(&dev->kobj, "ac97_controller"); kfree(adev); } @@ -269,8 +268,29 @@ static const struct attribute_group *ac97_adapter_groups[] = { NULL, }; +static void ac97_del_adapter(struct ac97_controller *ac97_ctrl) +{ + mutex_lock(&ac97_controllers_mutex); + ac97_ctrl_codecs_unregister(ac97_ctrl); + list_del(&ac97_ctrl->controllers); + mutex_unlock(&ac97_controllers_mutex); + + device_unregister(&ac97_ctrl->adap); +} + +static void ac97_adapter_release(struct device *dev) +{ + struct ac97_controller *ac97_ctrl; + + ac97_ctrl = to_ac97_controller(dev); + idr_remove(&ac97_adapter_idr, ac97_ctrl->nr); + dev_dbg(&ac97_ctrl->adap, "adapter unregistered by %s\n", + dev_name(ac97_ctrl->parent)); +} + static const struct device_type ac97_adapter_type = { .groups = ac97_adapter_groups, + .release = ac97_adapter_release, }; static int ac97_add_adapter(struct ac97_controller *ac97_ctrl) @@ -298,16 +318,6 @@ static int ac97_add_adapter(struct ac97_controller *ac97_ctrl) return ret; } -static void ac97_del_adapter(struct ac97_controller *ac97_ctrl) -{ - mutex_lock(&ac97_controllers_mutex); - ac97_ctrl_codecs_unregister(ac97_ctrl); - list_del(&ac97_ctrl->controllers); - idr_remove(&ac97_adapter_idr, ac97_ctrl->nr); - mutex_unlock(&ac97_controllers_mutex); - put_device(&ac97_ctrl->adap); -} - /** * snd_ac97_controller_register - register an ac97 controller * @ops: the ac97 bus operations @@ -508,7 +518,7 @@ static int ac97_bus_remove(struct device *dev) } static struct bus_type ac97_bus_type = { - .name = "ac97", + .name = "ac97bus", .dev_groups = ac97_dev_groups, .match = ac97_bus_match, .pm = &ac97_pm, @@ -522,5 +532,11 @@ static int __init ac97_bus_init(void) } subsys_initcall(ac97_bus_init); +static void __exit ac97_bus_exit(void) +{ + bus_unregister(&ac97_bus_type); +} +module_exit(ac97_bus_exit); + MODULE_LICENSE("GPL"); MODULE_AUTHOR("Robert Jarzmik <robert.jarzmik(a)free.fr>");

4 19

[alsa-devel] [PATCH 1/7] staging: max98927: Added TDM support
by Ryan Lee 31 Aug '17

31 Aug '17

Signed-off-by: Ryan Lee <ryans.lee(a)maximintegrated.com> --- sound/soc/codecs/max98927.c | 141 ++++++++++++++++++++++++++++++++++++-------- sound/soc/codecs/max98927.h | 6 +- 2 files changed, 120 insertions(+), 27 deletions(-) diff --git a/sound/soc/codecs/max98927.c b/sound/soc/codecs/max98927.c index b5ee294..99d6e41 100644 --- a/sound/soc/codecs/max98927.c +++ b/sound/soc/codecs/max98927.c @@ -1,7 +1,7 @@ /* * max98927.c -- MAX98927 ALSA Soc Audio driver * - * Copyright (C) 2016 Maxim Integrated Products + * Copyright (C) 2016-2017 Maxim Integrated Products * Author: Ryan Lee <ryans.lee(a)maximintegrated.com> * * This program is free software; you can redistribute it and/or modify it @@ -146,6 +146,7 @@ static int max98927_dai_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) struct max98927_priv *max98927 = snd_soc_codec_get_drvdata(codec); unsigned int mode = 0; unsigned int format = 0; + bool use_pdm = false; unsigned int invert = 0; dev_dbg(codec->dev, "%s: fmt 0x%08X\n", __func__, fmt); @@ -187,22 +188,27 @@ static int max98927_dai_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) /* interface format */ switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { case SND_SOC_DAIFMT_I2S: - max98927->iface |= SND_SOC_DAIFMT_I2S; format = MAX98927_PCM_FORMAT_I2S; break; case SND_SOC_DAIFMT_LEFT_J: - max98927->iface |= SND_SOC_DAIFMT_LEFT_J; format = MAX98927_PCM_FORMAT_LJ; break; + case SND_SOC_DAIFMT_DSP_A: + format = MAX98927_PCM_FORMAT_TDM_MODE1; + break; + case SND_SOC_DAIFMT_DSP_B: + format = MAX98927_PCM_FORMAT_TDM_MODE0; + break; case SND_SOC_DAIFMT_PDM: - max98927->iface |= SND_SOC_DAIFMT_PDM; + use_pdm = true; break; default: return -EINVAL; } + max98927->iface = fmt & SND_SOC_DAIFMT_FORMAT_MASK; - /* pcm channel configuration */ - if (max98927->iface & (SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_LEFT_J)) { + if (!use_pdm) { + /* pcm channel configuration */ regmap_update_bits(max98927->regmap, MAX98927_R0018_PCM_RX_EN_A, MAX98927_PCM_RX_CH0_EN | MAX98927_PCM_RX_CH1_EN, @@ -217,13 +223,12 @@ static int max98927_dai_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) MAX98927_R003B_SPK_SRC_SEL, MAX98927_SPK_SRC_MASK, 0); - } else regmap_update_bits(max98927->regmap, - MAX98927_R0018_PCM_RX_EN_A, - MAX98927_PCM_RX_CH0_EN | MAX98927_PCM_RX_CH1_EN, 0); + MAX98927_R0035_PDM_RX_CTRL, + MAX98927_PDM_RX_EN_MASK, 0); - /* pdm channel configuration */ - if (max98927->iface & SND_SOC_DAIFMT_PDM) { + } else { + /* pdm channel configuration */ regmap_update_bits(max98927->regmap, MAX98927_R0035_PDM_RX_CTRL, MAX98927_PDM_RX_EN_MASK, 1); @@ -231,10 +236,12 @@ static int max98927_dai_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) regmap_update_bits(max98927->regmap, MAX98927_R003B_SPK_SRC_SEL, MAX98927_SPK_SRC_MASK, 3); - } else + regmap_update_bits(max98927->regmap, - MAX98927_R0035_PDM_RX_CTRL, - MAX98927_PDM_RX_EN_MASK, 0); + MAX98927_R0018_PCM_RX_EN_A, + MAX98927_PCM_RX_CH0_EN | MAX98927_PCM_RX_CH1_EN, 0); + + } return 0; } @@ -245,6 +252,21 @@ static const int rate_table[] = { 13000000, 19200000, }; +/* BCLKs per LRCLK */ +static const int bclk_sel_table[] = { + 32, 48, 64, 96, 128, 192, 256, 384, 512, +}; + +static int max98927_get_bclk_sel(int bclk) +{ + int i; + /* match BCLKs per LRCLK */ + for (i = 0; i < ARRAY_SIZE(bclk_sel_table); i++) { + if (bclk_sel_table[i] == bclk) + return i + 2; + } + return 0; +} static int max98927_set_clock(struct max98927_priv *max98927, struct snd_pcm_hw_params *params) { @@ -270,19 +292,17 @@ static int max98927_set_clock(struct max98927_priv *max98927, i << MAX98927_PCM_MASTER_MODE_MCLK_RATE_SHIFT); } - switch (blr_clk_ratio) { - case 32: - value = 2; - break; - case 48: - value = 3; - break; - case 64: - value = 4; - break; - default: + if ((max98927->iface == SND_SOC_DAIFMT_DSP_A) || + (max98927->iface == SND_SOC_DAIFMT_DSP_B)) + return 0; + + /* BCLK configuration */ + value = max98927_get_bclk_sel(blr_clk_ratio); + if (!value) { + dev_err(codec->dev, "BCLK %d not supported\n", blr_clk_ratio); return -EINVAL; } + regmap_update_bits(max98927->regmap, MAX98927_R0022_PCM_CLK_SETUP, MAX98927_PCM_CLK_SETUP_BSEL_MASK, @@ -386,6 +406,76 @@ static int max98927_dai_hw_params(struct snd_pcm_substream *substream, return -EINVAL; } +static int max98927_dai_tdm_slot(struct snd_soc_dai *dai, + unsigned int tx_mask, unsigned int rx_mask, + int slots, int slot_width) +{ + struct snd_soc_codec *codec = dai->codec; + struct max98927_priv *max98927 = snd_soc_codec_get_drvdata(codec); + int bsel = 0; + unsigned int chan_sz = 0; + + /* BCLK configuration */ + bsel = max98927_get_bclk_sel(slots * slot_width); + if (bsel == 0) { + dev_err(codec->dev, "BCLK %d not supported\n", + slots * slot_width); + return -EINVAL; + } + + regmap_update_bits(max98927->regmap, + MAX98927_R0022_PCM_CLK_SETUP, + MAX98927_PCM_CLK_SETUP_BSEL_MASK, + bsel); + + /* Channel size configuration */ + switch (slot_width) { + case 16: + chan_sz = MAX98927_PCM_MODE_CFG_CHANSZ_16; + break; + case 24: + chan_sz = MAX98927_PCM_MODE_CFG_CHANSZ_24; + break; + case 32: + chan_sz = MAX98927_PCM_MODE_CFG_CHANSZ_32; + break; + default: + dev_err(codec->dev, "format unsupported %d\n", + slot_width); + return -EINVAL; + } + + regmap_update_bits(max98927->regmap, + MAX98927_R0020_PCM_MODE_CFG, + MAX98927_PCM_MODE_CFG_CHANSZ_MASK, chan_sz); + + /* Rx slot configuration */ + regmap_write(max98927->regmap, + MAX98927_R0018_PCM_RX_EN_A, + rx_mask & 0xFF); + regmap_write(max98927->regmap, + MAX98927_R0019_PCM_RX_EN_B, + (rx_mask & 0xFF00) >> 8); + + /* Tx slot configuration */ + regmap_write(max98927->regmap, + MAX98927_R001A_PCM_TX_EN_A, + tx_mask & 0xFF); + regmap_write(max98927->regmap, + MAX98927_R001B_PCM_TX_EN_B, + (tx_mask & 0xFF00) >> 8); + + /* Tx slot Hi-Z configuration */ + regmap_write(max98927->regmap, + MAX98927_R001C_PCM_TX_HIZ_CTRL_A, + ~tx_mask & 0xFF); + regmap_write(max98927->regmap, + MAX98927_R001D_PCM_TX_HIZ_CTRL_B, + (~tx_mask & 0xFF00) >> 8); + + return 0; +} + #define MAX98927_RATES SNDRV_PCM_RATE_8000_48000 #define MAX98927_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | \ @@ -405,6 +495,7 @@ static const struct snd_soc_dai_ops max98927_dai_ops = { .set_sysclk = max98927_dai_set_sysclk, .set_fmt = max98927_dai_set_fmt, .hw_params = max98927_dai_hw_params, + .set_tdm_slot = max98927_dai_tdm_slot, }; static int max98927_dac_event(struct snd_soc_dapm_widget *w, diff --git a/sound/soc/codecs/max98927.h b/sound/soc/codecs/max98927.h index ece6a60..bf7a6f92 100644 --- a/sound/soc/codecs/max98927.h +++ b/sound/soc/codecs/max98927.h @@ -1,7 +1,7 @@ /* * max98927.h -- MAX98927 ALSA Soc Audio driver * - * Copyright 2013-15 Maxim Integrated Products + * Copyright (C) 2016-2017 Maxim Integrated Products * Author: Ryan Lee <ryans.lee(a)maximintegrated.com> * * This program is free software; you can redistribute it and/or modify it @@ -161,7 +161,9 @@ #define MAX98927_PCM_MODE_CFG_FORMAT_SHIFT (3) #define MAX98927_PCM_FORMAT_I2S (0x0 << 0) #define MAX98927_PCM_FORMAT_LJ (0x1 << 0) - +#define MAX98927_PCM_FORMAT_TDM_MODE0 (0x3 << 0) +#define MAX98927_PCM_FORMAT_TDM_MODE1 (0x4 << 0) +#define MAX98927_PCM_FORMAT_TDM_MODE2 (0x5 << 0) #define MAX98927_PCM_MODE_CFG_CHANSZ_MASK (0x3 << 6) #define MAX98927_PCM_MODE_CFG_CHANSZ_16 (0x1 << 6) #define MAX98927_PCM_MODE_CFG_CHANSZ_24 (0x2 << 6) -- 2.7.4

2 9

[alsa-devel] [PATCH 4/5] staging: max98927: Added missing \n to end of dev_err messages
by Ryan Lee 31 Aug '17

31 Aug '17

Signed-off-by: Ryan Lee <ryans.lee(a)maximintegrated.com> --- sound/soc/codecs/max98927.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/max98927.c b/sound/soc/codecs/max98927.c index e787a03..9b864e2 100644 --- a/sound/soc/codecs/max98927.c +++ b/sound/soc/codecs/max98927.c @@ -160,7 +160,7 @@ static int max98927_dai_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) mode = MAX98927_PCM_MASTER_MODE_MASTER; break; default: - dev_err(codec->dev, "DAI clock mode unsupported"); + dev_err(codec->dev, "DAI clock mode unsupported\n"); return -EINVAL; } @@ -176,7 +176,7 @@ static int max98927_dai_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) invert = MAX98927_PCM_MODE_CFG_PCM_BCLKEDGE; break; default: - dev_err(codec->dev, "DAI invert mode unsupported"); + dev_err(codec->dev, "DAI invert mode unsupported\n"); return -EINVAL; } @@ -331,7 +331,7 @@ static int max98927_dai_hw_params(struct snd_pcm_substream *substream, chan_sz = MAX98927_PCM_MODE_CFG_CHANSZ_32; break; default: - dev_err(codec->dev, "format unsupported %d", + dev_err(codec->dev, "format unsupported %d\n", params_format(params)); goto err; } -- 2.7.4

2 1

[alsa-devel] [bug] alsa-tools-1.1.3 compilation fails with clang due to wrong inline declaration.
by moxian 22 Aug '17

22 Aug '17

I've tried compiling alsa-tools-1.3.0 with clang, and the compilation fails with the following: $ CC=clang CXX=clang++ make ./as10k1 <...snip...> clang -fno-strict-aliasing -O2 -Wall -pipe -g -o as10k1 as10k1.o parse.o assemble.o macro.o as10k1.o: In function `header': /home/moxian/work/alsa-tools/alsa-tools-1.1.3/as10k1/as10k1.c:524: undefined reference to `output_tram_line' /home/moxian/work/alsa-tools/alsa-tools-1.1.3/as10k1/as10k1.c:527: undefined reference to `output_tram_line' /home/moxian/work/alsa-tools/alsa-tools-1.1.3/as10k1/as10k1.c:539: undefined reference to `output_tram_line' /home/moxian/work/alsa-tools/alsa-tools-1.1.3/as10k1/as10k1.c:543: undefined reference to `output_tram_line' clang-3.9: error: linker command failed with exit code 1 (use -v to see invocation) make[2]: *** [Makefile:320: as10k1] Error 1 make[2]: Leaving directory '/home/moxian/work/alsa-tools/alsa-tools-1.1.3/as10k1' make[1]: *** [Makefile:354: all-recursive] Error 1 make[1]: Leaving directory '/home/moxian/work/alsa-tools/alsa-tools-1.1.3/as10k1' make: *** [Makefile:9: all] Error 1 Clang devs claim that it is not a bug in clang (as I thought originally), but rather invalid code, which happens to compile with gcc by accident. This is due to `output_tram_line` function being declared as `inline void output_tram_line`. The intent was probably to declare it as `static inline void output_tram_line`. Please see https://bugs.llvm.org/show_bug.cgi?id=33768 for more details. Adding `static` to the function definition makes everything compile (at least everything that compiles with gcc already).

2 1

[alsa-devel] [PATCH 1/3] sound: ASoC: tegra: Remove SoC-specific Kconfig depends and selects
by Paul Kocialkowski 18 Aug '17

18 Aug '17

This removes the SoC-specific dependencies on the platform drivers, as well as SoC-specific selections of platform drivers for the machine drivers. The rationale behind this change is that the dependencies are not actual build dependencies but run-time ones. The previously listed SoCs were also incomplete: for instance, tegra124 uses the tegra30 platform drivers, which could not be built without ARCH_TEGRA_3x_SOC set. Descriptions of the tristates are also added to allow these options to be set via defconfig/menuconfig. Signed-off-by: Paul Kocialkowski <contact(a)paulk.fr> --- sound/soc/tegra/Kconfig | 42 ++++++++++++++---------------------------- 1 file changed, 14 insertions(+), 28 deletions(-) diff --git a/sound/soc/tegra/Kconfig b/sound/soc/tegra/Kconfig index efbe8d4c019e..6875fc39a575 100644 --- a/sound/soc/tegra/Kconfig +++ b/sound/soc/tegra/Kconfig @@ -9,8 +9,8 @@ config SND_SOC_TEGRA Say Y or M here if you want support for SoC audio on Tegra. config SND_SOC_TEGRA20_AC97 - tristate - depends on SND_SOC_TEGRA && ARCH_TEGRA_2x_SOC + tristate "Tegra20 AC97 interface" + depends on SND_SOC_TEGRA select SND_SOC_AC97_BUS select SND_SOC_TEGRA20_DAS help @@ -19,16 +19,16 @@ config SND_SOC_TEGRA20_AC97 machine drivers to support below. config SND_SOC_TEGRA20_DAS - tristate - depends on SND_SOC_TEGRA && ARCH_TEGRA_2x_SOC + tristate "Tegra20 DAS module" + depends on SND_SOC_TEGRA help Say Y or M if you want to add support for the Tegra20 DAS module. You will also need to select the individual machine drivers to support below. config SND_SOC_TEGRA20_I2S - tristate - depends on SND_SOC_TEGRA && ARCH_TEGRA_2x_SOC + tristate "Tegra20 I2S interface" + depends on SND_SOC_TEGRA select SND_SOC_TEGRA20_DAS help Say Y or M if you want to add support for codecs attached to the @@ -36,8 +36,8 @@ config SND_SOC_TEGRA20_I2S machine drivers to support below. config SND_SOC_TEGRA20_SPDIF - tristate - depends on SND_SOC_TEGRA && ARCH_TEGRA_2x_SOC + tristate "Tegra20 SPDIF interface" + depends on SND_SOC_TEGRA default m help Say Y or M if you want to add support for the Tegra20 SPDIF interface. @@ -45,16 +45,16 @@ config SND_SOC_TEGRA20_SPDIF below. config SND_SOC_TEGRA30_AHUB - tristate - depends on SND_SOC_TEGRA && ARCH_TEGRA_3x_SOC + tristate "Tegra30 AHUB module" + depends on SND_SOC_TEGRA help - Say Y or M if you want to add support for the Tegra20 AHUB module. + Say Y or M if you want to add support for the Tegra30 AHUB module. You will also need to select the individual machine drivers to support below. config SND_SOC_TEGRA30_I2S - tristate - depends on SND_SOC_TEGRA && ARCH_TEGRA_3x_SOC + tristate "Tegra30 I2S interface" + depends on SND_SOC_TEGRA select SND_SOC_TEGRA30_AHUB help Say Y or M if you want to add support for codecs attached to the @@ -64,8 +64,6 @@ config SND_SOC_TEGRA30_I2S config SND_SOC_TEGRA_RT5640 tristate "SoC Audio support for Tegra boards using an RT5640 codec" depends on SND_SOC_TEGRA && I2C && GPIOLIB - select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC - select SND_SOC_TEGRA30_I2S if ARCH_TEGRA_3x_SOC select SND_SOC_RT5640 help Say Y or M here if you want to add support for SoC audio on Tegra @@ -74,8 +72,6 @@ config SND_SOC_TEGRA_RT5640 config SND_SOC_TEGRA_WM8753 tristate "SoC Audio support for Tegra boards using a WM8753 codec" depends on SND_SOC_TEGRA && I2C && GPIOLIB - select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC - select SND_SOC_TEGRA30_I2S if ARCH_TEGRA_3x_SOC select SND_SOC_WM8753 help Say Y or M here if you want to add support for SoC audio on Tegra @@ -84,8 +80,6 @@ config SND_SOC_TEGRA_WM8753 config SND_SOC_TEGRA_WM8903 tristate "SoC Audio support for Tegra boards using a WM8903 codec" depends on SND_SOC_TEGRA && I2C && GPIOLIB - select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC - select SND_SOC_TEGRA30_I2S if ARCH_TEGRA_3x_SOC select SND_SOC_WM8903 help Say Y or M here if you want to add support for SoC audio on Tegra @@ -94,7 +88,7 @@ config SND_SOC_TEGRA_WM8903 config SND_SOC_TEGRA_WM9712 tristate "SoC Audio support for Tegra boards using a WM9712 codec" - depends on SND_SOC_TEGRA && ARCH_TEGRA_2x_SOC && GPIOLIB + depends on SND_SOC_TEGRA && GPIOLIB select SND_SOC_TEGRA20_AC97 select SND_SOC_WM9712 help @@ -104,7 +98,6 @@ config SND_SOC_TEGRA_WM9712 config SND_SOC_TEGRA_TRIMSLICE tristate "SoC Audio support for TrimSlice board" depends on SND_SOC_TEGRA && I2C - select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC select SND_SOC_TLV320AIC23_I2C help Say Y or M here if you want to add support for SoC audio on the @@ -113,7 +106,6 @@ config SND_SOC_TEGRA_TRIMSLICE config SND_SOC_TEGRA_ALC5632 tristate "SoC Audio support for Tegra boards using an ALC5632 codec" depends on SND_SOC_TEGRA && I2C && GPIOLIB - select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC select SND_SOC_ALC5632 help Say Y or M here if you want to add support for SoC audio on the @@ -122,8 +114,6 @@ config SND_SOC_TEGRA_ALC5632 config SND_SOC_TEGRA_MAX98090 tristate "SoC Audio support for Tegra boards using a MAX98090 codec" depends on SND_SOC_TEGRA && I2C && GPIOLIB - select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC - select SND_SOC_TEGRA30_I2S if ARCH_TEGRA_3x_SOC select SND_SOC_MAX98090 help Say Y or M here if you want to add support for SoC audio on Tegra @@ -132,8 +122,6 @@ config SND_SOC_TEGRA_MAX98090 config SND_SOC_TEGRA_RT5677 tristate "SoC Audio support for Tegra boards using a RT5677 codec" depends on SND_SOC_TEGRA && I2C && GPIOLIB - select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC - select SND_SOC_TEGRA30_I2S if ARCH_TEGRA_3x_SOC select SND_SOC_RT5677 help Say Y or M here if you want to add support for SoC audio on Tegra @@ -142,8 +130,6 @@ config SND_SOC_TEGRA_RT5677 config SND_SOC_TEGRA_SGTL5000 tristate "SoC Audio support for Tegra boards using a SGTL5000 codec" depends on SND_SOC_TEGRA && I2C && GPIOLIB - select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC - select SND_SOC_TEGRA30_I2S if ARCH_TEGRA_3x_SOC select SND_SOC_SGTL5000 help Say Y or M here if you want to add support for SoC audio on Tegra -- 2.13.3

3 9

[alsa-devel] [PATCHv3 0/6] Motorola Droid 4 Audio Support
by Sebastian Reichel 18 Aug '17

18 Aug '17

Hi, This adds audio support to Motorola Droid 4. Tested: - Playing via both DACs using Speaker, Earpiece, Headphone - Recording using internal Mic - Volume Controls Known not to work: - 3.5mm detection support (requires closed source firmware, needs further investigation) - Modem / Bluetooth Audio (actually untested, but probably needs some quirks) Changes since PATCHv2: * Fix a whitespace issue * Fix const notes Takashi provided * Fix a DAPM route issue I accidently introduced in v2 Changes since PATCHv1: * Add patch from Tony exporting soc_dpcm_runtime_update * Integrate DT patch for vaudio initial mode * Split dt-binding from codec patch and add Ack from Rob * Fix CPCAP position in Kconfig/Makefile * Avoid "err +=" constructs * Simplify reset function * Drop cpcap_audio_read/write helpers * Do not use tertiary operator for mute register value * Update Input Mux logic * Switch from simple-audio-card to audio-graph-card -- Sebastian Sebastian Reichel (5): dt-bindings: sound: add motorola,cpcap-audio-codec ASoC: codec: cpcap: new codec ARM: dts: motorola-cpcap-mapphone: add audio-codec ARM: dts: motorola-cpcap-mapphone: set initial mode for vaudio ARM: dts: omap4-droid4: add soundcard Tony Lindgren (1): ALSA: pcm: Export soc_dpcm_runtime_update .../bindings/sound/motorola,cpcap-audio-codec.txt | 19 + arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi | 7 + arch/arm/boot/dts/omap4-droid4-xt894.dts | 84 ++ sound/soc/codecs/Kconfig | 5 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/cpcap.c | 1594 ++++++++++++++++++++ sound/soc/soc-pcm.c | 2 + 7 files changed, 1713 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/motorola,cpcap-audio-codec.txt create mode 100644 sound/soc/codecs/cpcap.c -- 2.13.2

4 14

[alsa-devel] [PATCH v3 0/4] i2c: document DMA handling and add helpers for it
by Wolfram Sang 16 Aug '17

16 Aug '17

So, after revisiting old mail threads and taking part in a similar discussion on the USB list, here is what I cooked up to document and ease DMA handling for I2C within Linux. Please have a look at the documentation introduced in patch 2 for further details. All patches have been tested with a Renesas Salvator-X board (r8a7796/M3-W) and a Renesas Lager board (r8a7790/H2). A more detailed test description can be found here: http://elinux.org/Tests:I2C-core-DMA The branch can be found here: git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git renesas/topic/i2c-core-dma-v3 And big kudos to Renesas Electronics for funding this work, thank you very much! Regards, Wolfram Changes since v2: * rebased to v4.13-rc1 * helper functions are not inlined anymore but moved to i2c core * __must_check has been added to the buffer check helper * the release function has been renamed to contain 'dma' as well * documentation updates. Hopefully better wording now * removed the doubled Signed-offs * adding more potentially interested parties to CC Wolfram Sang (4): i2c: add helpers to ease DMA handling i2c: add docs to clarify DMA handling i2c: sh_mobile: use helper to decide if DMA is useful i2c: rcar: check for DMA-capable buffers Documentation/i2c/DMA-considerations | 38 ++++++++++++++++++++ drivers/i2c/busses/i2c-rcar.c | 18 +++++++--- drivers/i2c/busses/i2c-sh_mobile.c | 8 +++-- drivers/i2c/i2c-core-base.c | 68 ++++++++++++++++++++++++++++++++++++ include/linux/i2c.h | 5 +++ 5 files changed, 130 insertions(+), 7 deletions(-) create mode 100644 Documentation/i2c/DMA-considerations -- 2.11.0

5 13

[alsa-devel] [PATCH] ASoC: spear: spdif_in: constify snd_soc_dai_ops structure
by Gustavo A. R. Silva 15 Aug '17

15 Aug '17

This structure is only stored in the ops field of a snd_soc_dai_driver structure. That field is declared const, so snd_soc_dai_ops structures that have this property can be declared as const also. Signed-off-by: Gustavo A. R. Silva <garsilva(a)embeddedor.com> --- sound/soc/spear/spdif_in.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/spear/spdif_in.c b/sound/soc/spear/spdif_in.c index 7f32527..d9368e1 100644 --- a/sound/soc/spear/spdif_in.c +++ b/sound/soc/spear/spdif_in.c @@ -151,7 +151,7 @@ static int spdif_in_trigger(struct snd_pcm_substream *substream, int cmd, return ret; } -static struct snd_soc_dai_ops spdif_in_dai_ops = { +static const struct snd_soc_dai_ops spdif_in_dai_ops = { .shutdown = spdif_in_shutdown, .trigger = spdif_in_trigger, .hw_params = spdif_in_hw_params, -- 2.5.0

3 2

[alsa-devel] [PATCH 000/102] Convert drivers to explicit reset API
by Philipp Zabel 14 Aug '17

14 Aug '17

The reset control API has two modes: exclusive access, where the driver expects to have full and immediate control over the state of the reset line, and shared (clock-like) access, where drivers only request reset deassertion while active, but don't care about the state of the reset line while inactive. Commit a53e35db70d1 ("reset: Ensure drivers are explicit when requesting reset lines") started to transition the reset control request API calls to explicitly state whether the driver needs exclusive or shared reset control behavior. This series converts all drivers that currently implicitly request exclusive reset controls to the corresponding explicit API call. It is, for the most part, generated from the following semantic patch: @@ expression rstc, dev, id; @@ -rstc = reset_control_get(dev, id); +rstc = reset_control_get_exclusive(dev, id); @@ expression rstc, dev, id; @@ -rstc = reset_control_get_optional(dev, id); +rstc = reset_control_get_optional_exclusive(dev, id); @@ expression rstc, node, id; @@ -rstc = of_reset_control_get(node, id); +rstc = of_reset_control_get_exclusive(node, id); @@ expression rstc, node, index; @@ -rstc = of_reset_control_get_by_index(node, index); +rstc = of_reset_control_get_exclusive_by_index(node, index); @@ expression rstc, dev, id; @@ -rstc = devm_reset_control_get(dev, id); +rstc = devm_reset_control_get_exclusive(dev, id); @@ expression rstc, dev, id; @@ -rstc = devm_reset_control_get_optional(dev, id); +rstc = devm_reset_control_get_optional_exclusive(dev, id); @@ expression rstc, dev, index; @@ -rstc = devm_reset_control_get_by_index(dev, index); +rstc = devm_reset_control_get_exclusive_by_index(dev, index); After all driver patches are applied, the temporary transition helpers can be removed. regards Philipp Philipp Zabel (102): ARM: rockchip: explicitly request exclusive reset control ARM: socfpga: explicitly request exclusive reset control MIPS: pci-mt7620: explicitly request exclusive reset control ahci: st: explicitly request exclusive reset control ata: sata_gemini: explicitly request exclusive reset control ata: ahci_tegra: explicitly request exclusive reset control bus: sunxi-rsb: explicitly request exclusive reset control bus: tegra-gmi: explicitly request exclusive reset control clk: sunxi: explicitly request exclusive reset control clk: tegra: explicitly request exclusive reset control clocksource/drivers/timer-stm32: explicitly request exclusive reset control clocksource/drivers/sun5i: explicitly request exclusive reset control crypto: rockchip: explicitly request exclusive reset control crypto: sun4i-ss - request exclusive reset control PM / devfreq: tegra: explicitly request exclusive reset control dmaengine: stm32-dma: explicitly request exclusive reset control dmaengine: sun6i: explicitly request exclusive reset control dmaengine: tegra-apb: explicitly request exclusive reset control drm: kirin: explicitly request exclusive reset control drm/nouveau/tegra: explicitly request exclusive reset control drm/rockchip: explicitly request exclusive reset control drm/sti: explicitly request exclusive reset control drm/stm: explicitly request exclusive reset control drm/sun4i: explicitly request exclusive reset control drm/tegra: explicitly request exclusive reset control gpu: host1x: explicitly request exclusive reset control i2c: mv64xxx: explicitly request exclusive reset control i2c: stm32f4: explicitly request exclusive reset control i2c: sun6i-pw2i: explicitly request exclusive reset control i2c: tegra: explicitly request exclusive reset control iio: adc: rockchip_saradc: explicitly request exclusive reset control iio: dac: stm32-dac-core: explicitly request exclusive reset control Input: tegra-kbc - request exclusive reset control coda: explicitly request exclusive reset control st-rc: explicitly request exclusive reset control stm32-dcmi: explicitly request exclusive reset control rc: sunxi-cir: explicitly request exclusive reset control mmc: dw_mmc: explicitly request exclusive reset control mmc: sdhci-st: explicitly request exclusive reset control mmc: sunxi: explicitly request exclusive reset control mmc: tegra: explicitly request exclusive reset control mtd: nand: sunxi: explicitly request exclusive reset control mtd: spi-nor: stm32-quadspi: explicitly request exclusive reset control net: dsa: mt7530: explicitly request exclusive reset control net: ethernet: hisi_femac: explicitly request exclusive reset control net: ethernet: hix5hd2_gmac: explicitly request exclusive reset control net: stmmac: explicitly request exclusive reset control net: stmmac: dwc-qos: explicitly request exclusive reset control ath10k: explicitly request exclusive reset control nvmem: lpc18xx-eeprom: explicitly request exclusive reset control PCI: dwc: pcie-qcom: explicitly request exclusive reset control PCI: imx6: explicitly request exclusive reset control PCI: tegra: explicitly request exclusive reset control PCI: rockchip: explicitly request exclusive reset control phy: berlin-usb: explicitly request exclusive reset control PCI: mediatek: explicitly request exclusive reset control phy: qcom-usb-hs: explicitly request exclusive reset control phy: rockchip-pcie: explicitly request exclusive reset control phy: rockchip-typec: explicitly request exclusive reset control phy: rockchip-usb: explicitly request exclusive reset control phy: sun4i-usb: explicitly request exclusive reset control phy: sun9i-usb: explicitly request exclusive reset control phy: tegra: explicitly request exclusive reset control phy: qcom-qmp: explicitly request exclusive reset control phy: qcom-qusb2: explicitly request exclusive reset control pinctrl: stm32: explicitly request exclusive reset control pinctrl: sunxi: explicitly request exclusive reset control pinctrl: tegra: explicitly request exclusive reset control pwm: hibvt: explicitly request exclusive reset control pwm: tegra: explicitly request exclusive reset control remoteproc/keystone: explicitly request exclusive reset control remoteproc: qcom: explicitly request exclusive reset control remoteproc: st: explicitly request exclusive reset control soc: mediatek: PMIC wrap: explicitly request exclusive reset control soc/tegra: pmc: explicitly request exclusive reset control spi: stm32: explicitly request exclusive reset control spi: sun6i: explicitly request exclusive reset control spi: tegra20-slink: explicitly request exclusive reset control spi: tegra114: explicitly request exclusive reset control spi: tegra20-sflash: explicitly request exclusive reset control staging: nvec: explicitly request exclusive reset control thermal: rockchip: explicitly request exclusive reset control thermal: tegra: explicitly request exclusive reset control serial: 8250_dw: explicitly request exclusive reset control serial: tegra: explicitly request exclusive reset control usb: chipidea: msm: explicitly request exclusive reset control usb: dwc2: explicitly request exclusive reset control usb: host: ehci-tegra: explicitly request exclusive reset control usb: host: xhci-tegra: explicitly request exclusive reset control usb: musb: sunxi: explicitly request exclusive reset control usb: phy: msm: explicitly request exclusive reset control usb: phy: qcom-8x16-usb: explicitly request exclusive reset control watchdog: asm9260: explicitly request exclusive reset control watchdog: mt7621: explicitly request exclusive reset control watchdog: rt2880: explicitly request exclusive reset control watchdog: zx2967: explicitly request exclusive reset control ASoC: img: explicitly request exclusive reset control ASoC: stm32: explicitly request exclusive reset control ASoC: sun4i: explicitly request exclusive reset control ASoC: tegra: explicitly request exclusive reset control Documentation: devres: add explicit exclusive/shared reset control request calls reset: finish transition to explicit exclusive reset control requests Documentation/driver-model/devres.txt | 7 ++- arch/arm/mach-rockchip/platsmp.c | 2 +- arch/mips/pci/pci-mt7620.c | 2 +- drivers/ata/ahci_st.c | 6 +-- drivers/ata/ahci_tegra.c | 8 ++-- drivers/ata/sata_gemini.c | 4 +- drivers/bus/sunxi-rsb.c | 2 +- drivers/bus/tegra-gmi.c | 2 +- drivers/clk/sunxi/clk-sun9i-mmc.c | 2 +- drivers/clk/tegra/clk-dfll.c | 2 +- drivers/clocksource/timer-stm32.c | 2 +- drivers/clocksource/timer-sun5i.c | 2 +- drivers/crypto/rockchip/rk3288_crypto.c | 2 +- drivers/crypto/sunxi-ss/sun4i-ss-core.c | 3 +- drivers/devfreq/tegra-devfreq.c | 2 +- drivers/dma/stm32-dma.c | 2 +- drivers/dma/sun6i-dma.c | 2 +- drivers/dma/tegra20-apb-dma.c | 2 +- drivers/fpga/altera-hps2fpga.c | 3 +- drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 2 +- drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c | 2 +- drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 2 +- drivers/gpu/drm/rockchip/cdn-dp-core.c | 8 ++-- drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 2 +- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 4 +- drivers/gpu/drm/sti/sti_hdmi.c | 2 +- drivers/gpu/drm/sti/sti_hqvdp.c | 2 +- drivers/gpu/drm/sti/sti_tvout.c | 2 +- drivers/gpu/drm/stm/ltdc.c | 2 +- drivers/gpu/drm/sun4i/sun4i_backend.c | 4 +- drivers/gpu/drm/sun4i/sun4i_tcon.c | 2 +- drivers/gpu/drm/sun4i/sun4i_tv.c | 2 +- drivers/gpu/drm/sun4i/sun6i_drc.c | 2 +- drivers/gpu/drm/sun4i/sun8i_mixer.c | 2 +- drivers/gpu/drm/tegra/dc.c | 2 +- drivers/gpu/drm/tegra/dpaux.c | 3 +- drivers/gpu/drm/tegra/dsi.c | 2 +- drivers/gpu/drm/tegra/gr3d.c | 6 +-- drivers/gpu/drm/tegra/hdmi.c | 2 +- drivers/gpu/drm/tegra/sor.c | 2 +- drivers/gpu/host1x/dev.c | 2 +- drivers/i2c/busses/i2c-mv64xxx.c | 2 +- drivers/i2c/busses/i2c-stm32f4.c | 2 +- drivers/i2c/busses/i2c-sun6i-p2wi.c | 2 +- drivers/i2c/busses/i2c-tegra.c | 2 +- drivers/iio/adc/rockchip_saradc.c | 3 +- drivers/iio/dac/stm32-dac-core.c | 2 +- drivers/input/keyboard/tegra-kbc.c | 2 +- drivers/media/platform/coda/coda-common.c | 3 +- drivers/media/platform/stm32/stm32-dcmi.c | 2 +- drivers/media/rc/st_rc.c | 2 +- drivers/media/rc/sunxi-cir.c | 2 +- drivers/mmc/host/dw_mmc.c | 2 +- drivers/mmc/host/sdhci-st.c | 2 +- drivers/mmc/host/sdhci-tegra.c | 3 +- drivers/mmc/host/sunxi-mmc.c | 3 +- drivers/mtd/nand/sunxi_nand.c | 2 +- drivers/mtd/spi-nor/stm32-quadspi.c | 2 +- drivers/net/dsa/mt7530.c | 3 +- drivers/net/ethernet/hisilicon/hisi_femac.c | 4 +- drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 6 +-- .../ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c | 2 +- drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 3 +- .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 4 +- drivers/net/wireless/ath/ath10k/ahb.c | 15 ++++--- drivers/nvmem/lpc18xx_eeprom.c | 2 +- drivers/pci/dwc/pci-imx6.c | 7 +-- drivers/pci/dwc/pcie-qcom.c | 40 +++++++++-------- drivers/pci/host/pci-tegra.c | 6 +-- drivers/pci/host/pcie-mediatek.c | 2 +- drivers/pci/host/pcie-rockchip.c | 15 ++++--- drivers/phy/allwinner/phy-sun4i-usb.c | 2 +- drivers/phy/allwinner/phy-sun9i-usb.c | 4 +- drivers/phy/marvell/phy-berlin-usb.c | 2 +- drivers/phy/qualcomm/phy-qcom-qmp.c | 4 +- drivers/phy/qualcomm/phy-qcom-qusb2.c | 3 +- drivers/phy/qualcomm/phy-qcom-usb-hs.c | 3 +- drivers/phy/rockchip/phy-rockchip-pcie.c | 2 +- drivers/phy/rockchip/phy-rockchip-typec.c | 6 +-- drivers/phy/rockchip/phy-rockchip-usb.c | 2 +- drivers/phy/tegra/xusb-tegra210.c | 4 +- drivers/phy/tegra/xusb.c | 2 +- drivers/pinctrl/stm32/pinctrl-stm32.c | 2 +- drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c | 2 +- drivers/pinctrl/sunxi/pinctrl-sun8i-a23-r.c | 2 +- drivers/pinctrl/tegra/pinctrl-tegra-xusb.c | 2 +- drivers/pwm/pwm-hibvt.c | 2 +- drivers/pwm/pwm-tegra.c | 2 +- drivers/remoteproc/keystone_remoteproc.c | 2 +- drivers/remoteproc/qcom_q6v5_pil.c | 3 +- drivers/remoteproc/st_remoteproc.c | 6 ++- drivers/reset/core.c | 2 +- drivers/soc/mediatek/mtk-pmic-wrap.c | 5 ++- drivers/soc/tegra/pmc.c | 2 +- drivers/spi/spi-stm32.c | 2 +- drivers/spi/spi-sun6i.c | 2 +- drivers/spi/spi-tegra114.c | 2 +- drivers/spi/spi-tegra20-sflash.c | 2 +- drivers/spi/spi-tegra20-slink.c | 2 +- drivers/staging/nvec/nvec.c | 2 +- drivers/thermal/rockchip_thermal.c | 3 +- drivers/thermal/tegra/soctherm.c | 3 +- drivers/tty/serial/8250/8250_dw.c | 2 +- drivers/tty/serial/serial-tegra.c | 2 +- drivers/usb/chipidea/ci_hdrc_msm.c | 2 +- drivers/usb/dwc2/platform.c | 3 +- drivers/usb/host/ehci-tegra.c | 5 ++- drivers/usb/host/xhci-tegra.c | 6 ++- drivers/usb/musb/sunxi.c | 2 +- drivers/usb/phy/phy-msm-usb.c | 4 +- drivers/usb/phy/phy-qcom-8x16-usb.c | 2 +- drivers/watchdog/asm9260_wdt.c | 2 +- drivers/watchdog/mt7621_wdt.c | 2 +- drivers/watchdog/rt2880_wdt.c | 2 +- drivers/watchdog/zx2967_wdt.c | 2 +- include/linux/reset.h | 50 ---------------------- sound/soc/img/img-i2s-in.c | 2 +- sound/soc/img/img-i2s-out.c | 2 +- sound/soc/img/img-parallel-out.c | 2 +- sound/soc/img/img-spdif-in.c | 2 +- sound/soc/img/img-spdif-out.c | 2 +- sound/soc/stm/stm32_i2s.c | 2 +- sound/soc/stm/stm32_sai.c | 2 +- sound/soc/stm/stm32_spdifrx.c | 2 +- sound/soc/sunxi/sun4i-codec.c | 3 +- sound/soc/sunxi/sun4i-i2s.c | 2 +- sound/soc/sunxi/sun4i-spdif.c | 3 +- sound/soc/tegra/tegra30_ahub.c | 4 +- 128 files changed, 226 insertions(+), 235 deletions(-) -- 2.11.0 Cc: "David S. Miller" <davem(a)davemloft.net> Cc: "Emilio López" <emilio(a)elopez.com.ar> Cc: Adrian Hunter <adrian.hunter(a)intel.com> Cc: Alan Stern <stern(a)rowland.harvard.edu> Cc: Alan Tull <atull(a)kernel.org> Cc: Alexandre Torgue <alexandre.torgue(a)st.com> Cc: Andrew Lunn <andrew(a)lunn.ch> Cc: Ben Skeggs <bskeggs(a)redhat.com> Cc: Benjamin Gaignard <benjamin.gaignard(a)linaro.org> Cc: Bin Liu <b-liu(a)ti.com> Cc: Bjorn Andersson <bjorn.andersson(a)linaro.org> Cc: Bjorn Helgaas <bhelgaas(a)google.com> Cc: Boris Brezillon <boris.brezillon(a)free-electrons.com> Cc: Brian Norris <computersforpeace(a)gmail.com> Cc: Chanwoo Choi <cw00.choi(a)samsung.com> Cc: Chen Feng <puck.chen(a)hisilicon.com> Cc: Chen-Yu Tsai <wens(a)csie.org> Cc: Corentin Labbe <clabbe.montjoie(a)gmail.com> Cc: Cyrille Pitchen <cyrille.pitchen(a)wedev4u.fr> Cc: Dan Williams <dan.j.williams(a)intel.com> Cc: Daniel Lezcano <daniel.lezcano(a)linaro.org> Cc: David Airlie <airlied(a)linux.ie> Cc: David Woodhouse <dwmw2(a)infradead.org> Cc: Dmitry Torokhov <dmitry.torokhov(a)gmail.com> Cc: Eduardo Valentin <edubezval(a)gmail.com> Cc: Felipe Balbi <balbi(a)kernel.org> Cc: Florian Fainelli <f.fainelli(a)gmail.com> Cc: Giuseppe Cavallaro <peppe.cavallaro(a)st.com> Cc: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Cc: Guenter Roeck <linux(a)roeck-us.net> Cc: Hartmut Knaack <knaack.h(a)gmx.de> Cc: Heiko Stuebner <heiko(a)sntech.de> Cc: Herbert Xu <herbert(a)gondor.apana.org.au> Cc: Jaehoon Chung <jh80.chung(a)samsung.com> Cc: Jiri Slaby <jslaby(a)suse.com> Cc: Joachim Eastwood <manabian(a)gmail.com> Cc: John Youn <johnyoun(a)synopsys.com> Cc: Jon Hunter <jonathanh(a)nvidia.com> Cc: Jonathan Cameron <jic23(a)kernel.org> Cc: Jonathan Corbet <corbet(a)lwn.net> Cc: Jonathan Hunter <jonathanh(a)nvidia.com> Cc: Kalle Valo <kvalo(a)qca.qualcomm.com> Cc: Kishon Vijay Abraham I <kishon(a)ti.com> Cc: Kyungmin Park <kyungmin.park(a)samsung.com> Cc: Lars-Peter Clausen <lars(a)metafoo.de> Cc: Laxman Dewangan <ldewangan(a)nvidia.com> Cc: Lee Jones <lee.jones(a)linaro.org> Cc: Liam Girdwood <lgirdwood(a)gmail.com> Cc: Linus Walleij <linus.walleij(a)linaro.org> Cc: Lucas Stach <l.stach(a)pengutronix.de> Cc: Marc Dietrich <marvin24(a)gmx.de> Cc: Marek Vasut <marek.vasut(a)gmail.com> Cc: Mark Brown <broonie(a)kernel.org> Cc: Mark Yao <mark.yao(a)rock-chips.com> Cc: Mathias Nyman <mathias.nyman(a)intel.com> Cc: Matthias Brugger <matthias.bgg(a)gmail.com> Cc: Maxime Coquelin <mcoquelin.stm32(a)gmail.com> Cc: Maxime Ripard <maxime.ripard(a)free-electrons.com> Cc: Michael Turquette <mturquette(a)baylibre.com> Cc: Moritz Fischer <moritz.fischer(a)ettus.com> Cc: MyungJoo Ham <myungjoo.ham(a)samsung.com> Cc: Ohad Ben-Cohen <ohad(a)wizery.com> Cc: Patrice Chotard <patrice.chotard(a)st.com> Cc: Peter Chen <Peter.Chen(a)nxp.com> Cc: Peter De Schrijver <pdeschrijver(a)nvidia.com> Cc: Peter Meerwald-Stadler <pmeerw(a)pmeerw.net> Cc: Philippe Cornu <philippe.cornu(a)st.com> Cc: Prashant Gaikwad <pgaikwad(a)nvidia.com> Cc: Rakesh Iyer <riyer(a)nvidia.com> Cc: Ralf Baechle <ralf(a)linux-mips.org> Cc: Richard Weinberger <richard(a)nod.at> Cc: Richard Zhu <hongxing.zhu(a)nxp.com> Cc: Rongrong Zou <zourongrong(a)gmail.com> Cc: Ryder Lee <ryder.lee(a)mediatek.com> Cc: Salil Mehta <salil.mehta(a)huawei.com> Cc: Shawn Lin <shawn.lin(a)rock-chips.com> Cc: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> Cc: Stanimir Varbanov <svarbanov(a)mm-sol.com> Cc: Stephen Boyd <sboyd(a)codeaurora.org> Cc: Tejun Heo <tj(a)kernel.org> Cc: Thierry Reding <thierry.reding(a)gmail.com> Cc: Thomas Gleixner <tglx(a)linutronix.de> Cc: Ulf Hansson <ulf.hansson(a)linaro.org> Cc: Vincent Abriou <vincent.abriou(a)st.com> Cc: Vinod Koul <vinod.koul(a)intel.com> Cc: Vivien Didelot <vivien.didelot(a)savoirfairelinux.com> Cc: Wim Van Sebroeck <wim(a)iguana.be> Cc: Wolfram Sang <wsa(a)the-dreams.de> Cc: Xinliang Liu <z.liuxinliang(a)hisilicon.com> Cc: Xinwei Kong <kong.kongxinwei(a)hisilicon.com> Cc: Yannick Fertre <yannick.fertre(a)st.com> Cc: Yisen Zhuang <yisen.zhuang(a)huawei.com> Cc: Zhang Rui <rui.zhang(a)intel.com> Cc: alsa-devel(a)alsa-project.org Cc: ath10k(a)lists.infradead.org Cc: devel(a)driverdev.osuosl.org Cc: dmaengine(a)vger.kernel.org Cc: dri-devel(a)lists.freedesktop.org Cc: linux-arm-kernel(a)lists.infradead.org Cc: linux-arm-msm(a)vger.kernel.org Cc: linux-clk(a)vger.kernel.org Cc: linux-crypto(a)vger.kernel.org Cc: linux-doc(a)vger.kernel.org Cc: linux-fpga(a)vger.kernel.org Cc: linux-gpio(a)vger.kernel.org Cc: linux-i2c(a)vger.kernel.org Cc: linux-ide(a)vger.kernel.org Cc: linux-iio(a)vger.kernel.org Cc: linux-input(a)vger.kernel.org Cc: linux-kernel(a)vger.kernel.org Cc: linux-media(a)vger.kernel.org Cc: linux-mediatek(a)lists.infradead.org Cc: linux-mips(a)linux-mips.org Cc: linux-mmc(a)vger.kernel.org Cc: linux-mtd(a)lists.infradead.org Cc: linux-pci(a)vger.kernel.org Cc: linux-pm(a)vger.kernel.org Cc: linux-pwm(a)vger.kernel.org Cc: linux-remoteproc(a)vger.kernel.org Cc: linux-rockchip(a)lists.infradead.org Cc: linux-serial(a)vger.kernel.org Cc: linux-spi(a)vger.kernel.org Cc: linux-tegra(a)vger.kernel.org Cc: linux-usb(a)vger.kernel.org Cc: linux-watchdog(a)vger.kernel.org Cc: linux-wireless(a)vger.kernel.org Cc: netdev(a)vger.kernel.org Cc: nouveau(a)lists.freedesktop.org

9 21

[alsa-devel] [PATCH 10/11] ASoC: pxa: Handle return value of clk_prepare_enable.
by Arvind Yadav 11 Aug '17

11 Aug '17

clk_prepare_enable() can fail here and we must check its return value. Signed-off-by: Arvind Yadav <arvind.yadav.cs(a)gmail.com> --- sound/soc/pxa/pxa2xx-i2s.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c index 3fb60ba..2312c22 100644 --- a/sound/soc/pxa/pxa2xx-i2s.c +++ b/sound/soc/pxa/pxa2xx-i2s.c @@ -164,10 +164,14 @@ static int pxa2xx_i2s_hw_params(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { struct snd_dmaengine_dai_dma_data *dma_data; + int ret; if (WARN_ON(IS_ERR(clk_i2s))) return -EINVAL; - clk_prepare_enable(clk_i2s); + ret = clk_prepare_enable(clk_i2s); + if (ret) + return ret; + clk_ena = 1; pxa_i2s_wait(); -- 1.9.1

2 3

[alsa-devel] [PATCH] ASoC: spear: Remove redundant message
by dspmihai 10 Aug '17

10 Aug '17

This was reported by checkpatch.pl Signed-off-by: Despotovici Mihai <despotovici.mihai(a)gmail.com> --- sound/soc/spear/spdif_in.c | 4 +--- sound/soc/spear/spdif_out.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/sound/soc/spear/spdif_in.c b/sound/soc/spear/spdif_in.c index 977a078..0f3b1a8 100644 --- a/sound/soc/spear/spdif_in.c +++ b/sound/soc/spear/spdif_in.c @@ -216,10 +216,8 @@ static int spdif_in_probe(struct platform_device *pdev) return -EINVAL; host = devm_kzalloc(&pdev->dev, sizeof(*host), GFP_KERNEL); - if (!host) { - dev_warn(&pdev->dev, "kzalloc fail\n"); + if (!host) return -ENOMEM; - } host->io_base = io_base; host->irq = platform_get_irq(pdev, 0); diff --git a/sound/soc/spear/spdif_out.c b/sound/soc/spear/spdif_out.c index 0a72d52..58d5843 100644 --- a/sound/soc/spear/spdif_out.c +++ b/sound/soc/spear/spdif_out.c @@ -282,10 +282,8 @@ static int spdif_out_probe(struct platform_device *pdev) int ret; host = devm_kzalloc(&pdev->dev, sizeof(*host), GFP_KERNEL); - if (!host) { - dev_warn(&pdev->dev, "kzalloc fail\n"); + if (!host) return -ENOMEM; - } res = platform_get_resource(pdev, IORESOURCE_MEM, 0); host->io_base = devm_ioremap_resource(&pdev->dev, res); -- 2.7.4

3 2

[alsa-devel] [PATCH v1 0/6] ASoC: codecs: msm8916-wcd-analog: Add support to MBHC
by srinivas.kandagatla＠linaro.org 10 Aug '17

10 Aug '17

From: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> This patchset adds support to MBHC(Multibutton headset control) block in PM8916 analog block. MBHC support comes from2 blocks first mechanical headset detection and second headset type, 5 button detection. This patchset adds support to: 1> Support to NC and NO type of headset Jacks. 2> Mechanical insertion and detection of headset jack. 3> Detect a 3 pole Headphone and a 4 pole Headset. 4> Detect 5 buttons. First patch fixes error code returned by snd_soc_codec_set_jack() to be more precise for users. Second patch is patch from Damien, followed by few fixes to codec driver w.r.t mbhc and final patch to add mbhc support. Damien sent a similar patchset to add support to mechanical detection, but that patch has issues and will not work on most usecases (for example after a playback/capture session, multicodec case). So I only picked up the BIT mask patch from that series. Tested it on DB410c with Audio Mezz board with 4 pole and 3 pole and during playback and recording use cases. root@linaro-alip:~# evtest No device specified, trying to scan all of /dev/input/event* Available devices: /dev/input/event0: pm8941_pwrkey /dev/input/event1: DB410c Headset Jack /dev/input/event2: gpio_keys Select the device event number [0-2]: 1 Input driver version is 1.0.1 Input device ID: bus 0x0 vendor 0x0 product 0x0 version 0x0 Input device name: "DB410c Headset Jack" Supported events: Event type 0 (EV_SYN) Event type 1 (EV_KEY) Event code 114 (KEY_VOLUMEDOWN) Event code 115 (KEY_VOLUMEUP) Event code 226 (KEY_MEDIA) Event code 260 (BTN_4) Event code 582 (KEY_VOICECOMMAND) Event type 5 (EV_SW) Event code 2 (SW_HEADPHONE_INSERT) state 1 Event code 4 (SW_MICROPHONE_INSERT) state 1 Properties: Testing ... (interrupt to exit) Event: time 1501001112.059684, type 1 (EV_KEY), code 226 (KEY_MEDIA), value 1 Event: time 1501001112.059684, type 5 (EV_SW), code 2 (SW_HEADPHONE_INSERT), value 0 Event: time 1501001112.059684, type 5 (EV_SW), code 4 (SW_MICROPHONE_INSERT), value 0 Event: time 1501001112.059684, -------------- SYN_REPORT ------------ Event: time 1501001112.254116, type 1 (EV_KEY), code 226 (KEY_MEDIA), value 0 Event: time 1501001112.254116, -------------- SYN_REPORT ------------ Event: time 1501001113.154184, type 1 (EV_KEY), code 114 (KEY_VOLUMEDOWN), value 1 Event: time 1501001113.154184, -------------- SYN_REPORT ------------ Event: time 1501001113.319658, type 1 (EV_KEY), code 114 (KEY_VOLUMEDOWN), value 0 Event: time 1501001113.319658, -------------- SYN_REPORT ------------ Event: time 1501001113.781084, type 1 (EV_KEY), code 226 (KEY_MEDIA), value 1 Event: time 1501001113.781084, -------------- SYN_REPORT ------------ Event: time 1501001114.024930, type 1 (EV_KEY), code 226 (KEY_MEDIA), value 0 Event: time 1501001114.024930, -------------- SYN_REPORT ------------ Event: time 1501001114.419082, type 1 (EV_KEY), code 114 (KEY_VOLUMEDOWN), value 1 Event: time 1501001114.419082, -------------- SYN_REPORT ------------ Event: time 1501001114.576011, type 1 (EV_KEY), code 114 (KEY_VOLUMEDOWN), value 0 Event: time 1501001114.576011, -------------- SYN_REPORT ------------ Event: time 1501001114.795281, type 1 (EV_KEY), code 114 (KEY_VOLUMEDOWN), value 1 Event: time 1501001114.795281, -------------- SYN_REPORT ------------ Event: time 1501001114.863333, type 1 (EV_KEY), code 114 (KEY_VOLUMEDOWN), value 0 Event: time 1501001114.863333, -------------- SYN_REPORT ------------ Event: time 1501001116.603372, type 1 (EV_KEY), code 226 (KEY_MEDIA), value 1 Event: time 1501001116.603372, -------------- SYN_REPORT ------------ Damien Riegel (1): ASoC: codecs: msm8916-analog: fix DIG_CLK_CTL_RXD3_CLK_EN define Srinivas Kandagatla (5): ASoC: jack: fix snd_soc_codec_set_jack return error ASoC: codecs: msm8916-wcd-analog: move codec reset to probe ASoC: codecs: msm8916-wcd-analog: set default micbias voltage to 1.8 ASoC: codecs: msm8916-wcd-analog: add MBHC support ASoC: qcom: apq8016-sbc: Add support to Headset JACK .../bindings/sound/qcom,msm8916-wcd-analog.txt | 9 + sound/soc/codecs/msm8916-wcd-analog.c | 359 +++++++++++++++++++-- sound/soc/codecs/msm8916-wcd.h | 12 + sound/soc/qcom/apq8016_sbc.c | 52 +++ sound/soc/soc-jack.c | 2 +- 5 files changed, 410 insertions(+), 24 deletions(-) create mode 100644 sound/soc/codecs/msm8916-wcd.h -- 2.9.3

3 19

[alsa-devel] [Test Request v2] Component level pcm_new/pcm_free v2
by Kuninori Morimoto 10 Aug '17

10 Aug '17

Hi Mark, Johan, Brian These are v2 of Component level pcm_new/free patches v2. Previous patch-set still had issue if 2 platform were registered. I think this version solved this issue. But, I'm not sure if you are using unexpected usage which I don't use. So, can you please test these patches ? replacing platform to component is based on this patch-set Kuninori Morimoto (3): ASoC: soc-core: add snd_soc_rtdcom_xxx() ASoC: use snd_soc_rtdcom_add() and convert to consistent operation ASoC: add Component level pcm_new/pcm_free v2 Best regards --- Kuninori Morimoto

3 6

[alsa-devel] [PATCH v4 00/17] Add support for Cirrus Logic CS47L35/L85/L90/L91 codecs
by Richard Fitzgerald 08 Aug '17

08 Aug '17

The Cirrus Logic CS47L35, CS47L85, CS47L90/91 codecs are complex audio SoC devices. In addition to the core audio capability they have onboard GPIO, regulators, DSPs and interrupt controller and a large register map space accessed over SPI or I2C. This family of codecs is based around common IP blocks and they are managed by a set of common drivers referred to as "Madera". Summary of changes since V3: - Manually stripped register definitions we're not using right now from registers.h to reduce the size and included some explanation in the commit message for why we do it the way we do - Fixed review comments on MFD code - Fixed Kconfig dependency error on pinctrl (missing dependency in MFD) - minor bugfixes to routing in CS47L85 and CS47L90 codec drivers Richard Fitzgerald (17): mfd: madera: Add register definitions for Cirrus Logic Madera codecs mfd: madera: Add DT bindings for Cirrus Logic Madera codecs mfd: madera: Add common support for Cirrus Logic Madera codecs mfd: madera: Register map tables for Cirrus Logic CS47L35 mfd: madera: Register map tables for Cirrus Logic CS47L85 mfd: madera: Register map tables for Cirrus Logic CS47L90/91 regulator: arizona-micsupp: Add support for Cirrus Logic Madera codecs regulator: arizona-ldo1: Add support for Cirrus Logic Madera codecs irqchip: Add driver for Cirrus Logic Madera codecs pinctrl: madera: Add DT bindings for Cirrus Logic Madera codecs pinctrl: madera: Add driver for Cirrus Logic Madera codecs gpio: madera: Support Cirrus Logic Madera class codecs ASoC: madera: Add DT bindings for Cirrus Logic Madera codecs ASoC: madera: Add common support for Cirrus Logic Madera codecs ASoC: cs47l35: Add codec driver for Cirrus Logic CS47L35 ASoC: cs47l85: Add codec driver for Cirrus Logic CS47L85 ASoC: cs47l90: Add codec driver for Cirrus Logic CS47L90 Documentation/devicetree/bindings/mfd/madera.txt | 102 + .../bindings/pinctrl/cirrus,madera-pinctrl.txt | 99 + .../bindings/regulator/arizona-regulator.txt | 3 +- Documentation/devicetree/bindings/sound/madera.txt | 67 + MAINTAINERS | 23 + drivers/gpio/Kconfig | 6 + drivers/gpio/Makefile | 1 + drivers/gpio/gpio-madera.c | 196 + drivers/irqchip/Kconfig | 3 + drivers/irqchip/Makefile | 1 + drivers/irqchip/irq-madera.c | 301 ++ drivers/mfd/Kconfig | 48 + drivers/mfd/Makefile | 13 + drivers/mfd/cs47l35-tables.c | 1610 +++++++ drivers/mfd/cs47l85-tables.c | 3010 +++++++++++++ drivers/mfd/cs47l90-tables.c | 2675 ++++++++++++ drivers/mfd/madera-core.c | 617 +++ drivers/mfd/madera-i2c.c | 135 + drivers/mfd/madera-spi.c | 135 + drivers/mfd/madera.h | 54 + drivers/pinctrl/Kconfig | 1 + drivers/pinctrl/Makefile | 1 + drivers/pinctrl/cirrus/Kconfig | 15 + drivers/pinctrl/cirrus/Makefile | 11 + drivers/pinctrl/cirrus/pinctrl-cs47l35.c | 46 + drivers/pinctrl/cirrus/pinctrl-cs47l85.c | 60 + drivers/pinctrl/cirrus/pinctrl-cs47l90.c | 58 + drivers/pinctrl/cirrus/pinctrl-madera.c | 1074 +++++ drivers/pinctrl/cirrus/pinctrl-madera.h | 40 + drivers/regulator/Kconfig | 15 +- drivers/regulator/arizona-ldo1.c | 82 +- drivers/regulator/arizona-micsupp.c | 71 +- include/dt-bindings/sound/madera.h | 27 + include/linux/irqchip/irq-madera-pdata.h | 23 + include/linux/irqchip/irq-madera.h | 96 + include/linux/mfd/madera/core.h | 179 + include/linux/mfd/madera/pdata.h | 61 + include/linux/mfd/madera/registers.h | 3987 ++++++++++++++++++ include/sound/madera-pdata.h | 61 + sound/soc/codecs/Kconfig | 23 + sound/soc/codecs/Makefile | 8 + sound/soc/codecs/cs47l35.c | 1747 ++++++++ sound/soc/codecs/cs47l85.c | 2722 ++++++++++++ sound/soc/codecs/cs47l90.c | 2661 ++++++++++++ sound/soc/codecs/madera.c | 4438 ++++++++++++++++++++ sound/soc/codecs/madera.h | 470 +++ 46 files changed, 27066 insertions(+), 10 deletions(-) create mode 100644 Documentation/devicetree/bindings/mfd/madera.txt create mode 100644 Documentation/devicetree/bindings/pinctrl/cirrus,madera-pinctrl.txt create mode 100644 Documentation/devicetree/bindings/sound/madera.txt create mode 100644 drivers/gpio/gpio-madera.c create mode 100644 drivers/irqchip/irq-madera.c create mode 100644 drivers/mfd/cs47l35-tables.c create mode 100644 drivers/mfd/cs47l85-tables.c create mode 100644 drivers/mfd/cs47l90-tables.c create mode 100644 drivers/mfd/madera-core.c create mode 100644 drivers/mfd/madera-i2c.c create mode 100644 drivers/mfd/madera-spi.c create mode 100644 drivers/mfd/madera.h create mode 100644 drivers/pinctrl/cirrus/Kconfig create mode 100644 drivers/pinctrl/cirrus/Makefile create mode 100644 drivers/pinctrl/cirrus/pinctrl-cs47l35.c create mode 100644 drivers/pinctrl/cirrus/pinctrl-cs47l85.c create mode 100644 drivers/pinctrl/cirrus/pinctrl-cs47l90.c create mode 100644 drivers/pinctrl/cirrus/pinctrl-madera.c create mode 100644 drivers/pinctrl/cirrus/pinctrl-madera.h create mode 100644 include/dt-bindings/sound/madera.h create mode 100644 include/linux/irqchip/irq-madera-pdata.h create mode 100644 include/linux/irqchip/irq-madera.h create mode 100644 include/linux/mfd/madera/core.h create mode 100644 include/linux/mfd/madera/pdata.h create mode 100644 include/linux/mfd/madera/registers.h create mode 100644 include/sound/madera-pdata.h create mode 100644 sound/soc/codecs/cs47l35.c create mode 100644 sound/soc/codecs/cs47l85.c create mode 100644 sound/soc/codecs/cs47l90.c create mode 100644 sound/soc/codecs/madera.c create mode 100644 sound/soc/codecs/madera.h -- 1.9.1

2 19

[alsa-devel] [PATCH] ASoC: rockchip: add bindings for i2s
by Sugar Zhang 07 Aug '17

07 Aug '17

This patch add bindings for rk3036/rk3228/rk3328/rk3366 i2s. Signed-off-by: Sugar Zhang <sugar.zhang(a)rock-chips.com> --- Documentation/devicetree/bindings/sound/rockchip-i2s.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/rockchip-i2s.txt b/Documentation/devicetree/bindings/sound/rockchip-i2s.txt index 206aba1..b208a75 100644 --- a/Documentation/devicetree/bindings/sound/rockchip-i2s.txt +++ b/Documentation/devicetree/bindings/sound/rockchip-i2s.txt @@ -7,8 +7,12 @@ Required properties: - compatible: should be one of the following: - "rockchip,rk3066-i2s": for rk3066 + - "rockchip,rk3036-i2s", "rockchip,rk3066-i2s": for rk3036 - "rockchip,rk3188-i2s", "rockchip,rk3066-i2s": for rk3188 + - "rockchip,rk3228-i2s", "rockchip,rk3066-i2s": for rk3228 - "rockchip,rk3288-i2s", "rockchip,rk3066-i2s": for rk3288 + - "rockchip,rk3328-i2s", "rockchip,rk3066-i2s": for rk3328 + - "rockchip,rk3366-i2s", "rockchip,rk3066-i2s": for rk3366 - "rockchip,rk3368-i2s", "rockchip,rk3066-i2s": for rk3368 - "rockchip,rk3399-i2s", "rockchip,rk3066-i2s": for rk3399 - reg: physical base address of the controller and length of memory mapped -- 2.7.4

3 3

[alsa-devel] [PATCH v3 00/12] ASoC: Add I2S support for Allwinner H3 SoCs
by codekipper＠gmail.com 07 Aug '17

07 Aug '17

From: Marcus Cooper <codekipper(a)gmail.com> Hi All, please find attached a series of patches to bring i2s support to the Allwinner H3 SoC. This has been tested with the following setups: A20 Olimex EVB connected to a pcm5102 Orange Pi 2 connected to a uda1380 Orange Pi 2 hdmi audio playback Pine 64 connected to the audio DAC board To get i2s working some additional patches are required which will be delivered later. For now they have been pushed here https://github.com/codekipper/linux-sunxi/commits/sunxi-audio-h3 I don't own a A33 device which uses the i2s block for the audio codec so if someone could test against that it would be much appreciated. I'm also wondering if there is a preferred way of setting the lrclk size in the dts?..currently it is set to the sample width but for example the pcm5102a wants it to be 32 bits whatever the sample rate. Thanks in advance, CK --- v3 changes compared to v2 are: - initial changes to prepare driver for newer SoCs has been broken down into smaller patches - reduce use of regmap fields to where just needed. - clkdiv expansion will be delivered later. - defines for H3 variant segregated. - fixed regmap config issue with SUN8I_I2S_FIFO_TX_REG. v2 changes compared to v1 are: - massive refactoring to remove duplicate code making use of regmap_fields. - extending the clock divisors. - removed code that should be delivered when we support 20/24bits --- Marcus Cooper (12): ASoC: sun4i-i2s: Extend quirks scope ASoC: sun4i-i2s: Add clkdiv offsets to quirks ASoC: sun4i-i2s: Add regmap config to quirks ASoC: sun4i-i2s: Add TX FIFO offset to quirks ASoC: sun4i-i2s: Add regmap fields for channels ASoC: sun4i-i2s: Add changes for wss and sr ASoC: sun4i-i2s: bclk and lrclk polarity tidyup ASoC: sun4i-i2s: Add mclk enable regmap field ASoC: sun4i-i2s: Add regmap field to set format ASoC: sun4i-i2s: Check for slave select bit ASoC: sun4i-i2s: Update global enable with bitmask ASoC: sun4i-i2s: Add support for H3 .../devicetree/bindings/sound/sun4i-i2s.txt | 2 + sound/soc/sunxi/sun4i-i2s.c | 460 ++++++++++++++++++--- 2 files changed, 398 insertions(+), 64 deletions(-) -- 2.13.3

6 32

[alsa-devel] [PATCH v2] ASoC: Intel: Reset hw_ptr on resume trigger
by Cheng-Yi Chiang 07 Aug '17

07 Aug '17

From: "U. Artie Eoff" <ullysses.a.eoff(a)intel.com> Reset the hw_ptr before queuing the restore_stream_context work to eradicate a nasty white audio noise on resume. Tested-by: Cheng-Yi Chiang <cychiang(a)chromium.org> Signed-off-by: U. Artie Eoff <ullysses.a.eoff(a)intel.com> Signed-off-by: Cheng-Yi Chiang <cychiang(a)chromium.org> --- sound/soc/intel/baytrail/sst-baytrail-pcm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/soc/intel/baytrail/sst-baytrail-pcm.c b/sound/soc/intel/baytrail/sst-baytrail-pcm.c index 4765ad474544..e0db7070cd42 100644 --- a/sound/soc/intel/baytrail/sst-baytrail-pcm.c +++ b/sound/soc/intel/baytrail/sst-baytrail-pcm.c @@ -187,8 +187,10 @@ static int sst_byt_pcm_trigger(struct snd_pcm_substream *substream, int cmd) sst_byt_stream_start(byt, pcm_data->stream, 0); break; case SNDRV_PCM_TRIGGER_RESUME: - if (pdata->restore_stream == true) + if (pdata->restore_stream == true) { + pcm_data->hw_ptr = 0; schedule_work(&pcm_data->work); + } else sst_byt_stream_resume(byt, pcm_data->stream); break; -- 2.12.2

4 6

[alsa-devel] [PATCH RESEND v3 0/3] Add support for es8323 and hdmi audio to the firefly-rk3288
by Romain Perier 04 Aug '17

04 Aug '17

This set of patches enables support for the es8323 codecs on the firefly-rk3288. It adds the required DT definitions to link rockchip-i2s to the es8388 analog output. As the support for HDMI audio is also built-in in the corresponding ASoC machine driver, HDMI audio output is also enabled. Changes in v3: - Synced DT with the one of the Rock2, the properties have been lexically re-ordered in the right order, I have splitted the headphone pinctrl in two: phone_ctl and hp_det Changes in v2: - Adapted DT for the firefly-rk3288 to the ASoC machine driver rk3288-hdmi-analog - Added patch 02/03 to this series - Re-wrote this cover letter Romain Perier (3): SoC: es8328-i2c: Add compatible for ES8323 arm: dts: rockchip: Don't set otp-gpio pinctrl by default in rk3288.dtsi arm: dts: Add support for ES8323 to the Firefly-RK3288 Documentation/devicetree/bindings/sound/es8328.txt | 5 ++- arch/arm/boot/dts/rk3288-evb.dtsi | 4 +++ arch/arm/boot/dts/rk3288-firefly.dtsi | 38 ++++++++++++++++++++++ arch/arm/boot/dts/rk3288-veyron.dtsi | 4 +++ arch/arm/boot/dts/rk3288.dtsi | 4 --- sound/soc/codecs/es8328-i2c.c | 2 ++ 6 files changed, 52 insertions(+), 5 deletions(-) -- 2.11.0

2 13

[alsa-devel] [PATCH 0/2] ASoC: codec: add DT support to dmic codec
by Arnaud Pouliquen 02 Aug '17

02 Aug '17

These patches add of_table description in dmic codec to support DT probing. As this codec is a generic code to support simple digital microphone, compatibility field is generic. Arnaud Pouliquen (2): ASoC: Add bindings for DMIC codec driver ASoC: codec: add DT support in dmic codec Documentation/devicetree/bindings/sound/dmic.txt | 12 ++++++++++++ sound/soc/codecs/dmic.c | 6 ++++++ 2 files changed, 18 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/dmic.txt -- 2.7.4

2 4

[alsa-devel] [PATCH v2 0/3] ASoC: codecs: msm8916-wcd-digital: Fix dmic support
by srinivas.kandagatla＠linaro.org 02 Aug '17

02 Aug '17

From: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> This patchset fixes dmic support in the codec driver, first and second patch fixes the mclk rate for the codec and the third patch adds missing selection of DMIC in CIC filter source path. Tested on DB410c with Audio Mezz board which has got dmic on it. Changes since v1: - check return values for set_sysclk and clk_set_rate() spoted by Mark. - Added more info in change log. - Fixed multicodec usecase. Srinivas Kandagatla (3): ASoC: codecs: msm8916-wcd-digital: add support to set_sysclk ASoC: qcom: apq8016-sbc: set default mclk rate ASoC: codecs: msm8916-wcd-digital: select DMIC source in CIC filter path sound/soc/codecs/msm8916-wcd-digital.c | 35 ++++++++++++++++++++++++++++++++++ sound/soc/qcom/apq8016_sbc.c | 23 ++++++++++++++++++---- 2 files changed, 54 insertions(+), 4 deletions(-) -- 2.9.3

3 8

[alsa-devel] [PATCH] streamline TLV320AIC23 drivers
by Jens Rottmann 01 Aug '17

01 Aug '17

The iMX-TLV320AIC23 driver isn't from Freescale, but from a company named Eukrea Electromatique, originally for their own boards. From the code I get the impression it is a bit older, its DT options use a differing naming scheme. Patch it up a bit: - Remove Eukrea naming, i.MX is from Freescale, TLV320AIC23 is from TI, driver was written by Eukrea, but it's DT capable, so it's not exclusive: - Kconfig option title - 'model' option - driver 'compatible' string - Other options just have changed over time, this driver remaining (one of) the last with the old semantics: - 'audio-codec' option (also moved from ssi node) - 'mux-int/ext-port' options - All options stay backwards compatible, the DT binding documents new and old names. CONFIG variable and files have not been renamed, though, so no need to change old defconfigs. Signed-off-by: Jens Rottmann <Jens.Rottmann(a)ADLINKtech.com> --- --- a/Documentation/devicetree/bindings/sound/eukrea-tlv320.txt +++ b/Documentation/devicetree/bindings/sound/eukrea-tlv320.txt @@ -1,16 +1,23 @@ -Audio complex for Eukrea boards with tlv320aic23 codec. +Audio complex for Freescale i.MX boards with TI TLV320AIC23 I2S codecs, +like those from Eukrea Electromatique. Required properties: - - compatible : "eukrea,asoc-tlv320" + - compatible : "fsl,imx-audio-tlv320aic23" or + "eukrea,asoc-tlv320" (deprecated) - - eukrea,model : The user-visible name of this sound complex. + - model : The user-visible name of this sound complex. + - eukrea,model : Dito, deprecated. - ssi-controller : The phandle of the SSI controller. - - fsl,mux-int-port : The internal port of the i.MX audio muxer (AUDMUX). + - mux-int-port : The internal port of the i.MX audio muxer (AUDMUX). + - fsl,mux-int-port : Dito, deprecated. - - fsl,mux-ext-port : The external port of the i.MX audio muxer. + - mux-ext-port : The external port of the i.MX audio muxer. + - fsl,mux-ext-port : Dito, deprecated. + + - audio-codec : The phandle of the audio codec. Note: The AUDMUX port numbering should start at 1, which is consistent with hardware manual. @@ -18,9 +25,10 @@ hardware manual. Example: sound { - compatible = "eukrea,asoc-tlv320"; - eukrea,model = "imx51-eukrea-tlv320aic23"; + compatible = "fsl,imx-audio-tlv320aic23"; + model = "imx51-eukrea-tlv320aic23"; ssi-controller = <&ssi2>; - fsl,mux-int-port = <2>; - fsl,mux-ext-port = <3>; + mux-int-port = <2>; + mux-ext-port = <3>; + audio-codec = <&codec>; }; --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig @@ -220,7 +220,7 @@ config SND_SOC_PHYCORE_AC97 and phyCARD boards in AC97 mode config SND_SOC_EUKREA_TLV320 - tristate "Eukrea TLV320" + tristate "SoC Audio support for i.MX boards with TLV320AIC23" depends on ARCH_MXC && I2C select SND_SOC_TLV320AIC23_I2C select SND_SOC_IMX_AUDMUX --- a/sound/soc/fsl/eukrea-tlv320.c +++ b/sound/soc/fsl/eukrea-tlv320.c @@ -92,11 +92,13 @@ static int eukrea_tlv320_probe(struct platform_device *pdev) eukrea_tlv320.dev = &pdev->dev; if (np) { - ret = snd_soc_of_parse_card_name(&eukrea_tlv320, - "eukrea,model"); + ret = snd_soc_of_parse_card_name(&eukrea_tlv320, "model"); + if (ret) /* backwards compatible */ + ret = snd_soc_of_parse_card_name(&eukrea_tlv320, + "eukrea,model"); if (ret) { dev_err(&pdev->dev, - "eukrea,model node missing or invalid.\n"); + "model node missing or invalid.\n"); goto err; } @@ -109,22 +111,28 @@ static int eukrea_tlv320_probe(struct platform_device *pdev) goto err; } - codec_np = of_parse_phandle(ssi_np, "codec-handle", 0); + codec_np = of_parse_phandle(pdev->dev.of_node, "audio-codec", 0); + if (!codec_np) /* backwards compatible */ + codec_np = of_parse_phandle(ssi_np, "codec-handle", 0); if (codec_np) eukrea_tlv320_dai.codec_of_node = codec_np; else - dev_err(&pdev->dev, "codec-handle node missing or invalid.\n"); + dev_err(&pdev->dev, "audio-codec node missing or invalid.\n"); - ret = of_property_read_u32(np, "fsl,mux-int-port", &int_port); + ret = of_property_read_u32(np, "mux-int-port", &int_port); + if (ret) /* backwards compatible */ + ret = of_property_read_u32(np, "fsl,mux-int-port", &int_port); if (ret) { dev_err(&pdev->dev, - "fsl,mux-int-port node missing or invalid.\n"); + "mux-int-port node missing or invalid.\n"); return ret; } - ret = of_property_read_u32(np, "fsl,mux-ext-port", &ext_port); + ret = of_property_read_u32(np, "mux-ext-port", &ext_port); + if (ret) /* backwards compatible */ + ret = of_property_read_u32(np, "fsl,mux-ext-port", &ext_port); if (ret) { dev_err(&pdev->dev, - "fsl,mux-ext-port node missing or invalid.\n"); + "mux-ext-port node missing or invalid.\n"); return ret; } @@ -213,7 +221,8 @@ static int eukrea_tlv320_remove(struct platform_device *pdev) } static const struct of_device_id imx_tlv320_dt_ids[] = { - { .compatible = "eukrea,asoc-tlv320"}, + { .compatible = "eukrea,asoc-tlv320"}, /* backwards compatible */ + { .compatible = "fsl,imx-audio-tlv320aic23"}, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, imx_tlv320_dt_ids); _

4 4

[alsa-devel] [PATCH v2 0/2] ASoC: hdmi-codec: Allow driver to restrict sample size
by srinivas.kandagatla＠linaro.org 01 Aug '17

01 Aug '17

From: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> This patch adds option to allow hdmi-codec drivers to restrict the audio sample size based on the values that are suppored in hardware. First patch is adding that formats option to hdmi_codec_pdata and second patch is a fix in adv7511 codec driver which only supports 16 and 24 bit samples. Changes since v1: - Added Review by Jyri - Updated comment in code suggested by Jyri Srinivas Kandagatla (2): ASoC: hdmi-codec: Allow drivers to restrict sample sizes. drm/bridge: adv7511: restrict audio sample sizes drivers/gpu/drm/bridge/adv7511/adv7511_audio.c | 2 ++ include/sound/hdmi-codec.h | 1 + sound/soc/codecs/hdmi-codec.c | 8 +++++--- 3 files changed, 8 insertions(+), 3 deletions(-) -- 2.11.0

4 8

[alsa-devel] [PATCH] ASoC: codecs: fix wm8524 build error
by Arnd Bergmann 01 Aug '17

01 Aug '17

When CONFIG_OF is disabled, we run into a build error: sound/soc/codecs/wm8524.c:257:21: error: 'wm8524_of_match' undeclared here (not in a function); did you mean 'wm8524_dai'? This removes the unnecessary #ifdef around the match table. Fixes: 007b6a54c305 ("ASoC: codecs: add wm8524 codec driver") Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- sound/soc/codecs/wm8524.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sound/soc/codecs/wm8524.c b/sound/soc/codecs/wm8524.c index f42ec664877c..e22b76d64e32 100644 --- a/sound/soc/codecs/wm8524.c +++ b/sound/soc/codecs/wm8524.c @@ -206,13 +206,11 @@ static const struct snd_soc_codec_driver soc_codec_dev_wm8524 = { }, }; -#ifdef CONFIG_OF static const struct of_device_id wm8524_of_match[] = { { .compatible = "wlf,wm8524" }, { /* sentinel*/ } }; MODULE_DEVICE_TABLE(of, wm8524_of_match); -#endif static int wm8524_codec_probe(struct platform_device *pdev) { -- 2.9.0

3 2

[alsa-devel] [PATCH 1/4] ASoC: Intel: Skylake: Reset the controller in probe
by Guneshwor Singh 01 Aug '17

01 Aug '17

Controller can be in reset state by default. Capability structure traversal requires the controller to be out of reset else it results in broken capability parsing. Hence make sure that controller is out of reset before parsing capabilities by doing a full reset. Signed-off-by: Guneshwor Singh <guneshwor.o.singh(a)intel.com> --- sound/soc/intel/skylake/skl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c index 334917ee41cf..a56dfde3928c 100644 --- a/sound/soc/intel/skylake/skl.c +++ b/sound/soc/intel/skylake/skl.c @@ -702,6 +702,8 @@ static int skl_first_init(struct hdac_ext_bus *ebus) return -ENXIO; } + skl_init_chip(bus, true); + snd_hdac_bus_parse_capabilities(bus); if (skl_acquire_irq(ebus, 0) < 0) -- 2.13.0

3 8

[alsa-devel] [PATCH 1/2] ASoC: rt5514: Add the sanity checks of the buffer related address
by Oder Chiou 01 Aug '17

01 Aug '17

The patch add the sanity checks of the buffer related address to make sure the addresses are valid. Signed-off-by: Oder Chiou <oder_chiou(a)realtek.com> --- sound/soc/codecs/rt5514-spi.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/rt5514-spi.c b/sound/soc/codecs/rt5514-spi.c index 950d1ff..6f513cc 100644 --- a/sound/soc/codecs/rt5514-spi.c +++ b/sound/soc/codecs/rt5514-spi.c @@ -173,9 +173,14 @@ static irqreturn_t rt5514_spi_irq(int irq, void *data) rt5514_dsp->buf_rp = buf[0] | buf[1] << 8 | buf[2] << 16 | buf[3] << 24; + if (rt5514_dsp->buf_rp % 8) + rt5514_dsp->buf_rp = (rt5514_dsp->buf_rp / 8) * 8; + rt5514_dsp->buf_size = rt5514_dsp->buf_limit - rt5514_dsp->buf_base; - schedule_delayed_work(&rt5514_dsp->copy_work, 0); + if (rt5514_dsp->buf_base && rt5514_dsp->buf_limit && + rt5514_dsp->buf_rp && rt5514_dsp->buf_size) + schedule_delayed_work(&rt5514_dsp->copy_work, 0); return IRQ_HANDLED; } -- 2.7.4

2 3

[alsa-devel] [PATCH] device property: Fix usecount for of_graph_get_port_parent()
by Tony Lindgren 01 Aug '17

01 Aug '17

Fix inconsistent use of of_graph_get_port_parent() where asoc_simple_card_parse_graph_dai() does of_node_get() before calling it while other callers do not. We can fix this by not trashing the node passed to of_graph_get_port_parent(). Let's make sure the users have correct refcounts and remove related incorrect of_node_put() calls for of_for_each_phandle as that's done by of_phandle_iterator_next(). Let's fix both issues with a single patch to avoid kobject refcounts getting messed up more if two patches are merged separately. Otherwise strange issues can happen caused by memory corruption caused by too many kobject_del() calls such as: BUG: sleeping function called from invalid context at kernel/locking/mutex.c:747 ... (___might_sleep) (__mutex_lock) (mutex_lock_nested) (kernfs_remove) (kobject_del) (kobject_put) (of_get_next_parent) (of_graph_get_port_parent) (asoc_simple_card_parse_graph_dai [snd_soc_simple_card_utils]) (asoc_graph_card_probe [snd_soc_audio_graph_card]) Fixes: 0ef472a973eb ("of_graph: add of_graph_get_port_parent()") Fixes: 2692c1c63c29 ("ASoC: add audio-graph-card support") Fixes: 1689333f8311 ("ASoC: simple-card-utils: add asoc_simple_card_parse_graph_dai()") Cc: Mark Brown <broonie(a)kernel.org> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Cc: alsa-devel(a)alsa-project.org Signed-off-by: Tony Lindgren <tony(a)atomide.com> --- drivers/of/property.c | 9 +++++++++ sound/soc/generic/audio-graph-card.c | 5 +---- sound/soc/generic/simple-card-utils.c | 5 ----- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/drivers/of/property.c b/drivers/of/property.c --- a/drivers/of/property.c +++ b/drivers/of/property.c @@ -708,6 +708,15 @@ struct device_node *of_graph_get_port_parent(struct device_node *node) { unsigned int depth; + if (!node) + return NULL; + + /* + * Preserve usecount for passed in node as of_get_next_parent() + * will do of_node_put() on it. + */ + of_node_get(node); + /* Walk 3 levels up only if there is 'ports' node. */ for (depth = 3; depth && node; depth--) { node = of_get_next_parent(node); diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c --- a/sound/soc/generic/audio-graph-card.c +++ b/sound/soc/generic/audio-graph-card.c @@ -224,7 +224,6 @@ static int asoc_graph_card_parse_of(struct graph_card_data *priv) of_for_each_phandle(&it, rc, node, "dais", NULL, 0) { ret = asoc_graph_card_dai_link_of(it.node, priv, idx++); - of_node_put(it.node); if (ret < 0) return ret; } @@ -239,10 +238,8 @@ static int asoc_graph_get_dais_count(struct device *dev) int count = 0; int rc; - of_for_each_phandle(&it, rc, node, "dais", NULL, 0) { + of_for_each_phandle(&it, rc, node, "dais", NULL, 0) count++; - of_node_put(it.node); - } return count; } diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c @@ -282,11 +282,6 @@ int asoc_simple_card_parse_graph_dai(struct device_node *ep, if (!dai_name) return 0; - /* - * of_graph_get_port_parent() will call - * of_node_put(). So, call of_node_get() here - */ - of_node_get(ep); node = of_graph_get_port_parent(ep); /* Get dai->name */ -- 2.13.2

5 9

[alsa-devel] [PATCH] ASoC: max98090 - Expose HP out enable.
by Enric Balletbo i Serra 01 Aug '17

01 Aug '17

From: Hsin-Yu Chao <hychao(a)chromium.org> Expose the headphone output enables to user space. This will allow userspace to ensure that there is stable output before the headphones are turned on, avoiding a pop on insertion. Signed-off-by: Hsin-Yu Chao <hychao(a)chromium.org> Signed-off-by: Enric Balletbo i Serra <enric.balletbo(a)collabora.com> --- sound/soc/codecs/max98090.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c index 6682848..f38c051 100644 --- a/sound/soc/codecs/max98090.c +++ b/sound/soc/codecs/max98090.c @@ -1074,6 +1074,15 @@ static SOC_ENUM_SINGLE_DECL(mixhprsel_mux_enum, static const struct snd_kcontrol_new max98090_mixhprsel_mux = SOC_DAPM_ENUM("MIXHPRSEL Mux", mixhprsel_mux_enum); +/* HP output enables. */ +static const struct snd_kcontrol_new max98090_hpl_enable = + SOC_DAPM_SINGLE("Switch", M98090_REG_OUTPUT_ENABLE, + M98090_HPLEN_SHIFT, 1, 0); + +static const struct snd_kcontrol_new max98090_hpr_enable = + SOC_DAPM_SINGLE("Switch", M98090_REG_OUTPUT_ENABLE, + M98090_HPREN_SHIFT, 1, 0); + static const struct snd_soc_dapm_widget max98090_dapm_widgets[] = { SND_SOC_DAPM_INPUT("MIC1"), SND_SOC_DAPM_INPUT("MIC2"), @@ -1218,10 +1227,10 @@ static const struct snd_soc_dapm_widget max98090_dapm_widgets[] = { SND_SOC_DAPM_MUX("MIXHPRSEL Mux", M98090_REG_HP_CONTROL, M98090_MIXHPRSEL_SHIFT, 0, &max98090_mixhprsel_mux), - SND_SOC_DAPM_PGA("HP Left Out", M98090_REG_OUTPUT_ENABLE, - M98090_HPLEN_SHIFT, 0, NULL, 0), - SND_SOC_DAPM_PGA("HP Right Out", M98090_REG_OUTPUT_ENABLE, - M98090_HPREN_SHIFT, 0, NULL, 0), + SND_SOC_DAPM_SWITCH("HP Left Out", SND_SOC_NOPM, 0, 0, + &max98090_hpl_enable), + SND_SOC_DAPM_SWITCH("HP Right Out", SND_SOC_NOPM, 0, 0, + &max98090_hpr_enable), SND_SOC_DAPM_PGA("SPK Left Out", M98090_REG_OUTPUT_ENABLE, M98090_SPLEN_SHIFT, 0, NULL, 0), @@ -1405,8 +1414,8 @@ static const struct snd_soc_dapm_route max98090_dapm_routes[] = { * Disable this for lowest power if bypassing * the DAC with an analog signal */ - {"HP Left Out", NULL, "DACL"}, - {"HP Left Out", NULL, "MIXHPLSEL Mux"}, + {"HP Left Out", "Switch", "DACL"}, + {"HP Left Out", "Switch", "MIXHPLSEL Mux"}, {"MIXHPRSEL Mux", "HP Mixer", "Right Headphone Mixer"}, @@ -1414,8 +1423,8 @@ static const struct snd_soc_dapm_route max98090_dapm_routes[] = { * Disable this for lowest power if bypassing * the DAC with an analog signal */ - {"HP Right Out", NULL, "DACR"}, - {"HP Right Out", NULL, "MIXHPRSEL Mux"}, + {"HP Right Out", "Switch", "DACR"}, + {"HP Right Out", "Switch", "MIXHPRSEL Mux"}, {"SPK Left Out", NULL, "Left Speaker Mixer"}, {"SPK Right Out", NULL, "Right Speaker Mixer"}, -- 2.9.3

2 1

[alsa-devel] [PATCH] davinci-evm: extend it to support DM81xx and derivatives
by Vitaly Wool 31 Jul '17

31 Jul '17

Having worked closely with TI DM8148/DM8168 EVMs I came across many derivatives of these boards which didn't use the standard codec but had something like wm897x instead. They all would fit davinci-evm driver nicely if it had support for audio CPU clock divisor and slightly more generic naming. So this patch adds support for reading CPU divisor from a DT and slightly changes names of helper/init functions to be more generic. It also adds support for DaVinci boards that use wm8978 codec. Signed-off-by: Vitaly Wool <vitaly.wool(a)konsulko.com> --- .../bindings/sound/davinci-evm-audio.txt | 6 +- sound/soc/davinci/davinci-evm.c | 66 ++++++++++++++++++++-- 2 files changed, 65 insertions(+), 7 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/davinci-evm-audio.txt b/Documentation/devicetree/bindings/sound/davinci-evm-audio.txt index 963e100514c2..e76966a06f22 100644 --- a/Documentation/devicetree/bindings/sound/davinci-evm-audio.txt +++ b/Documentation/devicetree/bindings/sound/davinci-evm-audio.txt @@ -1,7 +1,9 @@ -* Texas Instruments SoC audio setups with TLV320AIC3X Codec +* Texas Instruments SoC audio setups with TLV320AIC3X/WM89XX codecs Required properties: - compatible : "ti,da830-evm-audio" : forDM365/DA8xx/OMAPL1x/AM33xx + "ti,dm8168-evm-audio" : for DM81xx with TLV320AIC3x + "ti,dm8168-evm-audio-wm8978" : for DM81xx with WM897x - ti,model : The user-visible name of this sound complex. - ti,audio-codec : The phandle of the TLV320AIC3x audio codec - ti,mcasp-controller : The phandle of the McASP controller @@ -14,6 +16,8 @@ Optional properties: - ti,codec-clock-rate : The Codec Clock rate (in Hz) applied to the Codec. - clocks : Reference to the master clock - clock-names : The clock should be named "mclk" +- ti,cpu-clkdiv : CPU clock divisor (if codec and cpu are clocked at + different rates) - Either codec-clock-rate or the codec-clock reference has to be defined. If the both are defined the driver attempts to set referenced clock to the defined rate and takes the rate from the clock reference. diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c index 7a369e0f2093..aa8e11583a84 100644 --- a/sound/soc/davinci/davinci-evm.c +++ b/sound/soc/davinci/davinci-evm.c @@ -26,7 +26,8 @@ struct snd_soc_card_drvdata_davinci { struct clk *mclk; - unsigned sysclk; + unsigned int sysclk; + unsigned int clkdiv; }; static int evm_startup(struct snd_pcm_substream *substream) @@ -61,8 +62,11 @@ static int evm_hw_params(struct snd_pcm_substream *substream, struct snd_soc_dai *cpu_dai = rtd->cpu_dai; struct snd_soc_card *soc_card = rtd->card; int ret = 0; - unsigned sysclk = ((struct snd_soc_card_drvdata_davinci *) - snd_soc_card_get_drvdata(soc_card))->sysclk; + unsigned int sysclk = ((struct snd_soc_card_drvdata_davinci *) + snd_soc_card_get_drvdata(soc_card))->sysclk; + unsigned int clkdiv = ((struct snd_soc_card_drvdata_davinci *) + snd_soc_card_get_drvdata(soc_card))->clkdiv; + /* set the codec system clock */ ret = snd_soc_dai_set_sysclk(codec_dai, 0, sysclk, SND_SOC_CLOCK_OUT); @@ -74,6 +78,13 @@ static int evm_hw_params(struct snd_pcm_substream *substream, if (ret < 0) return ret; + /* set the CPU system clock divisor */ + if (clkdiv) { + ret = snd_soc_dai_set_clkdiv(cpu_dai, 0, clkdiv); + if (ret < 0) + return ret; + } + return 0; } @@ -84,7 +95,7 @@ static struct snd_soc_ops evm_ops = { }; /* davinci-evm machine dapm widgets */ -static const struct snd_soc_dapm_widget aic3x_dapm_widgets[] = { +static const struct snd_soc_dapm_widget evm_dapm_widgets[] = { SND_SOC_DAPM_HP("Headphone Jack", NULL), SND_SOC_DAPM_LINE("Line Out", NULL), SND_SOC_DAPM_MIC("Mic Jack", NULL), @@ -121,8 +132,8 @@ static int evm_aic3x_init(struct snd_soc_pcm_runtime *rtd) int ret; /* Add davinci-evm specific widgets */ - snd_soc_dapm_new_controls(&card->dapm, aic3x_dapm_widgets, - ARRAY_SIZE(aic3x_dapm_widgets)); + snd_soc_dapm_new_controls(&card->dapm, evm_dapm_widgets, + ARRAY_SIZE(evm_dapm_widgets)); if (np) { ret = snd_soc_of_parse_audio_routing(card, "ti,audio-routing"); @@ -142,6 +153,28 @@ static int evm_aic3x_init(struct snd_soc_pcm_runtime *rtd) return 0; } +/* Logic for a non-aic3x (e. g. wm89xx) connected to a davinci-evm */ +static int evm_simple_init(struct snd_soc_pcm_runtime *rtd) +{ + struct snd_soc_card *card = rtd->card; + struct device_node *np = card->dev->of_node; + + /* Add davinci-evm specific widgets */ + snd_soc_dapm_new_controls(&card->dapm, evm_dapm_widgets, + ARRAY_SIZE(evm_dapm_widgets)); + + /* audio routing is optional here */ + if (np) + snd_soc_of_parse_audio_routing(card, "ti,audio-routing"); + + /* not connected */ + snd_soc_dapm_nc_pin(&card->dapm, "MONO_LOUT"); + snd_soc_dapm_nc_pin(&card->dapm, "HPLCOM"); + snd_soc_dapm_nc_pin(&card->dapm, "HPRCOM"); + + return 0; +} + /* davinci-evm digital audio interface glue - connects codec <--> CPU */ static struct snd_soc_dai_link dm6446_evm_dai = { .name = "TLV320AIC3X", @@ -340,11 +373,29 @@ static struct snd_soc_dai_link evm_dai_tlv320aic3x = { SND_SOC_DAIFMT_IB_NF, }; +static struct snd_soc_dai_link evm_dai_wm8978 = { + .name = "wm8978", + .stream_name = "wm8978", + .codec_dai_name = "wm8978-hifi", + .ops = &evm_ops, + .init = evm_simple_init, + .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBM_CFM | + SND_SOC_DAIFMT_IB_NF, +}; + static const struct of_device_id davinci_evm_dt_ids[] = { { .compatible = "ti,da830-evm-audio", .data = (void *) &evm_dai_tlv320aic3x, }, + { + .compatible = "ti,dm8168-evm-audio", + .data = (void *) &evm_dai_tlv320aic3x, + }, + { + .compatible = "ti,dm8168-evm-audio-wm8978", + .data = (void *) &evm_dai_wm8978, + }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, davinci_evm_dt_ids); @@ -422,6 +473,9 @@ static int davinci_evm_probe(struct platform_device *pdev) requestd_rate, drvdata->sysclk); } + /* CPU clock divisor may need to be provided for e. g. wm897x */ + of_property_read_u32(np, "ti,cpu-clkdiv", &drvdata->clkdiv); + snd_soc_card_set_drvdata(&evm_soc_card, drvdata); ret = devm_snd_soc_register_card(&pdev->dev, &evm_soc_card); -- 2.11.0

3 6