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

[alsa-devel] [PATCH] ASoC: wm_adsp: Expose coefficient blocks as ALSA binary controls
by Dimitris Papastamos 17 Apr '13

17 Apr '13

Add initial support for runtime tuning for the ADSP cores. This is achieved by exposing the coefficient configuration blocks as ALSA binary controls. The current code assumes that no controls on the DSP are volatile. Change-Id: I9cd57efabe6c195c731f5a17f53617a99d2f09da Signed-off-by: Dimitris Papastamos <dp(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm_adsp.c | 435 ++++++++++++++++++++++++++++++++++++++++++++- sound/soc/codecs/wm_adsp.h | 3 + 2 files changed, 431 insertions(+), 7 deletions(-) diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index 3470b64..080d05f 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -215,6 +215,36 @@ static struct { [WM_ADSP_FW_RX_ANC] = { .file = "rx-anc" }, }; +struct wm_coeff_ctl_ops { + int (*xget)(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol); + int (*xput)(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol); + int (*xinfo)(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo); +}; + +struct wm_coeff { + struct device *dev; + struct list_head ctl_list; + struct regmap *regmap; +}; + +struct wm_coeff_ctl { + const char *name; + struct snd_card *card; + struct wm_adsp_alg_region region; + struct wm_coeff_ctl_ops ops; + struct wm_adsp *adsp; + void *private; + unsigned int enabled:1; + struct list_head list; + void *cache; + size_t len; + unsigned int dirty:1; + struct snd_kcontrol *kcontrol; +}; + static int wm_adsp_fw_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { @@ -334,6 +364,175 @@ static unsigned int wm_adsp_region_to_reg(struct wm_adsp_region const *region, } } +static int wm_coeff_info(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + struct wm_coeff_ctl *ctl = (struct wm_coeff_ctl *)kcontrol->private_value; + + uinfo->type = SNDRV_CTL_ELEM_TYPE_BYTES; + uinfo->count = ctl->len; + return 0; +} + +static int wm_coeff_write_control(struct snd_kcontrol *kcontrol, + const void *buf, size_t len) +{ + struct wm_coeff *wm_coeff= snd_kcontrol_chip(kcontrol); + struct wm_coeff_ctl *ctl = (struct wm_coeff_ctl *)kcontrol->private_value; + struct wm_adsp_alg_region *region = &ctl->region; + const struct wm_adsp_region *mem; + struct wm_adsp *adsp = ctl->adsp; + void *scratch; + int ret; + unsigned int reg; + + mem = wm_adsp_find_region(adsp, region->type); + if (!mem) { + adsp_err(adsp, "No base for region %x\n", + region->type); + return -EINVAL; + } + + reg = ctl->region.base; + reg = wm_adsp_region_to_reg(mem, reg); + + scratch = kmemdup(buf, ctl->len, GFP_KERNEL | GFP_DMA); + if (!scratch) + return -ENOMEM; + + ret = regmap_raw_write(wm_coeff->regmap, reg, scratch, + ctl->len); + if (ret) { + adsp_err(adsp, "Failed to write %zu bytes to %x\n", + ctl->len, reg); + kfree(scratch); + return ret; + } + + kfree(scratch); + + return 0; +} + +static int wm_coeff_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct wm_coeff_ctl *ctl = (struct wm_coeff_ctl *)kcontrol->private_value; + char *p = ucontrol->value.bytes.data; + + memcpy(ctl->cache, p, ctl->len); + + if (!ctl->enabled) { + ctl->dirty = 1; + return 0; + } + + return wm_coeff_write_control(kcontrol, p, ctl->len); +} + +static int wm_coeff_read_control(struct snd_kcontrol *kcontrol, + void *buf, size_t len) +{ + struct wm_coeff *wm_coeff= snd_kcontrol_chip(kcontrol); + struct wm_coeff_ctl *ctl = (struct wm_coeff_ctl *)kcontrol->private_value; + struct wm_adsp_alg_region *region = &ctl->region; + const struct wm_adsp_region *mem; + struct wm_adsp *adsp = ctl->adsp; + void *scratch; + int ret; + unsigned int reg; + + mem = wm_adsp_find_region(adsp, region->type); + if (!mem) { + adsp_err(adsp, "No base for region %x\n", + region->type); + return -EINVAL; + } + + reg = ctl->region.base; + reg = wm_adsp_region_to_reg(mem, reg); + + scratch = kmalloc(ctl->len, GFP_KERNEL | GFP_DMA); + if (!scratch) + return -ENOMEM; + + ret = regmap_raw_read(wm_coeff->regmap, reg, scratch, ctl->len); + if (ret) { + adsp_err(adsp, "Failed to read %zu bytes from %x\n", + ctl->len, reg); + kfree(scratch); + return ret; + } + + memcpy(buf, scratch, ctl->len); + kfree(scratch); + + return 0; +} + +static int wm_coeff_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct wm_coeff_ctl *ctl = (struct wm_coeff_ctl *)kcontrol->private_value; + char *p = ucontrol->value.bytes.data; + + memcpy(p, ctl->cache, ctl->len); + return 0; +} + +static int wm_coeff_add_kcontrol(struct wm_coeff *wm_coeff, + struct wm_coeff_ctl *ctl, + const struct snd_kcontrol_new *kctl) +{ + int ret; + struct snd_kcontrol *kcontrol; + + kcontrol = snd_ctl_new1(kctl, wm_coeff); + ret = snd_ctl_add(ctl->card, kcontrol); + if (ret < 0) { + dev_err(wm_coeff->dev, "Failed to add %s: %d\n", + kctl->name, ret); + return ret; + } + ctl->kcontrol = kcontrol; + return 0; +} + +static int wmfw_add_ctl(struct wm_coeff *wm_coeff, + struct wm_coeff_ctl *ctl) +{ + struct snd_kcontrol_new *kcontrol; + int ret; + + if (!wm_coeff || !ctl || !ctl->name || !ctl->card) + return -EINVAL; + + kcontrol = kzalloc(sizeof(*kcontrol), GFP_KERNEL); + if (!kcontrol) + return -ENOMEM; + kcontrol->iface = SNDRV_CTL_ELEM_IFACE_MIXER; + + kcontrol->name = ctl->name; + kcontrol->info = wm_coeff_info; + kcontrol->get = wm_coeff_get; + kcontrol->put = wm_coeff_put; + kcontrol->private_value = (unsigned long)ctl; + + ret = wm_coeff_add_kcontrol(wm_coeff, + ctl, kcontrol); + if (ret < 0) + goto err_kcontrol; + + kfree(kcontrol); + + list_add(&ctl->list, &wm_coeff->ctl_list); + return 0; + +err_kcontrol: + kfree(kcontrol); + return ret; +} + static int wm_adsp_load(struct wm_adsp *dsp) { LIST_HEAD(buf_list); @@ -547,7 +746,140 @@ out: return ret; } -static int wm_adsp_setup_algs(struct wm_adsp *dsp) +static int wm_coeff_init_control_caches(struct wm_coeff *wm_coeff) +{ + struct wm_coeff_ctl *ctl; + int ret; + + list_for_each_entry(ctl, &wm_coeff->ctl_list, + list) { + if (!ctl->enabled || ctl->dirty) + continue; + ret = wm_coeff_read_control(ctl->kcontrol, + ctl->cache, + ctl->len); + if (ret < 0) + return ret; + } + + return 0; +} + +static int wm_coeff_sync_controls(struct wm_coeff *wm_coeff) +{ + struct wm_coeff_ctl *ctl; + int ret; + + list_for_each_entry(ctl, &wm_coeff->ctl_list, + list) { + if (!ctl->enabled) + continue; + if (ctl->dirty) { + ret = wm_coeff_write_control(ctl->kcontrol, + ctl->cache, + ctl->len); + if (ret < 0) + return ret; + ctl->dirty = 0; + } + } + + return 0; +} + +static int wm_adsp_create_control(struct snd_soc_codec *codec, + const struct wm_adsp_alg_region *region) + +{ + struct wm_adsp *dsp = snd_soc_codec_get_drvdata(codec); + struct wm_coeff_ctl *ctl; + char *name; + char *region_name; + int ret; + + name = kmalloc(PAGE_SIZE, GFP_KERNEL); + if (!name) + return -ENOMEM; + + switch (region->type) { + case WMFW_ADSP1_PM: + region_name = "PM"; + break; + case WMFW_ADSP1_DM: + region_name = "DM"; + break; + case WMFW_ADSP2_XM: + region_name = "XM"; + break; + case WMFW_ADSP2_YM: + region_name = "YM"; + break; + case WMFW_ADSP1_ZM: + region_name = "ZM"; + break; + default: + return -EINVAL; + } + + snprintf(name, PAGE_SIZE, "DSP%d %s %x", + dsp->num, region_name, region->alg); + + list_for_each_entry(ctl, &dsp->wm_coeff->ctl_list, + list) { + if (!strcmp(ctl->name, name)) { + if (!ctl->enabled) + ctl->enabled = 1; + return 0; + } + } + + ctl = kzalloc(sizeof(*ctl), GFP_KERNEL); + if (!ctl) { + ret = -ENOMEM; + goto err_name; + } + ctl->region = *region; + ctl->name = kmemdup(name, strlen(name) + 1, GFP_KERNEL); + if (!ctl->name) { + ret = -ENOMEM; + goto err_ctl; + } + ctl->enabled = 1; + ctl->dirty = 0; + ctl->ops.xget = wm_coeff_get; + ctl->ops.xput = wm_coeff_put; + ctl->card = codec->card->snd_card; + ctl->adsp = dsp; + + ctl->len = region->len; + ctl->cache = kzalloc(ctl->len, GFP_KERNEL); + if (!ctl->cache) { + ret = -ENOMEM; + goto err_ctl_name; + } + + ret = wmfw_add_ctl(dsp->wm_coeff, ctl); + if (ret < 0) { + ret = -ENOMEM; + goto err_ctl_cache; + } + + kfree(name); + + return 0; + +err_ctl_cache: + kfree(ctl->cache); +err_ctl_name: + kfree(ctl->name); +err_ctl: + kfree(ctl); +err_name: + kfree(name); + return ret; +} + +static int wm_adsp_setup_algs(struct wm_adsp *dsp, struct snd_soc_codec *codec) { struct regmap *regmap = dsp->regmap; struct wmfw_adsp1_id_hdr adsp1_id; @@ -730,7 +1062,16 @@ static int wm_adsp_setup_algs(struct wm_adsp *dsp) region->type = WMFW_ADSP1_DM; region->alg = be32_to_cpu(adsp1_alg[i].alg.id); region->base = be32_to_cpu(adsp1_alg[i].dm); + region->len = 0; list_add_tail(&region->list, &dsp->alg_regions); + if (i + 1 < algs) { + region->len = be32_to_cpu(adsp1_alg[i + 1].dm); + region->len -= be32_to_cpu(adsp1_alg[i].dm); + wm_adsp_create_control(codec, region); + } else { + adsp_warn(dsp, "Missing length info for region DM with ID %x\n", + be32_to_cpu(adsp1_alg[i].alg.id)); + } region = kzalloc(sizeof(*region), GFP_KERNEL); if (!region) @@ -738,7 +1079,16 @@ static int wm_adsp_setup_algs(struct wm_adsp *dsp) region->type = WMFW_ADSP1_ZM; region->alg = be32_to_cpu(adsp1_alg[i].alg.id); region->base = be32_to_cpu(adsp1_alg[i].zm); + region->len = 0; list_add_tail(&region->list, &dsp->alg_regions); + if (i + 1 < algs) { + region->len = be32_to_cpu(adsp1_alg[i + 1].zm); + region->len -= be32_to_cpu(adsp1_alg[i].zm); + wm_adsp_create_control(codec, region); + } else { + adsp_warn(dsp, "Missing length info for region ZM with ID %x\n", + be32_to_cpu(adsp1_alg[i].alg.id)); + } break; case WMFW_ADSP2: @@ -758,7 +1108,16 @@ static int wm_adsp_setup_algs(struct wm_adsp *dsp) region->type = WMFW_ADSP2_XM; region->alg = be32_to_cpu(adsp2_alg[i].alg.id); region->base = be32_to_cpu(adsp2_alg[i].xm); + region->len = 0; list_add_tail(&region->list, &dsp->alg_regions); + if (i + 1 < algs) { + region->len = be32_to_cpu(adsp2_alg[i + 1].xm); + region->len -= be32_to_cpu(adsp2_alg[i].xm); + wm_adsp_create_control(codec, region); + } else { + adsp_warn(dsp, "Missing length info for region XM with ID %x\n", + be32_to_cpu(adsp2_alg[i].alg.id)); + } region = kzalloc(sizeof(*region), GFP_KERNEL); if (!region) @@ -766,7 +1125,16 @@ static int wm_adsp_setup_algs(struct wm_adsp *dsp) region->type = WMFW_ADSP2_YM; region->alg = be32_to_cpu(adsp2_alg[i].alg.id); region->base = be32_to_cpu(adsp2_alg[i].ym); + region->len = 0; list_add_tail(&region->list, &dsp->alg_regions); + if (i + 1 < algs) { + region->len = be32_to_cpu(adsp2_alg[i + 1].ym); + region->len -= be32_to_cpu(adsp2_alg[i].ym); + wm_adsp_create_control(codec, region); + } else { + adsp_warn(dsp, "Missing length info for region YM with ID %x\n", + be32_to_cpu(adsp2_alg[i].alg.id)); + } region = kzalloc(sizeof(*region), GFP_KERNEL); if (!region) @@ -774,7 +1142,16 @@ static int wm_adsp_setup_algs(struct wm_adsp *dsp) region->type = WMFW_ADSP2_ZM; region->alg = be32_to_cpu(adsp2_alg[i].alg.id); region->base = be32_to_cpu(adsp2_alg[i].zm); + region->len = 0; list_add_tail(&region->list, &dsp->alg_regions); + if (i + 1 < algs) { + region->len = be32_to_cpu(adsp2_alg[i + 1].zm); + region->len -= be32_to_cpu(adsp2_alg[i].zm); + wm_adsp_create_control(codec, region); + } else { + adsp_warn(dsp, "Missing length info for region ZM with ID %x\n", + be32_to_cpu(adsp2_alg[i].alg.id)); + } break; } } @@ -986,6 +1363,7 @@ int wm_adsp1_event(struct snd_soc_dapm_widget *w, struct snd_soc_codec *codec = w->codec; struct wm_adsp *dsps = snd_soc_codec_get_drvdata(codec); struct wm_adsp *dsp = &dsps[w->shift]; + struct wm_coeff_ctl *ctl; int ret; int val; @@ -1023,7 +1401,7 @@ int wm_adsp1_event(struct snd_soc_dapm_widget *w, if (ret != 0) goto err; - ret = wm_adsp_setup_algs(dsp); + ret = wm_adsp_setup_algs(dsp, codec); if (ret != 0) goto err; @@ -1031,6 +1409,16 @@ int wm_adsp1_event(struct snd_soc_dapm_widget *w, if (ret != 0) goto err; + /* Initialize caches for enabled and non-dirty controls */ + ret = wm_coeff_init_control_caches(dsp->wm_coeff); + if (ret != 0) + goto err; + + /* Sync dirty controls */ + ret = wm_coeff_sync_controls(dsp->wm_coeff); + if (ret != 0) + goto err; + /* Start the core running */ regmap_update_bits(dsp->regmap, dsp->base + ADSP1_CONTROL_30, ADSP1_CORE_ENA | ADSP1_START, @@ -1047,6 +1435,11 @@ int wm_adsp1_event(struct snd_soc_dapm_widget *w, regmap_update_bits(dsp->regmap, dsp->base + ADSP1_CONTROL_30, ADSP1_SYS_ENA, 0); + + list_for_each_entry(ctl, &dsp->wm_coeff->ctl_list, + list) { + ctl->enabled = 0; + } break; default: @@ -1099,6 +1492,7 @@ int wm_adsp2_event(struct snd_soc_dapm_widget *w, struct wm_adsp *dsps = snd_soc_codec_get_drvdata(codec); struct wm_adsp *dsp = &dsps[w->shift]; struct wm_adsp_alg_region *alg_region; + struct wm_coeff_ctl *ctl; unsigned int val; int ret; @@ -1164,7 +1558,7 @@ int wm_adsp2_event(struct snd_soc_dapm_widget *w, if (ret != 0) goto err; - ret = wm_adsp_setup_algs(dsp); + ret = wm_adsp_setup_algs(dsp, codec); if (ret != 0) goto err; @@ -1172,6 +1566,16 @@ int wm_adsp2_event(struct snd_soc_dapm_widget *w, if (ret != 0) goto err; + /* Initialize caches for enabled and non-dirty controls */ + ret = wm_coeff_init_control_caches(dsp->wm_coeff); + if (ret != 0) + goto err; + + /* Sync dirty controls */ + ret = wm_coeff_sync_controls(dsp->wm_coeff); + if (ret != 0) + goto err; + ret = regmap_update_bits(dsp->regmap, dsp->base + ADSP2_CONTROL, ADSP2_CORE_ENA | ADSP2_START, @@ -1209,6 +1613,11 @@ int wm_adsp2_event(struct snd_soc_dapm_widget *w, ret); } + list_for_each_entry(ctl, &dsp->wm_coeff->ctl_list, + list) { + ctl->enabled = 0; + } + while (!list_empty(&dsp->alg_regions)) { alg_region = list_first_entry(&dsp->alg_regions, struct wm_adsp_alg_region, @@ -1247,36 +1656,48 @@ int wm_adsp2_init(struct wm_adsp *adsp, bool dvfs) INIT_LIST_HEAD(&adsp->alg_regions); + adsp->wm_coeff = kzalloc(sizeof(*adsp->wm_coeff), + GFP_KERNEL); + if (!adsp->wm_coeff) + return -ENOMEM; + adsp->wm_coeff->regmap = adsp->regmap; + adsp->wm_coeff->dev = adsp->dev; + INIT_LIST_HEAD(&adsp->wm_coeff->ctl_list); + if (dvfs) { adsp->dvfs = devm_regulator_get(adsp->dev, "DCVDD"); if (IS_ERR(adsp->dvfs)) { ret = PTR_ERR(adsp->dvfs); dev_err(adsp->dev, "Failed to get DCVDD: %d\n", ret); - return ret; + goto out_coeff; } ret = regulator_enable(adsp->dvfs); if (ret != 0) { dev_err(adsp->dev, "Failed to enable DCVDD: %d\n", ret); - return ret; + goto out_coeff; } ret = regulator_set_voltage(adsp->dvfs, 1200000, 1800000); if (ret != 0) { dev_err(adsp->dev, "Failed to initialise DVFS: %d\n", ret); - return ret; + goto out_coeff; } ret = regulator_disable(adsp->dvfs); if (ret != 0) { dev_err(adsp->dev, "Failed to disable DCVDD: %d\n", ret); - return ret; + goto out_coeff; } } return 0; + +out_coeff: + kfree(adsp->wm_coeff); + return ret; } EXPORT_SYMBOL_GPL(wm_adsp2_init); diff --git a/sound/soc/codecs/wm_adsp.h b/sound/soc/codecs/wm_adsp.h index fea5146..6e890b9 100644 --- a/sound/soc/codecs/wm_adsp.h +++ b/sound/soc/codecs/wm_adsp.h @@ -30,6 +30,7 @@ struct wm_adsp_alg_region { unsigned int alg; int type; unsigned int base; + size_t len; }; struct wm_adsp { @@ -55,6 +56,8 @@ struct wm_adsp { bool running; struct regulator *dvfs; + + struct wm_coeff *wm_coeff; }; #define WM_ADSP1(wname, num) \ -- 1.8.2.1

1 0

[alsa-devel] Can Realtek HD-A codec ALC282 support D3cold?
by Lin, Mengdong 17 Apr '13

17 Apr '13

Hi, (Sorry to post this message again) We want to put an idle HD-A codec into D3cold for more power saving and preparation for being power gated. The Realtek ALC282 is used in our test. Could anyone help to confirm whether ALC282 can support D3cold or not? I'm told that ALC282 can support D3cold. But my test shows it cannot. At first, ALC282 HW does not report that it can support D3cold. Its parameter "Supported Power States" returns 0xc000000f, means it only supports: EPSS, CLKSTOP, D3hot, D2, D1 and D0. Is this a just mistake in reporting the bit, or D3cold is not supported all? Then when I explicitly set the audio function group to D3cold by verb 0x705, and then get its power state after 200ms by verb 0xf05, The codec response is 0x00000000: No PS-Error, both PS-Act and PS-set is D0. So it seems codec HW does not process the set power state command at all. Is there someone from Realtek or familiar with ALC282 here can share some information about this issue? Many thanks Mengdong

2 1

Re: [alsa-devel] [PATCH 04/28] proc: Supply PDE attribute setting accessor functions [RFC]
by Mauro Carvalho Chehab 16 Apr '13

16 Apr '13

Em 16-04-2013 15:26, David Howells escreveu: > Supply accessor functions to set attributes in proc_dir_entry structs. > > The following are supplied: proc_set_size() and proc_set_user(). > > Signed-off-by: David Howells <dhowells(a)redhat.com> > cc: linuxppc-dev(a)lists.ozlabs.org > cc: linux-media(a)vger.kernel.org > cc: netdev(a)vger.kernel.org > cc: linux-wireless(a)vger.kernel.org > cc: linux-pci(a)vger.kernel.org > cc: netfilter-devel(a)vger.kernel.org > cc: alsa-devel(a)alsa-project.org > --- > > arch/powerpc/kernel/proc_powerpc.c | 2 +- > arch/powerpc/platforms/pseries/reconfig.c | 2 +- > drivers/media/pci/ttpci/av7110_ir.c | 2 +- Weird that av7110 IR uses /proc... Well, this is an old, obsolete driver for hardware that is not sold anymore for a long time... So, be it. Acked-by: Mauro Carvalho Chehab <mchehab(a)redhat.com> > drivers/net/irda/vlsi_ir.c | 2 +- > drivers/net/wireless/airo.c | 34 +++++++++-------------------- > drivers/pci/proc.c | 2 +- > fs/proc/generic.c | 13 +++++++++++ > include/linux/proc_fs.h | 5 ++++ > kernel/configs.c | 2 +- > kernel/profile.c | 2 +- > net/netfilter/xt_recent.c | 3 +-- > sound/core/info.c | 2 +- > 12 files changed, 38 insertions(+), 33 deletions(-) > > diff --git a/arch/powerpc/kernel/proc_powerpc.c b/arch/powerpc/kernel/proc_powerpc.c > index 41d8ee9..feb8580 100644 > --- a/arch/powerpc/kernel/proc_powerpc.c > +++ b/arch/powerpc/kernel/proc_powerpc.c > @@ -83,7 +83,7 @@ static int __init proc_ppc64_init(void) > &page_map_fops, vdso_data); > if (!pde) > return 1; > - pde->size = PAGE_SIZE; > + proc_set_size(pde, PAGE_SIZE); > > return 0; > } > diff --git a/arch/powerpc/platforms/pseries/reconfig.c b/arch/powerpc/platforms/pseries/reconfig.c > index d6491bd..f93cdf5 100644 > --- a/arch/powerpc/platforms/pseries/reconfig.c > +++ b/arch/powerpc/platforms/pseries/reconfig.c > @@ -452,7 +452,7 @@ static int proc_ppc64_create_ofdt(void) > > ent = proc_create("powerpc/ofdt", S_IWUSR, NULL, &ofdt_fops); > if (ent) > - ent->size = 0; > + proc_set_size(ent, 0); > > return 0; > } > diff --git a/drivers/media/pci/ttpci/av7110_ir.c b/drivers/media/pci/ttpci/av7110_ir.c > index eb82286..0e763a7 100644 > --- a/drivers/media/pci/ttpci/av7110_ir.c > +++ b/drivers/media/pci/ttpci/av7110_ir.c > @@ -375,7 +375,7 @@ int av7110_ir_init(struct av7110 *av7110) > if (av_cnt == 1) { > e = proc_create("av7110_ir", S_IWUSR, NULL, &av7110_ir_proc_fops); > if (e) > - e->size = 4 + 256 * sizeof(u16); > + proc_set_size(e, 4 + 256 * sizeof(u16)); > } > > tasklet_init(&av7110->ir.ir_tasklet, av7110_emit_key, (unsigned long) &av7110->ir); > diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c > index e22cd4e..5f47584 100644 > --- a/drivers/net/irda/vlsi_ir.c > +++ b/drivers/net/irda/vlsi_ir.c > @@ -1678,7 +1678,7 @@ vlsi_irda_probe(struct pci_dev *pdev, const struct pci_device_id *id) > IRDA_WARNING("%s: failed to create proc entry\n", > __func__); > } else { > - ent->size = 0; > + proc_set_size(ent, 0); > } > idev->proc_entry = ent; > } > diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c > index 66e398d..21d0233 100644 > --- a/drivers/net/wireless/airo.c > +++ b/drivers/net/wireless/airo.c > @@ -4507,73 +4507,63 @@ static int setup_proc_entry( struct net_device *dev, > airo_entry); > if (!apriv->proc_entry) > goto fail; > - apriv->proc_entry->uid = proc_kuid; > - apriv->proc_entry->gid = proc_kgid; > + proc_set_user(apriv->proc_entry, proc_kuid, proc_kgid); > > /* Setup the StatsDelta */ > entry = proc_create_data("StatsDelta", S_IRUGO & proc_perm, > apriv->proc_entry, &proc_statsdelta_ops, dev); > if (!entry) > goto fail_stats_delta; > - entry->uid = proc_kuid; > - entry->gid = proc_kgid; > + proc_set_user(entry, proc_kuid, proc_kgid); > > /* Setup the Stats */ > entry = proc_create_data("Stats", S_IRUGO & proc_perm, > apriv->proc_entry, &proc_stats_ops, dev); > if (!entry) > goto fail_stats; > - entry->uid = proc_kuid; > - entry->gid = proc_kgid; > + proc_set_user(entry, proc_kuid, proc_kgid); > > /* Setup the Status */ > entry = proc_create_data("Status", S_IRUGO & proc_perm, > apriv->proc_entry, &proc_status_ops, dev); > if (!entry) > goto fail_status; > - entry->uid = proc_kuid; > - entry->gid = proc_kgid; > + proc_set_user(entry, proc_kuid, proc_kgid); > > /* Setup the Config */ > entry = proc_create_data("Config", proc_perm, > apriv->proc_entry, &proc_config_ops, dev); > if (!entry) > goto fail_config; > - entry->uid = proc_kuid; > - entry->gid = proc_kgid; > + proc_set_user(entry, proc_kuid, proc_kgid); > > /* Setup the SSID */ > entry = proc_create_data("SSID", proc_perm, > apriv->proc_entry, &proc_SSID_ops, dev); > if (!entry) > goto fail_ssid; > - entry->uid = proc_kuid; > - entry->gid = proc_kgid; > + proc_set_user(entry, proc_kuid, proc_kgid); > > /* Setup the APList */ > entry = proc_create_data("APList", proc_perm, > apriv->proc_entry, &proc_APList_ops, dev); > if (!entry) > goto fail_aplist; > - entry->uid = proc_kuid; > - entry->gid = proc_kgid; > + proc_set_user(entry, proc_kuid, proc_kgid); > > /* Setup the BSSList */ > entry = proc_create_data("BSSList", proc_perm, > apriv->proc_entry, &proc_BSSList_ops, dev); > if (!entry) > goto fail_bsslist; > - entry->uid = proc_kuid; > - entry->gid = proc_kgid; > + proc_set_user(entry, proc_kuid, proc_kgid); > > /* Setup the WepKey */ > entry = proc_create_data("WepKey", proc_perm, > apriv->proc_entry, &proc_wepkey_ops, dev); > if (!entry) > goto fail_wepkey; > - entry->uid = proc_kuid; > - entry->gid = proc_kgid; > - > + proc_set_user(entry, proc_kuid, proc_kgid); > return 0; > > fail_wepkey: > @@ -5695,10 +5685,8 @@ static int __init airo_init_module( void ) > > airo_entry = proc_mkdir_mode("driver/aironet", airo_perm, NULL); > > - if (airo_entry) { > - airo_entry->uid = proc_kuid; > - airo_entry->gid = proc_kgid; > - } > + if (airo_entry) > + proc_set_user(airo_entry, proc_kuid, proc_kgid); > > for (i = 0; i < 4 && io[i] && irq[i]; i++) { > airo_print_info("", "Trying to configure ISA adapter at irq=%d " > diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c > index 12e4fb5..7cde7c1 100644 > --- a/drivers/pci/proc.c > +++ b/drivers/pci/proc.c > @@ -419,7 +419,7 @@ int pci_proc_attach_device(struct pci_dev *dev) > &proc_bus_pci_operations, dev); > if (!e) > return -ENOMEM; > - e->size = dev->cfg_size; > + proc_set_size(e, dev->cfg_size); > dev->procent = e; > > return 0; > diff --git a/fs/proc/generic.c b/fs/proc/generic.c > index 1c07cad..5f6f6c3 100644 > --- a/fs/proc/generic.c > +++ b/fs/proc/generic.c > @@ -498,6 +498,19 @@ out: > return NULL; > } > EXPORT_SYMBOL(proc_create_data); > + > +void proc_set_size(struct proc_dir_entry *de, loff_t size) > +{ > + de->size = size; > +} > +EXPORT_SYMBOL(proc_set_size); > + > +void proc_set_user(struct proc_dir_entry *de, kuid_t uid, kgid_t gid) > +{ > + de->uid = uid; > + de->gid = gid; > +} > +EXPORT_SYMBOL(proc_set_user); > > static void free_proc_entry(struct proc_dir_entry *de) > { > diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h > index 805edac..28a4d7e 100644 > --- a/include/linux/proc_fs.h > +++ b/include/linux/proc_fs.h > @@ -130,6 +130,9 @@ static inline struct proc_dir_entry *proc_create(const char *name, umode_t mode, > extern struct proc_dir_entry *proc_net_mkdir(struct net *net, const char *name, > struct proc_dir_entry *parent); > > +extern void proc_set_size(struct proc_dir_entry *, loff_t); > +extern void proc_set_user(struct proc_dir_entry *, kuid_t, kgid_t); > + > extern struct file *proc_ns_fget(int fd); > extern bool proc_ns_inode(struct inode *inode); > > @@ -158,6 +161,8 @@ static inline struct proc_dir_entry *proc_mkdir(const char *name, > struct proc_dir_entry *parent) {return NULL;} > static inline struct proc_dir_entry *proc_mkdir_mode(const char *name, > umode_t mode, struct proc_dir_entry *parent) { return NULL; } > +static inline void proc_set_size(struct proc_dir_entry *de, loff_t size) {} > +static inline void proc_set_user(struct proc_dir_entry *de, kuid_t uid, kgid_t gid) {} > > struct tty_driver; > static inline void proc_tty_register_driver(struct tty_driver *driver) {}; > diff --git a/kernel/configs.c b/kernel/configs.c > index 42e8fa0..c18b1f1 100644 > --- a/kernel/configs.c > +++ b/kernel/configs.c > @@ -79,7 +79,7 @@ static int __init ikconfig_init(void) > if (!entry) > return -ENOMEM; > > - entry->size = kernel_config_data_size; > + proc_set_size(entry, kernel_config_data_size); > > return 0; > } > diff --git a/kernel/profile.c b/kernel/profile.c > index 524ce5e..0bf4007 100644 > --- a/kernel/profile.c > +++ b/kernel/profile.c > @@ -600,7 +600,7 @@ int __ref create_proc_profile(void) /* false positive from hotcpu_notifier */ > NULL, &proc_profile_operations); > if (!entry) > return 0; > - entry->size = (1+prof_len) * sizeof(atomic_t); > + proc_set_size(entry, (1 + prof_len) * sizeof(atomic_t)); > hotcpu_notifier(profile_cpu_callback, 0); > return 0; > } > diff --git a/net/netfilter/xt_recent.c b/net/netfilter/xt_recent.c > index 3db2d38..1e657cf 100644 > --- a/net/netfilter/xt_recent.c > +++ b/net/netfilter/xt_recent.c > @@ -401,8 +401,7 @@ static int recent_mt_check(const struct xt_mtchk_param *par, > ret = -ENOMEM; > goto out; > } > - pde->uid = uid; > - pde->gid = gid; > + proc_set_user(pde, uid, gid); > #endif > spin_lock_bh(&recent_lock); > list_add_tail(&t->list, &recent_net->tables); > diff --git a/sound/core/info.c b/sound/core/info.c > index 3aa8864..c7f41c3 100644 > --- a/sound/core/info.c > +++ b/sound/core/info.c > @@ -970,7 +970,7 @@ int snd_info_register(struct snd_info_entry * entry) > mutex_unlock(&info_mutex); > return -ENOMEM; > } > - p->size = entry->size; > + proc_set_size(p, entry->size); > } > entry->p = p; > if (entry->parent) > > -- > To unsubscribe from this list: send the line "unsubscribe linux-media" in > the body of a message to majordomo(a)vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html >

1 0

[alsa-devel] [PATCH] tinycompress: cplay: Correct a couple of small message typos
by Richard Fitzgerald 16 Apr '13

16 Apr '13

Change-Id: I2b25d006328f1a9458f232f77c61e509c9b54d3c Signed-off-by: Charles Keepax <ckeepax(a)opensource.wolfsonmicro.com> --- cplay.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cplay.c b/cplay.c index 60995a4..d9364f4 100644 --- a/cplay.c +++ b/cplay.c @@ -337,7 +337,7 @@ void play_samples(char *name, unsigned int card, unsigned int device, goto BUF_EXIT; } if (wrote != num_read) { - /* TODO: Buufer pointer needs to be set here */ + /* TODO: Buffer pointer needs to be set here */ fprintf(stderr, "We wrote %d, DSP accepted %d\n", num_read, wrote); } if (verbose) { @@ -348,7 +348,7 @@ void play_samples(char *name, unsigned int card, unsigned int device, } while (num_read > 0); if (verbose) - printf("%s: exit sucess\n", __func__); + printf("%s: exit success\n", __func__); /* issue drain if it supports */ compress_drain(compress); free(buffer); -- 1.7.2.5

2 1

[alsa-devel] [PATCH] ASoC: fsi: fixup sparse errors
by Kuninori Morimoto 16 Apr '13

16 Apr '13

This patch fixup below sparse errors ${LINUX}/sound/soc/sh/fsi.c:1459:9: \ error: incompatible types in conditional expression (different base types) ${LINUX}/sound/soc/sh/fsi.c:1634:25: \ error: incompatible types in conditional expression (different base types) ${LINUX}/sound/soc/sh/fsi.c:1639:17: \ error: incompatible types in conditional expression (different base types) ${LINUX}/sound/soc/sh/fsi.c:2093:9: \ error: incompatible types in conditional expression (different base types) ${LINUX}/sound/soc/sh/fsi.c:2105:9: \ error: incompatible types in conditional expression (different base types) Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/sh/fsi.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c index c724026a..7bc767b 100644 --- a/sound/soc/sh/fsi.c +++ b/sound/soc/sh/fsi.c @@ -276,7 +276,7 @@ struct fsi_stream_handler { int (*probe)(struct fsi_priv *fsi, struct fsi_stream *io, struct device *dev); int (*transfer)(struct fsi_priv *fsi, struct fsi_stream *io); int (*remove)(struct fsi_priv *fsi, struct fsi_stream *io); - void (*start_stop)(struct fsi_priv *fsi, struct fsi_stream *io, + int (*start_stop)(struct fsi_priv *fsi, struct fsi_stream *io, int enable); }; #define fsi_stream_handler_call(io, func, args...) \ @@ -1189,7 +1189,7 @@ static int fsi_pio_push(struct fsi_priv *fsi, struct fsi_stream *io) samples); } -static void fsi_pio_start_stop(struct fsi_priv *fsi, struct fsi_stream *io, +static int fsi_pio_start_stop(struct fsi_priv *fsi, struct fsi_stream *io, int enable) { struct fsi_master *master = fsi_get_master(fsi); @@ -1202,6 +1202,8 @@ static void fsi_pio_start_stop(struct fsi_priv *fsi, struct fsi_stream *io, if (fsi_is_clk_master(fsi)) fsi_master_mask_set(master, CLK_RST, clk, (enable) ? clk : 0); + + return 0; } static int fsi_pio_push_init(struct fsi_priv *fsi, struct fsi_stream *io) @@ -1410,7 +1412,7 @@ static int fsi_dma_transfer(struct fsi_priv *fsi, struct fsi_stream *io) return 0; } -static void fsi_dma_push_start_stop(struct fsi_priv *fsi, struct fsi_stream *io, +static int fsi_dma_push_start_stop(struct fsi_priv *fsi, struct fsi_stream *io, int start) { struct fsi_master *master = fsi_get_master(fsi); @@ -1423,6 +1425,8 @@ static void fsi_dma_push_start_stop(struct fsi_priv *fsi, struct fsi_stream *io, if (fsi_is_clk_master(fsi)) fsi_master_mask_set(master, CLK_RST, clk, (enable) ? clk : 0); + + return 0; } static int fsi_dma_probe(struct fsi_priv *fsi, struct fsi_stream *io, struct device *dev) -- 1.7.9.5

1 0

[alsa-devel] about snd_pcm_writei() parameter
by Zhang wei 16 Apr '13

16 Apr '13

hi all. Is there have some limitation on the parameter size of the interface: snd_pcm_sframes_t snd_pcm_readi(snd_pcm_t *pcm, void *buffer, snd_pcm_uframes_t size)? should be the SIZE as any value ? For example, set the size < period_size, ok? does the parameter depend on the period_size? Thanks a lot. ---- BR zw

1 0

Re: [alsa-devel] [PATCH 01/17] ASoC: dmaengine-pcm: Make requesting the DMA channel at PCM open optional
by Lars-Peter Clausen 16 Apr '13

16 Apr '13

On 04/16/2013 01:28 AM, Ryan Mallon wrote: > On 16/04/13 03:19, Lars-Peter Clausen wrote: >> Refactor the dmaengine PCM library to allow the DMA channel to be requested >> before opening a PCM substream. snd_dmaengine_pcm_open() now expects a DMA >> channel instead of a filter function and filter parameter as its parameters. >> snd_dmaengine_pcm_close() is updated to not release the DMA channel. This allows >> a dmaengine based PCM driver to request its channels before the substream is >> opened. >> >> The patch also introduces two new functions, snd_dmaengine_pcm_open_request_chan() >> and snd_dmaengine_pcm_close_release_chan(), which have the same signature and >> behaviour of the old snd_dmaengine_pcm_{open,close}() and internally use the new >> variants of these functions. All users of snd_dmaengine_pcm_{open,close}() are >> updated to use snd_dmaengine_pcm_open_request_chan() and >> snd_dmaengine_pcm_close_release_chan(). >> >> Signed-off-by: Lars-Peter Clausen <lars(a)metafoo.de> > > <snip> > >> --- a/sound/soc/cirrus/ep93xx-pcm.c >> +++ b/sound/soc/cirrus/ep93xx-pcm.c >> @@ -69,7 +69,8 @@ static int ep93xx_pcm_open(struct snd_pcm_substream *substream) >> >> snd_soc_set_runtime_hwparams(substream, &ep93xx_pcm_hardware); >> >> - return snd_dmaengine_pcm_open(substream, ep93xx_pcm_dma_filter, >> + return snd_dmaengine_pcm_open_request_chan(substream, >> + ep93xx_pcm_dma_filter, >> snd_soc_dai_get_dma_data(rtd->cpu_dai, substream)); > > ep93xx_pcm_dma_filter is now unused and can be removed? It's still used in the same way as before. - Lars

1 0

Re: [alsa-devel] [PATCH 16/17] ASoC: ep93xx: Use generic dmaengine PCM
by Lars-Peter Clausen 16 Apr '13

16 Apr '13

On 04/16/2013 01:48 AM, Ryan Mallon wrote: > On 16/04/13 03:20, Lars-Peter Clausen wrote: >> Use the generic dmaengine PCM driver instead of a custom implementation. >> >> Signed-off-by: Lars-Peter Clausen <lars(a)metafoo.de> >> --- >> sound/soc/cirrus/Kconfig | 2 +- >> sound/soc/cirrus/ep93xx-i2s.c | 4 +- >> sound/soc/cirrus/ep93xx-pcm.c | 138 ++++-------------------------------------- >> 3 files changed, 14 insertions(+), 130 deletions(-) >> >> diff --git a/sound/soc/cirrus/Kconfig b/sound/soc/cirrus/Kconfig >> index 88143db..2c20f01 100644 >> --- a/sound/soc/cirrus/Kconfig >> +++ b/sound/soc/cirrus/Kconfig >> @@ -1,7 +1,7 @@ >> config SND_EP93XX_SOC >> tristate "SoC Audio support for the Cirrus Logic EP93xx series" >> depends on ARCH_EP93XX && SND_SOC >> - select SND_SOC_DMAENGINE_PCM >> + select SND_SOC_GENERIC_DMAENGINE_PCM >> help >> Say Y or M if you want to add support for codecs attached to >> the EP93xx I2S or AC97 interfaces. >> diff --git a/sound/soc/cirrus/ep93xx-i2s.c b/sound/soc/cirrus/ep93xx-i2s.c >> index 453a89c..ef731e6 100644 >> --- a/sound/soc/cirrus/ep93xx-i2s.c >> +++ b/sound/soc/cirrus/ep93xx-i2s.c >> @@ -140,8 +140,8 @@ static void ep93xx_i2s_disable(struct ep93xx_i2s_info *info, int stream) >> >> static int ep93xx_i2s_dai_probe(struct snd_soc_dai *dai) >> { >> - dai->playback_dma_data = ep93xx_i2s_dma_data[SNDRV_PCM_STREAM_PLAYBACK]; >> - dai->capute_dma_data = ep93xx_i2s_dma_data[SNDRV_PCM_STREAM_CAPTURE] >> + dai->playback_dma_data = &ep93xx_i2s_dma_data[SNDRV_PCM_STREAM_PLAYBACK]; >> + dai->capture_dma_data = &ep93xx_i2s_dma_data[SNDRV_PCM_STREAM_CAPTURE]; > > Why did this change? I can't see a change to ep93xx_i2s_dma_data. Was > this just incorrect in the previous patch? All patches in a series > should be buildable/runnable to assist things like git bisect. > Yes, that part belongs to the previous patch and only ended up here by accident. >> >> return 0; >> } >> diff --git a/sound/soc/cirrus/ep93xx-pcm.c b/sound/soc/cirrus/ep93xx-pcm.c >> index 4880326..0e9f56e 100644 >> --- a/sound/soc/cirrus/ep93xx-pcm.c >> +++ b/sound/soc/cirrus/ep93xx-pcm.c >> @@ -14,20 +14,14 @@ >> >> #include <linux/module.h> >> #include <linux/init.h> >> -#include <linux/device.h> >> -#include <linux/slab.h> >> +#include <linux/platform_device.h> >> #include <linux/dmaengine.h> >> -#include <linux/dma-mapping.h> >> >> -#include <sound/core.h> >> #include <sound/pcm.h> >> -#include <sound/pcm_params.h> >> #include <sound/soc.h> >> #include <sound/dmaengine_pcm.h> >> >> #include <linux/platform_data/dma-ep93xx.h> >> -#include <mach/hardware.h> >> -#include <mach/ep93xx-regs.h> > > Awesome. It looks like this header can also be removed from ep93xx-i2s.c > also, which gets us a step closer to making this header private to the > ep93xx soc code in arch/arm. > > ~Ryan >

1 0

[alsa-devel] [PATCH] ALSA: hda - Add codec delay to the capture time stamp.
by Dylan Reid 16 Apr '13

16 Apr '13

For capture, the delay through the codec contributes to the time stamp of the sample recorded at the A to D. Rename the codec time stamp function appropriately. Signed-off-by: Dylan Reid <dgreid(a)chromium.org> --- sound/pci/hda/hda_intel.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 63734b5..7b213d5 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1889,7 +1889,7 @@ static void azx_timecounter_init(struct snd_pcm_substream *substream, tc->cycle_last = last; } -static u64 azx_subtract_codec_delay(struct snd_pcm_substream *substream, +static u64 azx_adjust_codec_delay(struct snd_pcm_substream *substream, u64 nsec) { struct azx_pcm *apcm = snd_pcm_substream_chip(substream); @@ -1903,6 +1903,9 @@ static u64 azx_subtract_codec_delay(struct snd_pcm_substream *substream, codec_nsecs = div_u64(codec_frames * 1000000000LL, substream->runtime->rate); + if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) + return nsec + codec_nsecs; + return (nsec > codec_nsecs) ? nsec - codec_nsecs : 0; } @@ -1914,7 +1917,7 @@ static int azx_get_wallclock_tstamp(struct snd_pcm_substream *substream, nsec = timecounter_read(&azx_dev->azx_tc); nsec = div_u64(nsec, 3); /* can be optimized */ - nsec = azx_subtract_codec_delay(substream, nsec); + nsec = azx_adjust_codec_delay(substream, nsec); *ts = ns_to_timespec(nsec); -- 1.8.1.3.605.g02339dd

2 1

[alsa-devel] ASoC updates for v3.10
by Mark Brown 15 Apr '13

15 Apr '13

The following changes since commit b02e48f2f8755e51fe8ce246988a29bd96f6b85e: MAINTAINERS: Update e-mail address (2013-04-12 11:53:41 +0100) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v3.10 for you to fetch changes up to 5cbad7d39ad229c68a724e5e139fd845b93766b2: Merge remote-tracking branch 'asoc/topic/wm8994' into asoc-next (2013-04-12 13:57:31 +0100) ---------------------------------------------------------------- ASoC: Updates for v3.10 A bunch of changes here, the most interesting one subsystem wise being Morimoto-san's work to create snd_soc_component which doesn't do much for now but will be pretty important going forwards: - Add a new component object type which will form the basis of moving to a more generic handling of SoC and off-SoC components, contributed by Kuninori Morimoto. - A fairly large set of cleanups for the dmaengine integration from Lars-Peter Clausen, starting to move towards being able to have a generic driver based on the library. - Performance optimisations to DAPM from Ryo Tsutsui. - Support for mixer control sharing in DAPM from Stephen Warren. - Multiplatform ARM cleanups from Arnd Bergmann. - New CODEC drivers for AK5385 and TAS5086 from Daniel Mack. ---------------------------------------------------------------- Alban Bedel (1): ASoC: wm8903: Add the DAC boost control Alexandru Gheorghiu (1): ASoC: core: Use PTR_RET function Andrey Smirnov (2): ASoC: si476x: Convert SI476X codec to use regmap ASoC: si476x: Cosmetic changes to SI476X codec driver Arnd Bergmann (4): ASoC: samsung: use irq resource for idma ASoC: samsung: fix module_device_table ASoC: samsung: export idma_reg_addr_init ASoC: samsung: move plat/ headers to local directory Charles Keepax (12): ASoC: arizona: Move selection of FLL REFCLK into init ASoC: arizona: Tidy up SYNCCLK selection and cache values ASoC: arizona: Factor out check for enabled FLL ASoC: arizona: Factor out FLL disable ASoC: arizona: Factor out FLL enable ASoC: arizona: Improve suppression of noop FLL updates ASoC: arizona: Add support for directly setting the FLL REFCLK ASoC: arizona: Add convience define for clearing SYNCCLK ASoC: arizona: Don't enable FLL on REFCLK configuration ASoC: wm5102: Correctly use SOC_VALUE_ENUM for ISRC FSL controls ASoC: wm0010: Constify usage of firmware filenames ASoC: wm0010: Report filename when we fail to load firmware Dan Carpenter (1): ASoC: tas5086: signedness bug in tas5086_hw_params() Daniel Mack (7): ASoC: ak4104: convert to direct regmap API usage ASoC: ak4104: correct tranceiver enable handling ASoC: Add codec driver for AK5386 ALSA: ASoC: add codec driver for TI TAS5086 ASoC: davinci-mcasp: clean up davinci_hw_common_param() ASoC: cs4271: convert to direct regmap API usage ASoC: cs4271: switch to mute_stream Dylan Reid (1): ASoC: max98088: Add TLV data for volume controls. Fabio Estevam (2): ASoC: fsl: imx-audmux: Use devm_clk_get() ASoC: fsl: imx-pcm-fiq: Use 'unsigned int' for period Heiko Stübner (1): ASoC: samsung: fix neo1973-wm8753 compilation Jeeja KP (1): ASoC: compress - add support for metadata apis Kuninori Morimoto (61): ASoC: core: tidyup snd_soc_register_codec() fail case ASoC: core: use snd_soc_register_dais() on codec ASoC: core: remove codec from list if registration failed ASoC: fsi: remove unused irq ASoC: add snd_soc_register_component() ASoC: add .name for snd_soc_component_driver ASoC: fsi: use snd_soc_register_component() instead of snd_soc_register_dais() ASoC: pxa2xx-ac97: move EXPORT_SYMBOL_GPL() next to definition ASoC: snd_soc_register_component() uses properly snd_soc_register_dai[s]() ASoC: switch over to use snd_soc_register_component() on davinci i2s ASoC: switch over to use snd_soc_register_component() on davinci vcif ASoC: switch over to use snd_soc_register_component() on davinci mcasp ASoC: switch over to use snd_soc_register_component() on dw i2s ASoC: switch over to use snd_soc_register_component() on mpc5200 ac97 ASoC: switch over to use snd_soc_register_component() on atmel ssc ASoC: switch over to use snd_soc_register_component() on au1x i2sc ASoC: switch over to use snd_soc_register_component() on au1x psc-ac97 ASoC: switch over to use snd_soc_register_component() on au1x psc-i2s ASoC: switch over to use snd_soc_register_component() on au1x ac97c ASoC: switch over to use snd_soc_register_component() on bf6xx i2s ASoC: switch over to use snd_soc_register_component() on bf5xx ac97 ASoC: switch over to use snd_soc_register_component() on bf5xx i2s ASoC: switch over to use snd_soc_register_component() on bf5xx tdm ASoC: switch over to use snd_soc_register_component() on ep93xx ac97 ASoC: switch over to use snd_soc_register_component() on ep93xx i2s ASoC: switch over to use snd_soc_register_component() on mpc5200 i2s ASoC: switch over to use snd_soc_register_component() on fsl ssi ASoC: switch over to use snd_soc_register_component() on imx ssi ASoC: switch over to use snd_soc_register_component() on jz4740 i2s ASoC: switch over to use snd_soc_register_component() on kirkwood i2s ASoC: switch over to use snd_soc_register_component() on sst ASoC: switch over to use snd_soc_register_component() on mxs saif ASoC: switch over to use snd_soc_register_component() on nuc900 ac97 ASoC: switch over to use snd_soc_register_component() on omap mcbsp ASoC: switch over to use snd_soc_register_component() on omap mcpdm ASoC: switch over to use snd_soc_register_component() on omap dmic ASoC: switch over to use snd_soc_register_component() on omap hdmi ASoC: switch over to use snd_soc_register_component() on pxa ssp ASoC: switch over to use snd_soc_register_component() on pxa2xx ac97 ASoC: switch over to use snd_soc_register_component() on pxa2xx i2s ASoC: switch over to use snd_soc_register_component() on mmp sspa ASoC: switch over to use snd_soc_register_component() on s6000 i2s ASoC: switch over to use snd_soc_register_component() on s3c24xx i2s ASoC: switch over to use snd_soc_register_component() on s3c i2s ASoC: switch over to use snd_soc_register_component() on s3c ac97 ASoC: switch over to use snd_soc_register_component() on samsung spdif ASoC: switch over to use snd_soc_register_component() on samsung i2s ASoC: switch over to use snd_soc_register_component() on samsung pcm ASoC: switch over to use snd_soc_register_component() on goni_wm8994 ASoC: switch over to use snd_soc_register_component() on sh4 ssi ASoC: switch over to use snd_soc_register_component() on sh4 hac ASoC: switch over to use snd_soc_register_component() on spear spdif out ASoC: switch over to use snd_soc_register_component() on spear spdif in ASoC: switch over to use snd_soc_register_component() on tegra30 i2s ASoC: switch over to use snd_soc_register_component() on tegra20 spdif ASoC: switch over to use snd_soc_register_component() on tegra20 ac97 ASoC: switch over to use snd_soc_register_component() on tegra20 i2s ASoC: switch over to use snd_soc_register_component() on txx9aclc ac97 ASoC: switch over to use snd_soc_register_component() on ux500 msp ASoC: snd_soc_[un]register_dai[s]() become non global function ASoC: switch over to use snd_soc_register_component() on sh4 siu Lars-Peter Clausen (28): ASoC: core: Drop unused "dapm" field form soc_enum struct ASoC: core: Remove unused "n_widgets" field from snd_soc_dapm struct ASoC: spear_pcm: Staticize non-exported structs ASoC: omap: Call omap_mcbsp_set_threshold() from mcbsp hw_params ASoC: ux500_pcm: Remove duplicated SNDRV_PCM_HW_PARAM_PERIODS constraint ASoC: spear_pcm: No need to wrap snd_dmaengine_pcm_close() ASoC: omap-pcm: No need to wrap snd_dmaengine_pcm_close() ASoC: tegra_pcm: No need to wrap snd_dmaengine_pcm_close() ASoC: ux500_pcm: No need to wrap snd_dmaengine_pcm_close() ASoC: atmel-pcm-dma: No need to wrap snd_dmaengine_pcm_close() ASoC: ux500_pcm: No need to use snd_dmaengine_pcm_set_data() ASoC: speaer_pcm: No need to use snd_dmaengine_pcm_set_data() ASoC: atmel-pcm-dma: Do not use snd_dmaengine_pcm_{set,get}_data() ASoC: ep93xx: Use ep93xx_dma_params instead of ep93xx_pcm_dma_params ASoC: mmp-pcm: Allocate dma filter parameters on the stack ASoC: imx-pcm: Embed the imx_dma_data struct in the dma_params struct ASoC: mxs: Embed the mxs_dma_data struct in the mxs_pcm_dma_params struct ASoC: dmaengine-pcm: Remove snd_dmaengine_pcm_{set,get}_data ASoC: Constify the 'driver' field of snd_soc_platform ASoC: Constify the 'ops' field of snd_soc_platform_driver ASoC: Constify the 'compr_ops' field of snd_soc_platform_driver ASoC: dmaengine_pcm: Setup device_fc in snd_hwparams_to_dma_slave_config ASoC: dmaengine-pcm: Add a common DAI DMA data struct ASoC: omap: Use common DAI DMA data ASoC: tegra: Use common DAI DMA data struct ASoC: fsl: Use common DAI DMA data struct ASoC: ep93xx_pcm: Fix compile error ASoC: ux500_pcm: Use the same snd_pcm_hardware for playback and capture Mark Brown (72): ASoC: arizona: Only allow input volume updates when inputs are enabled ASoC: wm8960: Add input boost volume control ASoC: omap: Check regulator enable for DAC on Pandora ASoC: arizona: If we only have a clock to synchronise with make it REFCLK mfd: arizona: Define additional FLL control registers mfd: wm5102: Map in additional FLL control registers ASoC: arizona: Increase FLL synchroniser bandwidth for high frequencies ASoC: arizona: Optimise FLL loop gains ASoC: arizona: Ensure synchroniser is disabled when not needed ASoC: arizona: Suppress reference calculations when setting REFCLK to 0 Merge tag 'v3.9-rc2' into asoc-core ASoC: arizona: Provide defines for the clock rates ASoC: wm_adsp: Handle old .bin files ASoC: arizona: Ensure we clock two channels for I2S mode ASoC: wm8994: Support constraining the maximum number of channels clocked mfd: wm5102: Add additional speaker control registers ASoC: arizona: Factor out speaker widgets from CODEC drivers ASoC: arizona: Log thermal events ASoC: arizona: Suppress speaker enable if thermal shutdown is flagged ASoC: arizona: Basic support for ISRC rate selection ASoC: wm8994: Restore AIFnCLK after reducing it for low clock rates extcon: arizona: Factor out magic application ASoC: arizona: Fix interaction between headphone outputs and identification extcon: arizona: Fix interaction between headphone outputs and identification Merge tag 'arizona-extcon-asoc' of git://git.kernel.org/.../broonie/misc into asoc-arizona ASoC: arizona: Add delay after powering up line level outputs Merge branch 'topic/pxa' of git://git.kernel.org/.../broonie/sound into asoc-component ASoC: wm5102: Implement OSR support ASoC: wm2000: Expose some more registers for diagnostics ASoC: wm_adsp: Provide defines for firmwares ASoC: wm_adsp: Split ADSP1 and ADSP2 firmware controls Merge branch 'topic/omap' of git://git.kernel.org/.../broonie/sound into HEAD Merge branch 'fix/samsung' of git://git.kernel.org/.../broonie/sound into asoc-samsung ASoC: core: Merge Samsung fixes to avoid trivial context conflict ASoC: wm8994: Remove duplicate revision cache ASoC: wm_adsp: Add support for firmware wide coefficient blocks Merge remote-tracking branch 'asoc/fix/compress' into asoc-next Merge remote-tracking branch 'asoc/fix/core' into asoc-next Merge remote-tracking branch 'asoc/fix/samsung' into asoc-next Merge remote-tracking branch 'asoc/fix/tegra' into asoc-next Merge remote-tracking branch 'asoc/fix/wm8903' into asoc-next Merge remote-tracking branch 'asoc/topic/adau1373' into asoc-next Merge remote-tracking branch 'asoc/topic/adsp' into asoc-next Merge remote-tracking branch 'asoc/topic/ak4104' into asoc-next Merge remote-tracking branch 'asoc/topic/ak5386' into asoc-next Merge remote-tracking branch 'asoc/topic/arizona' into asoc-next Merge remote-tracking branch 'asoc/topic/atmel' into asoc-next Merge remote-tracking branch 'asoc/topic/component' into asoc-next Merge remote-tracking branch 'asoc/topic/compress' into asoc-next Merge remote-tracking branch 'asoc/topic/core' into asoc-next Merge remote-tracking branch 'asoc/topic/cs4271' into asoc-next Merge remote-tracking branch 'asoc/topic/cs42l73' into asoc-next Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next Merge remote-tracking branch 'asoc/topic/davinci' into asoc-next Merge remote-tracking branch 'asoc/topic/dma' into asoc-next Merge remote-tracking branch 'asoc/topic/fsi' into asoc-next Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next Merge remote-tracking branch 'asoc/topic/maintainers' into asoc-next Merge remote-tracking branch 'asoc/topic/max98088' into asoc-next Merge remote-tracking branch 'asoc/topic/max98090' into asoc-next Merge remote-tracking branch 'asoc/topic/samsung' into asoc-next Merge remote-tracking branch 'asoc/topic/si476x' into asoc-next Merge remote-tracking branch 'asoc/topic/spear' into asoc-next Merge remote-tracking branch 'asoc/topic/tas5086' into asoc-next Merge remote-tracking branch 'asoc/topic/tegra' into asoc-next Merge remote-tracking branch 'asoc/topic/ux500' into asoc-next Merge remote-tracking branch 'asoc/topic/wm-hubs' into asoc-next Merge remote-tracking branch 'asoc/topic/wm0010' into asoc-next Merge remote-tracking branch 'asoc/topic/wm2000' into asoc-next Merge remote-tracking branch 'asoc/topic/wm8903' into asoc-next Merge remote-tracking branch 'asoc/topic/wm8960' into asoc-next Merge remote-tracking branch 'asoc/topic/wm8994' into asoc-next Michal Bachraty (1): ASoC: davinci-mcasp: Add support for multichannel playback Paul Bolle (3): ASoC: samsung: remove last traces of neo1973-gta01 ASoC: codecs: remove hidden prompt ASoC: Ux500: remove test for undefined Kconfig macro Paul Handrigan (1): ASoC: cs42l73: If Internal MCLK is >= 6.4MHz, then set SCLK to 64*Fs. Peter Ujfalusi (4): ASoC: omap3pandora: Fix compilation error ASoC: omap-mcpdm: Collect link direction configuration under a struct ASoC: omap-mcpdm: Fix for full duplex audio use case ASoC: omap-mcpdm: Remove leftower define for IO address Ryo Tsutsui (2): ASoC: dapm: Remove redundant clear_walk() for supply widgets ASoC: dapm: Only clear paths we've walked Sachin Kamat (5): ASoC: max98090: Remove unneeded version.h header include ASoC: max98090: Convert to devm_regmap_init_i2c() ASoC: max98090: Make struct dev_pm_ops const ASoC: max98090: Fix checkpatch errors related to spacing ASoC: max98090: Remove unnecessary braces Sascha Hauer (1): ASoC: imx-ssi: Fix AC97 rates Sebastien Guiriec (2): ASoC: omap-mcpdm: Clean up with devm_* function ASoC: omap-dmic: Clean up with devm_request_and_ioremap Shawn Guo (1): ASoC: imx-sgtl5000: use of_node to match cpu dai Silviu-Mihai Popescu (1): ASoC: omap: convert to devm_ioremap_resource() Stephen Warren (10): ASoC: tegra: assume CONFIG_OF in tegra_asoc_utils_init ASoC: tegra_wm8753: minor cleanup ASoC: tegra_wm9712: assume CONFIG_OF ASoC: tegra_alc5632: assume CONFIG_OF, and other cleanup ASoC: tegra trimslice: assume CONFIG_OF, and other cleanup ASoC: tegra_wm8903: assume CONFIG_OF, remove platform data ASoC: tegra: add Tegra114 support to the AHUB driver ASoC: tegra: add Tegra114 support to tegra_asoc_utils.c ASoC: export snd_soc_register_component ASoC: dapm: Implement mixer control sharing Tim Gardner (2): ASoC: adau1373: adau1373_hw_params: Silence overflow warning ASoC: wm_hubs: Silence reg_r and reg_l 'may be used uninitialized' warnings Vinod Koul (1): ASoC: mid-x86 - add support for meaadata apis Wei Yongjun (2): ASoC: tas5086: use module_i2c_driver to simplify the code ASoC: arizona: remove duplicated include from arizona.c Yegor Yefremov (2): ASoC: davinci-mcasp: don't configure AFSX direction in DIT mode ASoC: davinci-mcasp: don't overwrite DIT settings Zoltan Puskas (1): ASoC: atmel: Add slave mode support to SSC in DSP Mode A Documentation/devicetree/bindings/sound/ak5386.txt | 19 + .../bindings/sound/nvidia,tegra30-ahub.txt | 26 +- .../devicetree/bindings/sound/ti,tas5086.txt | 32 ++ arch/arm/mach-s3c24xx/dma-s3c2410.c | 2 - arch/arm/mach-s3c24xx/dma-s3c2412.c | 2 - arch/arm/mach-s3c24xx/dma-s3c2440.c | 2 - arch/arm/mach-s3c24xx/dma-s3c2443.c | 2 - arch/arm/plat-samsung/devs.c | 6 + drivers/extcon/extcon-arizona.c | 107 ++-- drivers/mfd/wm5102-tables.c | 10 + include/linux/mfd/arizona/core.h | 3 + include/linux/mfd/arizona/registers.h | 42 ++ include/linux/mfd/wm8994/pdata.h | 8 + include/sound/dmaengine_pcm.h | 27 +- include/sound/soc-dai.h | 8 - include/sound/soc-dapm.h | 1 - include/sound/soc.h | 29 +- include/sound/tas5086.h | 7 + include/sound/tegra_wm8903.h | 26 - sound/soc/atmel/atmel-pcm-dma.c | 25 +- sound/soc/atmel/atmel_ssc_dai.c | 54 +- sound/soc/au1x/ac97c.c | 9 +- sound/soc/au1x/i2sc.c | 9 +- sound/soc/au1x/psc-ac97.c | 9 +- sound/soc/au1x/psc-i2s.c | 9 +- sound/soc/blackfin/bf5xx-ac97.c | 9 +- sound/soc/blackfin/bf5xx-i2s.c | 9 +- sound/soc/blackfin/bf5xx-tdm.c | 9 +- sound/soc/blackfin/bf6xx-i2s.c | 9 +- sound/soc/cirrus/edb93xx.c | 1 - sound/soc/cirrus/ep93xx-ac97.c | 18 +- sound/soc/cirrus/ep93xx-i2s.c | 25 +- sound/soc/cirrus/ep93xx-pcm.c | 37 +- sound/soc/cirrus/ep93xx-pcm.h | 20 - sound/soc/cirrus/simone.c | 2 - sound/soc/cirrus/snappercl15.c | 1 - sound/soc/codecs/Kconfig | 10 +- sound/soc/codecs/Makefile | 4 + sound/soc/codecs/adau1373.c | 5 +- sound/soc/codecs/ak4104.c | 55 +- sound/soc/codecs/ak5386.c | 152 +++++ sound/soc/codecs/arizona.c | 530 +++++++++++++++--- sound/soc/codecs/arizona.h | 34 +- sound/soc/codecs/cs4271.c | 166 +++--- sound/soc/codecs/cs42l73.c | 6 +- sound/soc/codecs/max98088.c | 30 +- sound/soc/codecs/max98090.c | 45 +- sound/soc/codecs/si476x.c | 47 +- sound/soc/codecs/tas5086.c | 591 ++++++++++++++++++++ sound/soc/codecs/wm0010.c | 6 +- sound/soc/codecs/wm2000.c | 4 +- sound/soc/codecs/wm2000.h | 2 + sound/soc/codecs/wm2200.c | 2 +- sound/soc/codecs/wm5102.c | 131 ++--- sound/soc/codecs/wm5102.h | 6 +- sound/soc/codecs/wm5110.c | 54 +- sound/soc/codecs/wm5110.h | 6 +- sound/soc/codecs/wm8903.c | 6 + sound/soc/codecs/wm8960.c | 10 + sound/soc/codecs/wm8994.c | 68 ++- sound/soc/codecs/wm8994.h | 3 +- sound/soc/codecs/wm_adsp.c | 124 +++- sound/soc/codecs/wm_adsp.h | 5 +- sound/soc/codecs/wm_hubs.c | 9 +- sound/soc/davinci/davinci-i2s.c | 15 +- sound/soc/davinci/davinci-mcasp.c | 97 +++- sound/soc/davinci/davinci-pcm.c | 16 +- sound/soc/davinci/davinci-pcm.h | 1 + sound/soc/davinci/davinci-vcif.c | 11 +- sound/soc/dwc/designware_i2s.c | 9 +- sound/soc/fsl/fsl_ssi.c | 45 +- sound/soc/fsl/imx-audmux.c | 3 +- sound/soc/fsl/imx-pcm-dma.c | 58 +- sound/soc/fsl/imx-pcm-fiq.c | 6 +- sound/soc/fsl/imx-pcm.h | 19 +- sound/soc/fsl/imx-sgtl5000.c | 2 +- sound/soc/fsl/imx-ssi.c | 42 +- sound/soc/fsl/imx-ssi.h | 7 +- sound/soc/fsl/mpc5200_psc_ac97.c | 8 +- sound/soc/fsl/mpc5200_psc_i2s.c | 9 +- sound/soc/jz4740/jz4740-i2s.c | 9 +- sound/soc/kirkwood/kirkwood-i2s.c | 11 +- sound/soc/mid-x86/sst_platform.c | 20 +- sound/soc/mid-x86/sst_platform.h | 2 + sound/soc/mxs/mxs-pcm.c | 43 +- sound/soc/mxs/mxs-pcm.h | 4 +- sound/soc/mxs/mxs-saif.c | 17 +- sound/soc/nuc900/nuc900-ac97.c | 9 +- sound/soc/omap/am3517evm.c | 1 - sound/soc/omap/ams-delta.c | 1 - sound/soc/omap/mcbsp.c | 14 +- sound/soc/omap/mcbsp.h | 7 +- sound/soc/omap/n810.c | 1 - sound/soc/omap/omap-abe-twl6040.c | 1 - sound/soc/omap/omap-dmic.c | 47 +- sound/soc/omap/omap-hdmi.c | 33 +- sound/soc/omap/omap-mcbsp.c | 27 +- sound/soc/omap/omap-mcpdm.c | 118 ++-- sound/soc/omap/omap-pcm.c | 83 +-- sound/soc/omap/omap-pcm.h | 40 -- sound/soc/omap/omap-twl4030.c | 1 - sound/soc/omap/omap3pandora.c | 9 +- sound/soc/omap/osk5912.c | 1 - sound/soc/omap/rx51.c | 1 - sound/soc/pxa/mmp-pcm.c | 33 +- sound/soc/pxa/mmp-sspa.c | 9 +- sound/soc/pxa/pxa-ssp.c | 9 +- sound/soc/pxa/pxa2xx-ac97.c | 11 +- sound/soc/pxa/pxa2xx-i2s.c | 9 +- sound/soc/s6000/s6000-i2s.c | 9 +- sound/soc/samsung/Kconfig | 5 +- sound/soc/samsung/ac97.c | 14 +- sound/soc/samsung/goni_wm8994.c | 11 +- sound/soc/samsung/h1940_uda1380.c | 2 +- sound/soc/samsung/i2s.c | 33 +- sound/soc/samsung/idma.c | 11 +- sound/soc/samsung/neo1973_wm8753.c | 3 +- sound/soc/samsung/pcm.c | 11 +- .../include/plat => sound/soc/samsung}/regs-ac97.h | 0 .../include/plat => sound/soc/samsung}/regs-iis.h | 0 sound/soc/samsung/rx1950_uda1380.c | 2 +- sound/soc/samsung/s3c-i2s-v2.c | 9 +- sound/soc/samsung/s3c-i2s-v2.h | 7 +- sound/soc/samsung/s3c2412-i2s.c | 12 +- sound/soc/samsung/s3c24xx-i2s.c | 13 +- sound/soc/samsung/s3c24xx_uda134x.c | 2 +- sound/soc/samsung/spdif.c | 11 +- sound/soc/sh/fsi.c | 14 +- sound/soc/sh/hac.c | 10 +- sound/soc/sh/migor.c | 2 +- sound/soc/sh/siu_dai.c | 11 +- sound/soc/sh/ssi.c | 10 +- sound/soc/soc-compress.c | 41 +- sound/soc/soc-core.c | 130 ++++- sound/soc/soc-dapm.c | 320 ++++++----- sound/soc/soc-dmaengine-pcm.c | 68 ++- sound/soc/soc-io.c | 5 +- sound/soc/spear/spdif_in.c | 9 +- sound/soc/spear/spdif_out.c | 9 +- sound/soc/spear/spear_pcm.c | 22 +- sound/soc/tegra/tegra20_ac97.c | 28 +- sound/soc/tegra/tegra20_ac97.h | 4 +- sound/soc/tegra/tegra20_i2s.c | 28 +- sound/soc/tegra/tegra20_i2s.h | 4 +- sound/soc/tegra/tegra20_spdif.c | 22 +- sound/soc/tegra/tegra20_spdif.h | 4 +- sound/soc/tegra/tegra30_ahub.c | 72 ++- sound/soc/tegra/tegra30_ahub.h | 24 +- sound/soc/tegra/tegra30_i2s.c | 28 +- sound/soc/tegra/tegra30_i2s.h | 4 +- sound/soc/tegra/tegra_alc5632.c | 15 +- sound/soc/tegra/tegra_asoc_utils.c | 34 +- sound/soc/tegra/tegra_asoc_utils.h | 1 + sound/soc/tegra/tegra_pcm.c | 48 +- sound/soc/tegra/tegra_pcm.h | 7 - sound/soc/tegra/tegra_wm8753.c | 15 +- sound/soc/tegra/tegra_wm8903.c | 179 +++--- sound/soc/tegra/tegra_wm9712.c | 7 +- sound/soc/tegra/trimslice.c | 56 +- sound/soc/txx9/txx9aclc-ac97.c | 9 +- sound/soc/ux500/ux500_msp_dai.c | 13 +- sound/soc/ux500/ux500_msp_dai.h | 5 - sound/soc/ux500/ux500_pcm.c | 76 +-- sound/soc/ux500/ux500_pcm.h | 14 - 164 files changed, 3437 insertions(+), 1710 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/ak5386.txt create mode 100644 Documentation/devicetree/bindings/sound/ti,tas5086.txt create mode 100644 include/sound/tas5086.h delete mode 100644 include/sound/tegra_wm8903.h delete mode 100644 sound/soc/cirrus/ep93xx-pcm.h create mode 100644 sound/soc/codecs/ak5386.c create mode 100644 sound/soc/codecs/tas5086.c delete mode 100644 sound/soc/omap/omap-pcm.h rename {arch/arm/plat-samsung/include/plat => sound/soc/samsung}/regs-ac97.h (100%) rename {arch/arm/plat-samsung/include/plat => sound/soc/samsung}/regs-iis.h (100%)

2 1