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

[alsa-devel] [RFC 0/11] dw_hdmi cleanups, audio preparation, helpers and ahb audio support
by Russell King - ARM Linux 02 Apr '15

02 Apr '15

I'm sending this series for comments, and to allow people to update their code bases (for those who are using my AHB audio driver on iMX6). This is really several series, and I'm not expecting this to be ready for the upcoming merge window. That said, if anyone wants to say that they're happy with some of the initial four patches, I'm happy to queue those for David, if he's willing to take them. This series applies on top of my previous series, which finished with the patch "drm: bridge/dw_hdmi: adjust n/cts setting order". The first four patches are a few cleanups to the dw_hdmi driver. The next two patches introduce new interfaces to the dw_hdmi driver to support AHB audio, including the errata found on iMX6 which requires N to be programmed to zero when the audio FIFO is not full. I'm expecting some discussion with these last two as we try to work out how to deal with the two variants of audio support for this part (AHB audio vs I2S audio). The following three add various helpers to the DRM and ALSA subsystems for audio support which is non-specific to the AHB audio driver. For DRM, this is a helper macro to obtain the pointer into the short audio descriptors. For ALSA, it's a set of helpers to restrict an audio PCM device's capabilities according to the ELD, and to generate the IEC958 channel status data. If these helpers are acceptable, we can convert a number of drivers to them. The ELD helper isn't quite finished, but should be sufficient for initial testing. The last two patches add support for the dw_hdmi audio. This is an ALSA driver rather than an ASoC driver as it's a pretty simple affair. I couldn't find a suitable location in the sound/ subtree to place it, so I've placed it next to the bridge - yes, we probably need to find it a better home in the sound/ subtree, but it currently makes use of dw_hdmi.h in the directory it lives. drivers/gpu/drm/bridge/Kconfig | 11 + drivers/gpu/drm/bridge/Makefile | 1 + drivers/gpu/drm/bridge/dw_hdmi-ahb-audio.c | 566 +++++++++++++++++++++++++++++ drivers/gpu/drm/bridge/dw_hdmi-ahb-audio.h | 14 + drivers/gpu/drm/bridge/dw_hdmi.c | 250 ++++++++----- drivers/gpu/drm/bridge/dw_hdmi.h | 3 + include/drm/bridge/dw_hdmi.h | 7 + include/drm/drm_edid.h | 19 + include/sound/pcm_drm_eld.h | 6 + include/sound/pcm_iec958.h | 9 + sound/core/Kconfig | 6 + sound/core/Makefile | 3 + sound/core/pcm_drm_eld.c | 91 +++++ sound/core/pcm_iec958.c | 70 ++++ 14 files changed, 964 insertions(+), 92 deletions(-) -- FTTC broadband for 0.8mile line: currently at 10.5Mbps down 400kbps up according to speedtest.net.

7 29

[alsa-devel] [PATCH] ASoC: atmel-pcm-dma: increase buffer_bytes_max
by Alexandre Belloni 02 Apr '15

02 Apr '15

atmel-pcm-dma is not limited to a buffer size of 64kB like atmel-pcm-pdc. Increase buffer_bytes_max to 512kB to allow for higher bit rates (i.e. 32bps at 192kHz) to work correctly. By default, keep the prealloc at 64kB. Signed-off-by: Alexandre Belloni <alexandre.belloni(a)free-electrons.com> --- sound/soc/atmel/atmel-pcm-dma.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/atmel/atmel-pcm-dma.c b/sound/soc/atmel/atmel-pcm-dma.c index b8e7bad05eb1..b6625c8c411b 100644 --- a/sound/soc/atmel/atmel-pcm-dma.c +++ b/sound/soc/atmel/atmel-pcm-dma.c @@ -54,7 +54,7 @@ static const struct snd_pcm_hardware atmel_pcm_dma_hardware = { .period_bytes_max = 2 * 0xffff, /* if 2 bytes format */ .periods_min = 8, .periods_max = 1024, /* no limit */ - .buffer_bytes_max = ATMEL_SSC_DMABUF_SIZE, + .buffer_bytes_max = 512 * 1024, }; /** @@ -119,7 +119,7 @@ static int atmel_pcm_configure_dma(struct snd_pcm_substream *substream, static const struct snd_dmaengine_pcm_config atmel_dmaengine_pcm_config = { .prepare_slave_config = atmel_pcm_configure_dma, .pcm_hardware = &atmel_pcm_dma_hardware, - .prealloc_buffer_size = ATMEL_SSC_DMABUF_SIZE, + .prealloc_buffer_size = 64 * 1024, }; int atmel_pcm_dma_platform_register(struct device *dev) -- 2.1.0

3 3

[alsa-devel] ASoC: cs4271: init/timing problem
by Pascal Huerst 02 Apr '15

02 Apr '15

Hey all, We have a custom built hw, based on am335x and from time to time we need to rmmod/modprobe the ASoC machine driver. Depending on the hw, the first call to regmap_update_bits(..) in cs4271_codec_probe(..) fails with -EREMOTEIO. The error is originated in: drivers/i2c/busses/i2c-omap.c and happens if no i2c package acknowledge is received by the host. I think this is a timing issue and on some devices, the codec is just not ready yet, for communication. What is the right way to fix that? My attempt would be something like this: const int retries = 5; while (retries) { ret = regmap_update_bits(cs4271->regmap, CS4271_MODE2, CS4271_MODE2_PDN | CS4271_MODE2_CPEN, CS4271_MODE2_PDN | CS4271_MODE2_CPEN); if (ret == -EREMOTEIO) { retries--; udelay(1); continue; } else if (ret) return ret; break; } But I might also just add a proper delay before the first call to regmap_update_bits(..) So what is the proper way to handle this? Thanks Pascal

3 7

Re: [alsa-devel] ASoC: davinci-mcasp: Set rule constraints if implicit BCLK divider is used
by Dan Carpenter 01 Apr '15

01 Apr '15

Hello Jyri Sarha, The patch a75a053f1eef: "ASoC: davinci-mcasp: Set rule constraints if implicit BCLK divider is used" from Mar 20, 2015, leads to the following Smatch warning: sound/soc/davinci/davinci-mcasp.c:1152 davinci_mcasp_startup() error: buffer overflow 'mcasp->ruledata' 2 <= 2 sound/soc/davinci/davinci-mcasp.c 1138 1139 /* 1140 * Limit the maximum allowed channels for the first stream: 1141 * number of serializers for the direction * tdm slots per serializer 1142 */ 1143 if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) 1144 dir = TX_MODE; 1145 else 1146 dir = RX_MODE; dir is either 1 or 2. 1147 1148 for (i = 0; i < mcasp->num_serializer; i++) { 1149 if (mcasp->serial_dir[i] == dir) 1150 max_channels++; 1151 } 1152 mcasp->ruledata[dir].serializers = max_channels; ^^^^^^^^^^^^^ ->ruledata[] has only two elements so ->ruledata[2] is beyond the end of the array. 1153 max_channels *= mcasp->tdm_slots; regards, dan carpenter

3 2

[alsa-devel] [PATCH 1/8] ASoC: wm8971: Use system_power_efficient_wq instead of custom workqueue
by Lars-Peter Clausen 01 Apr '15

01 Apr '15

The delayed work used by the wm8971 driver to manage the caps charging doesn't have any special requirements that would justify using a custom workqueue, just use the generic system_power_efficient_wq instead. Signed-off-by: Lars-Peter Clausen <lars(a)metafoo.de> --- sound/soc/codecs/wm8971.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/sound/soc/codecs/wm8971.c b/sound/soc/codecs/wm8971.c index 39ddb9b..44baacd 100644 --- a/sound/soc/codecs/wm8971.c +++ b/sound/soc/codecs/wm8971.c @@ -31,8 +31,6 @@ #define WM8971_REG_COUNT 43 -static struct workqueue_struct *wm8971_workq = NULL; - /* codec private data */ struct wm8971_priv { unsigned int sysclk; @@ -636,7 +634,8 @@ static int wm8971_resume(struct snd_soc_codec *codec) reg = snd_soc_read(codec, WM8971_PWR1) & 0xfe3e; snd_soc_write(codec, WM8971_PWR1, reg | 0x01c0); codec->dapm.bias_level = SND_SOC_BIAS_ON; - queue_delayed_work(wm8971_workq, &codec->dapm.delayed_work, + queue_delayed_work(system_power_efficient_wq, + &codec->dapm.delayed_work, msecs_to_jiffies(1000)); } @@ -649,9 +648,6 @@ static int wm8971_probe(struct snd_soc_codec *codec) u16 reg; INIT_DELAYED_WORK(&codec->dapm.delayed_work, wm8971_work); - wm8971_workq = create_workqueue("wm8971"); - if (wm8971_workq == NULL) - return -ENOMEM; wm8971_reset(codec); @@ -659,7 +655,8 @@ static int wm8971_probe(struct snd_soc_codec *codec) reg = snd_soc_read(codec, WM8971_PWR1) & 0xfe3e; snd_soc_write(codec, WM8971_PWR1, reg | 0x01c0); codec->dapm.bias_level = SND_SOC_BIAS_STANDBY; - queue_delayed_work(wm8971_workq, &codec->dapm.delayed_work, + queue_delayed_work(system_power_efficient_wq, + &codec->dapm.delayed_work, msecs_to_jiffies(1000)); /* set the update bits */ @@ -681,8 +678,6 @@ static int wm8971_remove(struct snd_soc_codec *codec) { wm8971_set_bias_level(codec, SND_SOC_BIAS_OFF); - if (wm8971_workq) - destroy_workqueue(wm8971_workq); return 0; } -- 1.8.0

3 9

[alsa-devel] [PATCH] ASoC: atmel-pcm-pdc: merge atmel-pcm back in
by Alexandre Belloni 01 Apr '15

01 Apr '15

atmel-pcm.c was split into two files to create a generic framework for both PDC and DMA. atmel-pcm-dma.c is using the generic dmaengine framework since 95e0e07e710e (ASoC: atmel-pcm: use generic dmaengine framework). Merge atmel-pcm.c in atmel-pcm-pdc.c as this is now the only user. Signed-off-by: Alexandre Belloni <alexandre.belloni(a)free-electrons.com> --- sound/soc/atmel/Makefile | 2 - sound/soc/atmel/atmel-pcm-pdc.c | 79 ++++++++++++++++++++++++++ sound/soc/atmel/atmel-pcm.c | 121 ---------------------------------------- sound/soc/atmel/atmel-pcm.h | 5 -- 4 files changed, 79 insertions(+), 128 deletions(-) delete mode 100644 sound/soc/atmel/atmel-pcm.c diff --git a/sound/soc/atmel/Makefile b/sound/soc/atmel/Makefile index 466a821da98c..b327e5cc8de3 100644 --- a/sound/soc/atmel/Makefile +++ b/sound/soc/atmel/Makefile @@ -1,10 +1,8 @@ # AT91 Platform Support -snd-soc-atmel-pcm-objs := atmel-pcm.o snd-soc-atmel-pcm-pdc-objs := atmel-pcm-pdc.o snd-soc-atmel-pcm-dma-objs := atmel-pcm-dma.o snd-soc-atmel_ssc_dai-objs := atmel_ssc_dai.o -obj-$(CONFIG_SND_ATMEL_SOC) += snd-soc-atmel-pcm.o obj-$(CONFIG_SND_ATMEL_SOC_PDC) += snd-soc-atmel-pcm-pdc.o obj-$(CONFIG_SND_ATMEL_SOC_DMA) += snd-soc-atmel-pcm-dma.o obj-$(CONFIG_SND_ATMEL_SOC_SSC) += snd-soc-atmel_ssc_dai.o diff --git a/sound/soc/atmel/atmel-pcm-pdc.c b/sound/soc/atmel/atmel-pcm-pdc.c index a366b3503c28..da861b44413f 100644 --- a/sound/soc/atmel/atmel-pcm-pdc.c +++ b/sound/soc/atmel/atmel-pcm-pdc.c @@ -47,6 +47,85 @@ #include "atmel-pcm.h" +static int atmel_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, + int stream) +{ + struct snd_pcm_substream *substream = pcm->streams[stream].substream; + struct snd_dma_buffer *buf = &substream->dma_buffer; + size_t size = ATMEL_SSC_DMABUF_SIZE; + + buf->dev.type = SNDRV_DMA_TYPE_DEV; + buf->dev.dev = pcm->card->dev; + buf->private_data = NULL; + buf->area = dma_alloc_coherent(pcm->card->dev, size, + &buf->addr, GFP_KERNEL); + pr_debug("atmel-pcm: alloc dma buffer: area=%p, addr=%p, size=%zu\n", + (void *)buf->area, (void *)(long)buf->addr, size); + + if (!buf->area) + return -ENOMEM; + + buf->bytes = size; + return 0; +} + +static int atmel_pcm_mmap(struct snd_pcm_substream *substream, + struct vm_area_struct *vma) +{ + return remap_pfn_range(vma, vma->vm_start, + substream->dma_buffer.addr >> PAGE_SHIFT, + vma->vm_end - vma->vm_start, vma->vm_page_prot); +} + +static int atmel_pcm_new(struct snd_soc_pcm_runtime *rtd) +{ + struct snd_card *card = rtd->card->snd_card; + struct snd_pcm *pcm = rtd->pcm; + int ret; + + ret = dma_coerce_mask_and_coherent(card->dev, DMA_BIT_MASK(32)); + if (ret) + return ret; + + if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) { + pr_debug("atmel-pcm: allocating PCM playback DMA buffer\n"); + ret = atmel_pcm_preallocate_dma_buffer(pcm, + SNDRV_PCM_STREAM_PLAYBACK); + if (ret) + goto out; + } + + if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) { + pr_debug("atmel-pcm: allocating PCM capture DMA buffer\n"); + ret = atmel_pcm_preallocate_dma_buffer(pcm, + SNDRV_PCM_STREAM_CAPTURE); + if (ret) + goto out; + } + out: + return ret; +} + +static void atmel_pcm_free(struct snd_pcm *pcm) +{ + struct snd_pcm_substream *substream; + struct snd_dma_buffer *buf; + int stream; + + for (stream = 0; stream < 2; stream++) { + substream = pcm->streams[stream].substream; + if (!substream) + continue; + + buf = &substream->dma_buffer; + if (!buf->area) + continue; + dma_free_coherent(pcm->card->dev, buf->bytes, + buf->area, buf->addr); + buf->area = NULL; + } +} + /*--------------------------------------------------------------------------*\ * Hardware definition \*--------------------------------------------------------------------------*/ diff --git a/sound/soc/atmel/atmel-pcm.c b/sound/soc/atmel/atmel-pcm.c deleted file mode 100644 index 8ae3fa5ac60a..000000000000 --- a/sound/soc/atmel/atmel-pcm.c +++ /dev/null @@ -1,121 +0,0 @@ -/* - * atmel-pcm.c -- ALSA PCM interface for the Atmel atmel SoC. - * - * Copyright (C) 2005 SAN People - * Copyright (C) 2008 Atmel - * - * Authors: Sedji Gaouaou <sedji.gaouaou(a)atmel.com> - * - * Based on at91-pcm. by: - * Frank Mandarino <fmandarino(a)endrelia.com> - * Copyright 2006 Endrelia Technologies Inc. - * - * Based on pxa2xx-pcm.c by: - * - * Author: Nicolas Pitre - * Created: Nov 30, 2004 - * Copyright: (C) 2004 MontaVista Software, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include <linux/module.h> -#include <linux/dma-mapping.h> -#include <sound/pcm.h> -#include <sound/soc.h> -#include "atmel-pcm.h" - -static int atmel_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, - int stream) -{ - struct snd_pcm_substream *substream = pcm->streams[stream].substream; - struct snd_dma_buffer *buf = &substream->dma_buffer; - size_t size = ATMEL_SSC_DMABUF_SIZE; - - buf->dev.type = SNDRV_DMA_TYPE_DEV; - buf->dev.dev = pcm->card->dev; - buf->private_data = NULL; - buf->area = dma_alloc_coherent(pcm->card->dev, size, - &buf->addr, GFP_KERNEL); - pr_debug("atmel-pcm: alloc dma buffer: area=%p, addr=%p, size=%zu\n", - (void *)buf->area, (void *)(long)buf->addr, size); - - if (!buf->area) - return -ENOMEM; - - buf->bytes = size; - return 0; -} - -int atmel_pcm_mmap(struct snd_pcm_substream *substream, - struct vm_area_struct *vma) -{ - return remap_pfn_range(vma, vma->vm_start, - substream->dma_buffer.addr >> PAGE_SHIFT, - vma->vm_end - vma->vm_start, vma->vm_page_prot); -} -EXPORT_SYMBOL_GPL(atmel_pcm_mmap); - -int atmel_pcm_new(struct snd_soc_pcm_runtime *rtd) -{ - struct snd_card *card = rtd->card->snd_card; - struct snd_pcm *pcm = rtd->pcm; - int ret; - - ret = dma_coerce_mask_and_coherent(card->dev, DMA_BIT_MASK(32)); - if (ret) - return ret; - - if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) { - pr_debug("atmel-pcm: allocating PCM playback DMA buffer\n"); - ret = atmel_pcm_preallocate_dma_buffer(pcm, - SNDRV_PCM_STREAM_PLAYBACK); - if (ret) - goto out; - } - - if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) { - pr_debug("atmel-pcm: allocating PCM capture DMA buffer\n"); - ret = atmel_pcm_preallocate_dma_buffer(pcm, - SNDRV_PCM_STREAM_CAPTURE); - if (ret) - goto out; - } - out: - return ret; -} -EXPORT_SYMBOL_GPL(atmel_pcm_new); - -void atmel_pcm_free(struct snd_pcm *pcm) -{ - struct snd_pcm_substream *substream; - struct snd_dma_buffer *buf; - int stream; - - for (stream = 0; stream < 2; stream++) { - substream = pcm->streams[stream].substream; - if (!substream) - continue; - - buf = &substream->dma_buffer; - if (!buf->area) - continue; - dma_free_coherent(pcm->card->dev, buf->bytes, - buf->area, buf->addr); - buf->area = NULL; - } -} -EXPORT_SYMBOL_GPL(atmel_pcm_free); - diff --git a/sound/soc/atmel/atmel-pcm.h b/sound/soc/atmel/atmel-pcm.h index 12ae814eff21..6eaf081cad50 100644 --- a/sound/soc/atmel/atmel-pcm.h +++ b/sound/soc/atmel/atmel-pcm.h @@ -83,11 +83,6 @@ struct atmel_pcm_dma_params { #define ssc_readx(base, reg) (__raw_readl((base) + (reg))) #define ssc_writex(base, reg, value) __raw_writel((value), (base) + (reg)) -int atmel_pcm_new(struct snd_soc_pcm_runtime *rtd); -void atmel_pcm_free(struct snd_pcm *pcm); -int atmel_pcm_mmap(struct snd_pcm_substream *substream, - struct vm_area_struct *vma); - #if defined(CONFIG_SND_ATMEL_SOC_PDC) || \ defined(CONFIG_SND_ATMEL_SOC_PDC_MODULE) int atmel_pcm_pdc_platform_register(struct device *dev); -- 2.1.0

3 2

[alsa-devel] [PATCH 00/25] treewide: Use bool function return values of true/false not 1/0
by Joe Perches 01 Apr '15

01 Apr '15

Joe Perches (25): arm: Use bool function return values of true/false not 1/0 arm64: Use bool function return values of true/false not 1/0 hexagon: Use bool function return values of true/false not 1/0 ia64: Use bool function return values of true/false not 1/0 mips: Use bool function return values of true/false not 1/0 powerpc: Use bool function return values of true/false not 1/0 s390: Use bool function return values of true/false not 1/0 sparc: Use bool function return values of true/false not 1/0 tile: Use bool function return values of true/false not 1/0 unicore32: Use bool function return values of true/false not 1/0 x86: Use bool function return values of true/false not 1/0 virtio_console: Use bool function return values of true/false not 1/0 csiostor: Use bool function return values of true/false not 1/0 dcache: Use bool function return values of true/false not 1/0 nfsd: nfs4state: Use bool function return values of true/false not 1/0 include/linux: Use bool function return values of true/false not 1/0 sound: Use bool function return values of true/false not 1/0 rcu: tree_plugin: Use bool function return values of true/false not 1/0 sched: Use bool function return values of true/false not 1/0 ftrace: Use bool function return values of true/false not 1/0 slub: Use bool function return values of true/false not 1/0 bridge: Use bool function return values of true/false not 1/0 netfilter: Use bool function return values of true/false not 1/0 security: Use bool function return values of true/false not 1/0 sound: wm5100-tables: Use bool function return values of true/false not 1/0 arch/arm/include/asm/dma-mapping.h | 8 ++-- arch/arm/include/asm/kvm_emulate.h | 2 +- arch/arm/mach-omap2/powerdomain.c | 14 +++--- arch/arm64/include/asm/dma-mapping.h | 2 +- arch/hexagon/include/asm/dma-mapping.h | 2 +- arch/ia64/include/asm/dma-mapping.h | 2 +- arch/mips/include/asm/dma-mapping.h | 2 +- arch/powerpc/include/asm/dcr-native.h | 2 +- arch/powerpc/include/asm/dma-mapping.h | 4 +- arch/powerpc/include/asm/kvm_book3s_64.h | 4 +- arch/powerpc/sysdev/dcr.c | 2 +- arch/s390/include/asm/dma-mapping.h | 2 +- arch/sparc/mm/init_64.c | 8 ++-- arch/tile/include/asm/dma-mapping.h | 2 +- arch/unicore32/include/asm/dma-mapping.h | 2 +- arch/x86/include/asm/archrandom.h | 2 +- arch/x86/include/asm/dma-mapping.h | 2 +- arch/x86/include/asm/kvm_para.h | 2 +- arch/x86/kvm/cpuid.h | 2 +- arch/x86/kvm/vmx.c | 72 ++++++++++++++-------------- drivers/char/virtio_console.c | 2 +- drivers/scsi/csiostor/csio_scsi.c | 4 +- fs/dcache.c | 12 ++--- fs/nfsd/nfs4state.c | 2 +- include/linux/blkdev.h | 2 +- include/linux/ide.h | 2 +- include/linux/kgdb.h | 2 +- include/linux/mfd/db8500-prcmu.h | 2 +- include/linux/mm.h | 2 +- include/linux/power_supply.h | 8 ++-- include/linux/ssb/ssb_driver_extif.h | 2 +- include/linux/ssb/ssb_driver_gige.h | 16 +++---- include/sound/soc.h | 4 +- kernel/rcu/tree_plugin.h | 4 +- kernel/sched/auto_group.h | 2 +- kernel/sched/completion.c | 16 ++++--- kernel/trace/ftrace.c | 10 ++-- mm/slub.c | 12 ++--- net/bridge/br_private.h | 2 +- net/ipv4/netfilter/ipt_ah.c | 2 +- net/netfilter/ipset/ip_set_hash_ip.c | 8 ++-- net/netfilter/ipset/ip_set_hash_ipmark.c | 8 ++-- net/netfilter/ipset/ip_set_hash_ipport.c | 8 ++-- net/netfilter/ipset/ip_set_hash_ipportip.c | 8 ++-- net/netfilter/ipset/ip_set_hash_ipportnet.c | 8 ++-- net/netfilter/ipset/ip_set_hash_net.c | 8 ++-- net/netfilter/ipset/ip_set_hash_netiface.c | 8 ++-- net/netfilter/ipset/ip_set_hash_netport.c | 8 ++-- net/netfilter/ipset/ip_set_hash_netportnet.c | 8 ++-- net/netfilter/xt_connlimit.c | 2 +- net/netfilter/xt_hashlimit.c | 2 +- net/netfilter/xt_ipcomp.c | 2 +- security/apparmor/file.c | 8 ++-- security/apparmor/policy.c | 10 ++-- sound/soc/codecs/wm5100-tables.c | 12 ++--- 55 files changed, 178 insertions(+), 176 deletions(-) -- 2.1.2

3 4

[alsa-devel] [PATCH] ASoC: rcar: mark device data as constant
by Uwe Kleine-König 01 Apr '15

01 Apr '15

A driver's device data should and can be const. This is a follow-up on commit 33187fb4a203 (ASoC: rsnd: constify of_device_id array) which marked the of_device_id as const. Signed-off-by: Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> --- This is also patch 4 of my series[1] which degraded to this hunk when rebasing to next because all the other changes were already addressed by Fabian. Best regards Uwe [1] http://thread.gmane.org/gmane.linux.alsa.devel/136241/ sound/soc/sh/rcar/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 3d8e4d60c83d..9f48d75fa992 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -99,11 +99,11 @@ #define RSND_RATES SNDRV_PCM_RATE_8000_96000 #define RSND_FMTS (SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S16_LE) -static struct rsnd_of_data rsnd_of_data_gen1 = { +static const struct rsnd_of_data rsnd_of_data_gen1 = { .flags = RSND_GEN1, }; -static struct rsnd_of_data rsnd_of_data_gen2 = { +static const struct rsnd_of_data rsnd_of_data_gen2 = { .flags = RSND_GEN2, }; -- 2.1.4 -- Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | http://www.pengutronix.de/ |

2 1

[alsa-devel] [PATCH v2 0/4] ASoC: constification and random cleanups
by Uwe Kleine-König 01 Apr '15

01 Apr '15

Hello, this is the series sent on Sunday rebased on next. There was a conflict with commit c660c0a80586 (ASoC: fsi: constify of_device_id array) which did a part of my 2nd patch but already conflicted with the first one. Mark said he already took patch 3, but that should not be a problem. Patch 4 applied just fine to next, so this is just a resend. Best regards Uwe Uwe Kleine-König (4): ASoC: fsi: reorder code to make a forward declaration superfluous ASoC: fsi: mark several data structures as const ASoC: fsi: fix license specification ASoC: mark of_device_id and device data as constant sound/soc/sh/fsi.c | 71 ++++++++++++++++++++++++------------------------ sound/soc/sh/rcar/core.c | 4 +-- 2 files changed, 37 insertions(+), 38 deletions(-) -- 2.1.4

2 10

[alsa-devel] [PATCH 0/5] Intel SST driver restructure
by Jie Yang 01 Apr '15

01 Apr '15

In order to prepare for the upstreaming of Skylake drivers and to allow reuse of code between different Intel audio DSP products, this patch series restructures the Intel directory as follows: 1. Create "common" directory. Move common files into this directory. 2. Create "boards" directory. Move all machine drivers into this directory. 3. Create "haswell" directory. Move all remaining hsw/bdw code into this directory. 4. Create "baytrail" directory. Move remaining baytrail driver to this directory. 5. Create "atom" directory. Move all MCG platform drivers(including sst/ folder) to this directory. Todo next step: 1. Change and move atom related codes(in atom/sst/) to corresponding and try share as many as possible codes(e.g. sst_acpi.c). 2. Share more common codes about IPC for different platforms, e.g. The methods for queueing and sending/reciving Tx/Rx messages, The methods for mailbox IO, The IPC error return codes, etc. Jie Yang (5): ASoC: Intel: create common folder and move common files in ASoC: Intel: create haswell folder and move haswell platform files in ASoC: Intel: create boards folder and move sst boards files in ASoC: Intel: create baytrail folder and move baytrail platform files in ASoC: Intel: create atom folder and move atom platform files in sound/soc/intel/Makefile | 42 +++------------------- sound/soc/intel/atom/Makefile | 7 ++++ sound/soc/intel/{ => atom}/sst-atom-controls.c | 0 sound/soc/intel/{ => atom}/sst-atom-controls.h | 0 sound/soc/intel/{ => atom}/sst-mfld-dsp.h | 0 .../intel/{ => atom}/sst-mfld-platform-compress.c | 0 sound/soc/intel/{ => atom}/sst-mfld-platform-pcm.c | 0 sound/soc/intel/{ => atom}/sst-mfld-platform.h | 0 sound/soc/intel/{ => atom}/sst/Makefile | 0 sound/soc/intel/{ => atom}/sst/sst.c | 0 sound/soc/intel/{ => atom}/sst/sst.h | 0 sound/soc/intel/{ => atom}/sst/sst_acpi.c | 0 sound/soc/intel/{ => atom}/sst/sst_drv_interface.c | 0 sound/soc/intel/{ => atom}/sst/sst_ipc.c | 0 sound/soc/intel/{ => atom}/sst/sst_loader.c | 0 sound/soc/intel/{ => atom}/sst/sst_pci.c | 0 sound/soc/intel/{ => atom}/sst/sst_pvt.c | 0 sound/soc/intel/{ => atom}/sst/sst_stream.c | 0 sound/soc/intel/baytrail/Makefile | 4 +++ sound/soc/intel/{ => baytrail}/sst-baytrail-dsp.c | 4 +-- sound/soc/intel/{ => baytrail}/sst-baytrail-ipc.c | 4 +-- sound/soc/intel/{ => baytrail}/sst-baytrail-ipc.h | 0 sound/soc/intel/{ => baytrail}/sst-baytrail-pcm.c | 4 +-- sound/soc/intel/boards/Makefile | 15 ++++++++ sound/soc/intel/{ => boards}/broadwell.c | 6 ++-- sound/soc/intel/{ => boards}/byt-max98090.c | 2 +- sound/soc/intel/{ => boards}/byt-rt5640.c | 4 +-- .../{bytcr_dpcm_rt5640.c => boards/bytcr_rt5640.c} | 0 sound/soc/intel/{ => boards}/cht_bsw_rt5645.c | 0 sound/soc/intel/{ => boards}/cht_bsw_rt5672.c | 0 sound/soc/intel/{ => boards}/haswell.c | 6 ++-- sound/soc/intel/{ => boards}/mfld_machine.c | 0 sound/soc/intel/common/Makefile | 6 ++++ sound/soc/intel/{ => common}/sst-acpi.c | 0 sound/soc/intel/{ => common}/sst-dsp-priv.h | 0 sound/soc/intel/{ => common}/sst-dsp.c | 0 sound/soc/intel/{ => common}/sst-dsp.h | 0 sound/soc/intel/{ => common}/sst-firmware.c | 0 sound/soc/intel/haswell/Makefile | 4 +++ sound/soc/intel/{ => haswell}/sst-haswell-dsp.c | 6 ++-- sound/soc/intel/{ => haswell}/sst-haswell-ipc.c | 4 +-- sound/soc/intel/{ => haswell}/sst-haswell-ipc.h | 0 sound/soc/intel/{ => haswell}/sst-haswell-pcm.c | 6 ++-- 43 files changed, 64 insertions(+), 60 deletions(-) create mode 100644 sound/soc/intel/atom/Makefile rename sound/soc/intel/{ => atom}/sst-atom-controls.c (100%) rename sound/soc/intel/{ => atom}/sst-atom-controls.h (100%) rename sound/soc/intel/{ => atom}/sst-mfld-dsp.h (100%) rename sound/soc/intel/{ => atom}/sst-mfld-platform-compress.c (100%) rename sound/soc/intel/{ => atom}/sst-mfld-platform-pcm.c (100%) rename sound/soc/intel/{ => atom}/sst-mfld-platform.h (100%) rename sound/soc/intel/{ => atom}/sst/Makefile (100%) rename sound/soc/intel/{ => atom}/sst/sst.c (100%) rename sound/soc/intel/{ => atom}/sst/sst.h (100%) rename sound/soc/intel/{ => atom}/sst/sst_acpi.c (100%) rename sound/soc/intel/{ => atom}/sst/sst_drv_interface.c (100%) rename sound/soc/intel/{ => atom}/sst/sst_ipc.c (100%) rename sound/soc/intel/{ => atom}/sst/sst_loader.c (100%) rename sound/soc/intel/{ => atom}/sst/sst_pci.c (100%) rename sound/soc/intel/{ => atom}/sst/sst_pvt.c (100%) rename sound/soc/intel/{ => atom}/sst/sst_stream.c (100%) create mode 100644 sound/soc/intel/baytrail/Makefile rename sound/soc/intel/{ => baytrail}/sst-baytrail-dsp.c (99%) rename sound/soc/intel/{ => baytrail}/sst-baytrail-ipc.c (99%) rename sound/soc/intel/{ => baytrail}/sst-baytrail-ipc.h (100%) rename sound/soc/intel/{ => baytrail}/sst-baytrail-pcm.c (99%) create mode 100644 sound/soc/intel/boards/Makefile rename sound/soc/intel/{ => boards}/broadwell.c (98%) rename sound/soc/intel/{ => boards}/byt-max98090.c (99%) rename sound/soc/intel/{ => boards}/byt-rt5640.c (98%) rename sound/soc/intel/{bytcr_dpcm_rt5640.c => boards/bytcr_rt5640.c} (100%) rename sound/soc/intel/{ => boards}/cht_bsw_rt5645.c (100%) rename sound/soc/intel/{ => boards}/cht_bsw_rt5672.c (100%) rename sound/soc/intel/{ => boards}/haswell.c (98%) rename sound/soc/intel/{ => boards}/mfld_machine.c (100%) create mode 100644 sound/soc/intel/common/Makefile rename sound/soc/intel/{ => common}/sst-acpi.c (100%) rename sound/soc/intel/{ => common}/sst-dsp-priv.h (100%) rename sound/soc/intel/{ => common}/sst-dsp.c (100%) rename sound/soc/intel/{ => common}/sst-dsp.h (100%) rename sound/soc/intel/{ => common}/sst-firmware.c (100%) create mode 100644 sound/soc/intel/haswell/Makefile rename sound/soc/intel/{ => haswell}/sst-haswell-dsp.c (99%) rename sound/soc/intel/{ => haswell}/sst-haswell-ipc.c (99%) rename sound/soc/intel/{ => haswell}/sst-haswell-ipc.h (100%) rename sound/soc/intel/{ => haswell}/sst-haswell-pcm.c (99%) -- 1.9.1

6 16