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

[alsa-devel] [PATCH] ASoC: sgtl5000: fix bad register MIC_BIAS_VOLTAGE setup on probe
by Gianluca Renzi 25 Sep '15

25 Sep '15

Cc: Liam Girdwood <lgirdwood(a)gmail.com> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: Fabio Estevam <fabio.estevam(a)freescale.com> Cc: alsa-devel(a)alsa-project.org Cc: linux-kernel(a)vger.kernel.org Signed-off-by: Gianluca Renzi <gianlucarenzi(a)eurekelettronica.it> --- sound/soc/codecs/sgtl5000.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -up a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c --- a/sound/soc/codecs/sgtl5000.c 2015-09-25 15:24:10.597051191 +0200 +++ b/sound/soc/codecs/sgtl5000.c 2015-09-25 15:24:21.000000000 +0200 @@ -1377,7 +1377,7 @@ static int sgtl5000_probe(struct snd_soc snd_soc_update_bits(codec, SGTL5000_CHIP_MIC_CTRL, SGTL5000_BIAS_R_MASK, - sgtl5000->micbias_voltage << SGTL5000_BIAS_R_SHIFT); + sgtl5000->micbias_voltage << SGTL5000_BIAS_VOLT_SHIFT); /* * disable DAP * TODO: @@ -1549,7 +1549,7 @@ static int sgtl5000_i2c_probe(struct i2c else { sgtl5000->micbias_voltage = 0; dev_err(&client->dev, - "Unsuitable MicBias resistor\n"); + "Unsuitable MicBias voltage\n"); } } else { sgtl5000->micbias_voltage = 0;

3 2

[alsa-devel] ASoC: please revert "ASoC: db1200: Use static DAI format setup"
by Manuel Lauss 25 Sep '15

25 Sep '15

Hi Lars, commit b4508d0f95fa4aaed889549e31391641d675d4bb ("ASoC: db1200: Use static DAI format setup") breaks I2S in that the set_dai_fmt() callbacks of neither the codec (wm8731) nor the I2S block (psc-i2s) are called. Please revert this change or fix it up so that the set_dai_fmt() callbacks are at least called once. (This was broken since 4.0, but I just now got around to test linux on the hardware again). Thanks! Manuel -- To unsubscribe from this list: send the line "unsubscribe alsa-devel" in

3 3

[alsa-devel] [GIT PULL] ASoC updates for v4.4
by Mark Brown 25 Sep '15

25 Sep '15

The following changes since commit 1f93e4a96c9109378204c147b3eec0d0e8100fde: Linux 4.3-rc2 (2015-09-20 14:32:34 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v4.3-rc2 for you to fetch changes up to 4922e7a1b767fcf6f29ce121ad74e424f4045eff: Merge remote-tracking branch 'asoc/topic/ux500' into asoc-next (2015-09-23 11:01:30 -0700) ---------------------------------------------------------------- ASoC: Updates for v4.4 A first batch of updates targetted at v4.4. There are no substantial core fixes here, the biggest block of changes is updates to the rcar drivers and the addition of a CODEC driver for the AK4613. ---------------------------------------------------------------- Adam Thomson (1): ASoC: fsl_ssi: Fix checking of dai format for AC97 mode Anatol Pomozov (1): ASoC: Document snd-soc-dummy-dai purpose Arnaud Pouliquen (1): ASoC: sti: check return of of_property_read Axel Lin (11): ASoC: mediatek: Convert to devm_snd_soc_register_card ASoC: au1x: Convert to devm_snd_soc_register_card ASoC: blackfin: Convert to devm_snd_soc_register_card ASoC: mxs-sgtl5000: Convert to devm_snd_soc_register_card ASoC: pxa: Convert to devm_snd_soc_register_card ASoC: SPEAr: Make SND_SPEAR_SOC select SND_SOC_GENERIC_DMAENGINE_PCM ASoC: au1x: psc-i2s: Fix unused variable 'ret' warning ASoC: sh: siu_dai: Convert to use resource managed APIs ASoC: intel: broadwell: Convert to devm_snd_soc_register_card ASoC: SPEAr: Make SND_SPEAR_SOC select SND_SOC_GENERIC_DMAENGINE_PCM ASoC: rockchip: Fix missing CLKDEV_LOOKUP dependency Charles Keepax (4): ASoC: arizona: Add default cases for event switches ASoC: arizona: Add utility function to check if an input is analog ASoC: Add SOC_SINGLE_RANGE_EXT_TLV macro ASoC: wm5110: Add additional analogue input enable for early revs Emilio López (1): ASoC: sunxi: add support for the on-chip codec on early Allwinner SoCs Jarkko Nikula (1): spi: atmel: Remove needless bits_per_word and speed_hz tests Jeeja KP (1): ASoC: Intel: Skylake: Remove unused CPU dais John Lin (3): ASoC: rt5645: Add struct dmi_system_id "Google Ultima" for chrome platform ASoC: rt5645: Add dmi for Broadwell ASoC: rt5645: Add jd_invert for Broadwell Julia Lawall (1): ASoC: qcom: change PTR_ERR argument Jyri Sarha (7): ASoC: davinci-mcasp: Set .symmetric_rates = 1 in snd_soc_dai_driver ASoC: tlv320aic3x: Improve tdm support ASoC: davinci-mcasp: Add set_tdm_slots() support ASoC: simple-card: Add tdm slot mask support to simple-card ASoC: soc-core: Fix sparse warning in be32_to_cpup() call ASoC: davinci-mcasp: Get rid of bclk_lrclk_ratio in private data ASoC: hdmi: Remove obsolete dummy HDMI codec Koro Chen (1): ASoC: mediatek: Increase periods_min in capture Kuninori Morimoto (20): ASoC: ak4642: use *dev on ak4642_i2c_probe() ASoC: ak4642: enable to use MCKO as fixed rate output pin on DT ASoC: rsnd: tidyup rsnd_dma_to_xxx() position ASoC: rsnd: rename rsnd_src_pcm_new() to rsnd_src_pcm_new_gen2() ASoC: rsnd: remove unneeded sh_clk header ASoC: rsnd: add missing #sound-dai-cells explain on Document ASoC: rsnd: Add Gen3 initial support ASoC: rsnd: add rsnd_mod_get() macro and use it ASoC: rsnd: ADG uses mod base common method ASoC: rsnd: add common mod confirm method ASoC: rsnd: ADG initial setup on rsnd_adg_ssi_clk_init() ASoC: rsnd: tidyup ADG clock calculate method ASoC: rsnd: tidyup ADG debug message for clock selection ASoC: rsnd: adg: ignore undefined clock error ASoC: rsnd: add AUDIO_CLKOUT support ASoC: rsnd: SND_SOC_RCAR depends on COMMON_CLK ASoC: ak4642: exchange macro name to avoid redefinition ASoC: rsnd: fixup clkout_name[] index error for single AUDIO_CLKOUT SoC ASoC: add ak4613 support ASoC: ak4613: add Digital Playback Volume support Liam Girdwood (1): ASoC: intel: Fix SSP port configuration after RTD3 resume. Luis de Bethencourt (8): ASoC: atmel_wm8904: Fix module autoload for OF platform driver ASoC: fsl-asoc-card: Fix module autoload for OF platform driver ASoC: fsl_sai: Fix module autoload for OF platform driver ASoC: jz4740: Fix module autoload for OF platform driver ASoC: kirkwood: Fix module autoload for OF platform driver ASoC: pxa: Fix module autoload for OF platform drivers ASoC: mop500: Fix module autoload for OF platform driver ASoC: ux500: Fix module autoload for OF platform driver Maciej S. Szmigiero (1): ASoC: fsl-asoc-card: put ASRC OF node in case of unknown device Mark Brown (14): Merge branch 'fix/rt5645' of git://git.kernel.org/.../broonie/sound into asoc-fix-rt5645 Merge branch 'fix/rt5645' of git://git.kernel.org/.../broonie/sound into asoc-rt5645 Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus Merge remote-tracking branch 'asoc/fix/rt5645' into asoc-linus Merge remote-tracking branches 'asoc/fix/davinci', 'asoc/fix/doc', 'asoc/fix/fsl-card', 'asoc/fix/fsl-ssi', 'asoc/fix/intel' and 'asoc/fix/maintainers' into asoc-linus Merge remote-tracking branches 'asoc/fix/mtk', 'asoc/fix/psc', 'asoc/fix/pxa', 'asoc/fix/spear', 'asoc/fix/sti' and 'asoc/fix/wm0010' into asoc-linus Merge remote-tracking branches 'asoc/fix/wm8960' and 'asoc/fix/wm8962' into asoc-linus Merge remote-tracking branch 'asoc/topic/rt5645' into asoc-next Merge remote-tracking branches 'asoc/topic/ak4613', 'asoc/topic/ak4642', 'asoc/topic/arizona', 'asoc/topic/atmel' and 'asoc/topic/au1x' into asoc-next Merge remote-tracking branches 'asoc/topic/blackfin', 'asoc/topic/davinci', 'asoc/topic/fsl', 'asoc/topic/hdmi' and 'asoc/topic/intel' into asoc-next Merge remote-tracking branches 'asoc/topic/jz4740', 'asoc/topic/kirkwood', 'asoc/topic/mtk', 'asoc/topic/multi' and 'asoc/topic/mxs' into asoc-next Merge remote-tracking branches 'asoc/topic/pxa', 'asoc/topic/qcom', 'asoc/topic/rcar' and 'asoc/topic/rockchip' into asoc-next Merge remote-tracking branches 'asoc/topic/sh', 'asoc/topic/simple', 'asoc/topic/spear', 'asoc/topic/sunxi' and 'asoc/topic/tlv320aic3x' into asoc-next Merge remote-tracking branch 'asoc/topic/ux500' into asoc-next Maxime Ripard (1): ASoC: sunxi: Add the Allwinner A10 codec bindings Oder Chiou (5): ASoC: rt5645: Remove incorrect settings ASoC: rt5645: Remove the repeated definitions ASoC: rt5645: Use the type SOC_DAPM_SINGLE_AUTODISABLE to prevent the weird sound in runtime of power up ASoC: rt5645: Increase the delay time to remove the pop sound ASoC: rt5645: Prevent the pop sound in case of playback and the jack is plugging Peter Ujfalusi (2): ASoC: davinci-mcasp: Revise the FIFO threshold calculation ASoC: davinci-mcasp: Fix devm_kasprintf format string Ricard Wanderlof (1): ASoC: Handle multiple codecs with split playback / capture Richard Fitzgerald (1): MAINTAINERS: Update website and git repo for Wolfson Microelectronics Robert Jarzmik (2): ASoC: fix broken pxa SoC support ASoC: pxa: pxa2xx-ac97: fix dma requestor lines Sudip Mukherjee (5): ASoC: wm0010: fix memory leak ASoC: dapm: fix memory leak ASoC: Intel: remove unused function ASoC: wm0010: fix memory leak ASoC: wm0010: fix error path Zidan Wang (4): ASoC: wm8960: correct the min gain value of some PGA ASoC: wm8960: correct gain value for input PGA and add microphone PGA ASoC: wm8962: remove 64k sample rate support ASoC: wm8960: correct the max register value of mic boost pga kbuild test robot (1): ASoC: sunxi: fix platform_no_drv_owner.cocci warnings Documentation/devicetree/bindings/sound/ak4613.txt | 17 + Documentation/devicetree/bindings/sound/ak4642.txt | 22 +- .../devicetree/bindings/sound/renesas,rsnd.txt | 7 + .../devicetree/bindings/sound/sun4i-codec.txt | 33 + .../devicetree/bindings/sound/tdm-slot.txt | 11 +- MAINTAINERS | 9 +- drivers/spi/spi-atmel.c | 21 +- include/sound/rcar_snd.h | 1 - include/sound/rt5645.h | 2 + include/sound/simple_card.h | 2 + include/sound/soc.h | 14 + sound/arm/Kconfig | 15 +- sound/soc/Kconfig | 1 + sound/soc/Makefile | 1 + sound/soc/atmel/atmel_wm8904.c | 1 + sound/soc/au1x/db1000.c | 10 +- sound/soc/au1x/db1200.c | 10 +- sound/soc/au1x/psc-i2s.c | 1 - sound/soc/blackfin/bf5xx-ad1836.c | 11 +- sound/soc/blackfin/bfin-eval-adau1373.c | 12 +- sound/soc/blackfin/bfin-eval-adau1701.c | 12 +- sound/soc/blackfin/bfin-eval-adav80x.c | 12 +- sound/soc/codecs/Kconfig | 9 +- sound/soc/codecs/Makefile | 4 +- sound/soc/codecs/ak4613.c | 497 ++++++++++++++ sound/soc/codecs/ak4642.c | 153 +++-- sound/soc/codecs/arizona.c | 16 + sound/soc/codecs/arizona.h | 2 + sound/soc/codecs/hdmi.c | 109 ---- sound/soc/codecs/rt5645.c | 57 +- sound/soc/codecs/rt5645.h | 6 +- sound/soc/codecs/tlv320aic3x.c | 30 +- sound/soc/codecs/wm0010.c | 23 +- sound/soc/codecs/wm5110.c | 187 +++++- sound/soc/codecs/wm8960.c | 26 +- sound/soc/codecs/wm8962.c | 3 +- sound/soc/davinci/davinci-mcasp.c | 319 +++++---- sound/soc/fsl/fsl-asoc-card.c | 4 +- sound/soc/fsl/fsl_sai.c | 1 + sound/soc/fsl/fsl_ssi.c | 5 +- sound/soc/generic/simple-card.c | 8 +- sound/soc/intel/atom/sst-mfld-platform-pcm.c | 17 - sound/soc/intel/boards/broadwell.c | 9 +- sound/soc/intel/haswell/sst-haswell-ipc.c | 20 +- sound/soc/intel/skylake/skl-pcm.c | 33 - sound/soc/jz4740/jz4740-i2s.c | 1 + sound/soc/kirkwood/armada-370-db.c | 1 + sound/soc/mediatek/mt8173-max98090.c | 11 +- sound/soc/mediatek/mt8173-rt5650-rt5676.c | 11 +- sound/soc/mediatek/mtk-afe-pcm.c | 17 + sound/soc/mxs/mxs-sgtl5000.c | 6 +- sound/soc/pxa/Kconfig | 2 - sound/soc/pxa/brownstone.c | 9 +- sound/soc/pxa/corgi.c | 11 +- sound/soc/pxa/e740_wm9705.c | 5 +- sound/soc/pxa/e750_wm9705.c | 5 +- sound/soc/pxa/e800_wm9712.c | 5 +- sound/soc/pxa/hx4700.c | 4 +- sound/soc/pxa/imote2.c | 11 +- sound/soc/pxa/mioa701_wm9713.c | 11 +- sound/soc/pxa/palm27x.c | 9 +- sound/soc/pxa/poodle.c | 11 +- sound/soc/pxa/pxa-ssp.c | 1 + sound/soc/pxa/pxa2xx-ac97.c | 4 +- sound/soc/pxa/pxa2xx-pcm.c | 1 + sound/soc/pxa/spitz.c | 5 +- sound/soc/pxa/tosa.c | 5 +- sound/soc/pxa/ttc-dkb.c | 12 +- sound/soc/qcom/lpass-cpu.c | 3 +- sound/soc/rockchip/Kconfig | 4 +- sound/soc/sh/Kconfig | 1 + sound/soc/sh/rcar/adg.c | 303 +++++++-- sound/soc/sh/rcar/core.c | 12 + sound/soc/sh/rcar/ctu.c | 6 +- sound/soc/sh/rcar/dvc.c | 6 +- sound/soc/sh/rcar/mix.c | 6 +- sound/soc/sh/rcar/rsnd.h | 15 +- sound/soc/sh/rcar/src.c | 17 +- sound/soc/sh/rcar/ssi.c | 98 +-- sound/soc/sh/siu_dai.c | 85 +-- sound/soc/soc-core.c | 25 + sound/soc/soc-dapm.c | 2 +- sound/soc/soc-pcm.c | 49 ++ sound/soc/soc-utils.c | 9 + sound/soc/spear/Kconfig | 2 +- sound/soc/sti/uniperif_player.c | 14 +- sound/soc/sti/uniperif_reader.c | 6 +- sound/soc/sunxi/Kconfig | 11 + sound/soc/sunxi/Makefile | 2 + sound/soc/sunxi/sun4i-codec.c | 719 +++++++++++++++++++++ sound/soc/ux500/mop500.c | 1 + sound/soc/ux500/ux500_msp_dai.c | 1 + 92 files changed, 2484 insertions(+), 834 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/ak4613.txt create mode 100644 Documentation/devicetree/bindings/sound/sun4i-codec.txt create mode 100644 sound/soc/codecs/ak4613.c delete mode 100644 sound/soc/codecs/hdmi.c create mode 100644 sound/soc/sunxi/Kconfig create mode 100644 sound/soc/sunxi/Makefile create mode 100644 sound/soc/sunxi/sun4i-codec.c

2 2

[alsa-devel] [PATCH v2] sound: oss: ad1848: Fix returned errno code in ad1848_init()
by Luis de Bethencourt 25 Sep '15

25 Sep '15

The driver is using -1 instead of the -ENOMEM defined macro to specify that a buffer allocation failed. Since the error number is propagated, the caller will get a -EPERM which is the wrong error condition. Changed the checks of the return of ad1848_init() to be for >= 0, instead of != -1. Smatch tool warning: ad1848_init() warn: returning -1 instead of -ENOMEM is sloppy Signed-off-by: Luis de Bethencourt <luisbg(a)osg.samsung.com> --- sound/oss/ad1848.c | 4 ++-- sound/oss/dev_table.c | 2 +- sound/oss/pss.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/oss/ad1848.c b/sound/oss/ad1848.c index 10c8de1..58c6d31 100644 --- a/sound/oss/ad1848.c +++ b/sound/oss/ad1848.c @@ -1992,7 +1992,7 @@ int ad1848_init (char *name, struct resource *ports, int irq, int dma_playback, portc = kmalloc(sizeof(ad1848_port_info), GFP_KERNEL); if(portc==NULL) { release_region(devc->base, 4); - return -1; + return -ENOMEM; } if ((my_dev = sound_install_audiodrv(AUDIO_DRIVER_VERSION, @@ -2007,7 +2007,7 @@ int ad1848_init (char *name, struct resource *ports, int irq, int dma_playback, { release_region(devc->base, 4); kfree(portc); - return -1; + return my_dev; } audio_devs[my_dev]->portc = portc; diff --git a/sound/oss/dev_table.c b/sound/oss/dev_table.c index 6dad515..abb3db4 100644 --- a/sound/oss/dev_table.c +++ b/sound/oss/dev_table.c @@ -148,7 +148,7 @@ EXPORT_SYMBOL(sound_install_mixer); void sound_unload_audiodev(int dev) { - if (dev != -1) { + if (dev >= 0) { DMAbuf_deinit(dev); audio_devs[dev] = NULL; unregister_sound_dsp((dev<<4)+3); diff --git a/sound/oss/pss.c b/sound/oss/pss.c index 81314f9..e84aafe 100644 --- a/sound/oss/pss.c +++ b/sound/oss/pss.c @@ -1091,7 +1091,7 @@ static int __init probe_pss_mss(struct address_info *hw_config) pss_mixer_reset(devc); attach_ms_sound(hw_config, ports, THIS_MODULE); /* Slot 0 */ - if (hw_config->slots[0] != -1) + if (hw_config->slots[0] >= 0) { /* The MSS driver installed itself */ audio_devs[hw_config->slots[0]]->coproc = &pss_coproc_operations; -- 2.5.1

2 4

[alsa-devel] [PATCH] ASoC: db1200: Fix DAI link format for db1300 and db1550
by Lars-Peter Clausen 25 Sep '15

25 Sep '15

Commit b4508d0f95fa ("ASoC: db1200: Use static DAI format setup") switched the db1200 driver over to using static DAI format setup instead of a callback function. But the commit only added the dai_fmt field to one of the three DAI links in the driver. This breaks audio on db1300 and db1550. Add the two missing dai_fmt settings to fix the issue. Fixes: b4508d0f95fa ("ASoC: db1200: Use static DAI format setup") Reported-by: Manuel Lauss <manuel.lauss(a)gmail.com> Tested-by: Manuel Lauss <manuel.lauss(a)gmail.com> Signed-off-by: Lars-Peter Clausen <lars(a)metafoo.de> --- sound/soc/au1x/db1200.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/soc/au1x/db1200.c b/sound/soc/au1x/db1200.c index 638ca0b..5c73061 100644 --- a/sound/soc/au1x/db1200.c +++ b/sound/soc/au1x/db1200.c @@ -129,6 +129,8 @@ static struct snd_soc_dai_link db1300_i2s_dai = { .cpu_dai_name = "au1xpsc_i2s.2", .platform_name = "au1xpsc-pcm.2", .codec_name = "wm8731.0-001b", + .dai_fmt = SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBM_CFM, .ops = &db1200_i2s_wm8731_ops, }; @@ -146,6 +148,8 @@ static struct snd_soc_dai_link db1550_i2s_dai = { .cpu_dai_name = "au1xpsc_i2s.3", .platform_name = "au1xpsc-pcm.3", .codec_name = "wm8731.0-001b", + .dai_fmt = SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBM_CFM, .ops = &db1200_i2s_wm8731_ops, }; -- 2.1.4

1 0

[alsa-devel] Missing snd_pcm_link() for the rate plugin
by Christian Gruber 25 Sep '15

25 Sep '15

Dear ALSA community, does anybody know, why the rate plugin does not support the snd_pcm_link() function? As I can see from the ALSA-Lib source code, snd_pcm_link() calls the fast_op "link", which is a function pointer, whose destination depends on the type of pcm device/plugin to be linked. If the device is a HW-device for instance, the function snd_pcm_hw_link() is called. Several other plugins (e.g. mmap_emul, linear, lfloat, mulaw, alaw, route) use the generic function snd_pcm_generic_link(), which forwards the function call to their slave devices/plugins. The rate plugin instead does not support snd_pcm_link(), since the function pointer "link" is not assigned in the definition of snd_pcm_rate_fast_ops. Is their any reason to not use the generic function snd_pcm_generic_link() within the rate plugin? Thanks in advance for answering this question, Christian

2 1

[alsa-devel] sunxi, Allwinner TDM Support?
by Caleb Crome 25 Sep '15

25 Sep '15

Hi, I was wondering if the sunxi parts support TDM mode on their DAI ports? Those parts sure have attractive pricing, and as you may have gathered, I'm all about many microphone channels. :-) Thanks, -Caleb

1 0

[alsa-devel] RT5640 jack detection
by Carlo Caione 24 Sep '15

24 Sep '15

Hi, I'm working with the ALC5640-VB audio codec based on the Realtek RT5640. On my setup the codec is only used for audio output through an headphone jack, otherwise the audio should be routed via HDMI. The problem is that the jack sensing only works when the codec is actively playing something, that is when the bias set for the codec is not SND_SOC_BIAS_OFF. When the codec is suspended and it is powered off I'm not able to detect anymore the presence of the jack. Because of this issue actively switching the audio from HDMI to HP when the jack is inserted is not working. The driver I'm using for the RT5640 in the .set_bias_level hook function among other things is gating the I2S input clock and this seems to prevent the generation of the IRQ signal I'm using to detect the presence/absence of the jack (the culprit here is MX-FA[0] bit for those interested). I can easily modify the codec driver to avoid gating the I2S clock when the bias is off but this seems in contrast with the whole DAPM principle. How this is usually supposed to be working? -- Carlo Caione | +39.340.80.30.096 | Endless

3 4

[alsa-devel] [PATCH 0/5] Add ASoC support for AMD APUs [v3]
by Alex Deucher 24 Sep '15

24 Sep '15

This patch set implements support for i2s audio and new AMD GPUs. The i2s codec is fed by a DMA engine on the GPU. To handle this we create mfd cells which we hang the i2s codec and DMA engine on. Because of this, this patch set covers two subsystems: drm and alsa. The drm patches add support for the ACP hw block which provides the DMA engine for the i2s codec. The alsa patches add the ASoC driver for the i2s codec. Since the alsa changes depend on the drm changes in this patch set as well as some other drm changes queued for 4.3, I'd like to take the alsa patches in via the drm tree. V2 changes: - Use the MFD subsystem rather than adding our own bus - Squash all sub-feature patches together - fix comments mentioned in previous review V3 changes: - Update the designware driver to handle slave mode, amd specific features - Use the designware driver directly for i2s - Move the DMA handling from the GPU driver into the AMD ASoC driver - Change the license on the ASoC driver to GPL Patch 4 adds the register headers for the ACP block which is a pretty big patch so I've excluded it from email. The entire patch set can be viewed here: http://cgit.freedesktop.org/~agd5f/linux/log/?h=acp-upstream3 Thanks, Alex Maruthi Bayyavarapu (1): drm/amd: add ACP driver support Maruthi Srinivas Bayyavarapu (4): ASoC : dwc : support dw i2s in slave mode ASoC : dwc : support dw i2s in AMD platform ASoC : AMD : add ACP 2.2 register headers ASoC: AMD: add AMD ASoC ACP-I2S driver drivers/gpu/drm/Kconfig | 2 + drivers/gpu/drm/amd/acp/Kconfig | 10 + drivers/gpu/drm/amd/acp/Makefile | 9 + drivers/gpu/drm/amd/acp/acp_hw.c | 127 ++ drivers/gpu/drm/amd/acp/include/acp_gfx_if.h | 49 + drivers/gpu/drm/amd/amdgpu/Makefile | 13 +- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 12 + drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 269 +++ drivers/gpu/drm/amd/amdgpu/amdgpu_acp.h | 41 + drivers/gpu/drm/amd/amdgpu/vi.c | 12 + drivers/gpu/drm/amd/include/amd_shared.h | 1 + include/linux/mfd/amd_acp.h | 43 + include/sound/designware_i2s.h | 4 + sound/soc/Kconfig | 1 + sound/soc/Makefile | 1 + sound/soc/amd/Kconfig | 4 + sound/soc/amd/Makefile | 3 + sound/soc/amd/acp-pcm-dma.c | 518 ++++++ sound/soc/amd/acp.c | 736 +++++++++ sound/soc/amd/acp.h | 147 ++ sound/soc/amd/include/acp_2_2_d.h | 609 +++++++ sound/soc/amd/include/acp_2_2_enum.h | 1068 ++++++++++++ sound/soc/amd/include/acp_2_2_sh_mask.h | 2292 ++++++++++++++++++++++++++ sound/soc/dwc/designware_i2s.c | 270 +-- 24 files changed, 6141 insertions(+), 100 deletions(-) create mode 100644 drivers/gpu/drm/amd/acp/Kconfig create mode 100644 drivers/gpu/drm/amd/acp/Makefile create mode 100644 drivers/gpu/drm/amd/acp/acp_hw.c create mode 100644 drivers/gpu/drm/amd/acp/include/acp_gfx_if.h create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_acp.h create mode 100644 include/linux/mfd/amd_acp.h create mode 100644 sound/soc/amd/Kconfig create mode 100644 sound/soc/amd/Makefile create mode 100644 sound/soc/amd/acp-pcm-dma.c create mode 100644 sound/soc/amd/acp.c create mode 100644 sound/soc/amd/acp.h create mode 100644 sound/soc/amd/include/acp_2_2_d.h create mode 100644 sound/soc/amd/include/acp_2_2_enum.h create mode 100644 sound/soc/amd/include/acp_2_2_sh_mask.h -- 1.8.3.1

2 7

[alsa-devel] [PATCH] ASoC: rl6347a: Clean up unneeded inclusion of header files
by Axel Lin 24 Sep '15

24 Sep '15

Also move the include of sound/hda_verbs.h to rl6347a.h because it is used in rl6347a.h. Signed-off-by: Axel Lin <axel.lin(a)ingics.com> --- sound/soc/codecs/rl6347a.c | 19 +------------------ sound/soc/codecs/rl6347a.h | 2 ++ sound/soc/codecs/rt286.c | 1 - sound/soc/codecs/rt298.c | 1 - 4 files changed, 3 insertions(+), 20 deletions(-) diff --git a/sound/soc/codecs/rl6347a.c b/sound/soc/codecs/rl6347a.c index 91d5166..a4b910e 100644 --- a/sound/soc/codecs/rl6347a.c +++ b/sound/soc/codecs/rl6347a.c @@ -11,25 +11,8 @@ */ #include <linux/module.h> -#include <linux/moduleparam.h> -#include <linux/init.h> -#include <linux/delay.h> -#include <linux/pm.h> #include <linux/i2c.h> -#include <linux/platform_device.h> -#include <linux/spi/spi.h> -#include <linux/dmi.h> -#include <linux/acpi.h> -#include <sound/core.h> -#include <sound/pcm.h> -#include <sound/pcm_params.h> -#include <sound/soc.h> -#include <sound/soc-dapm.h> -#include <sound/initval.h> -#include <sound/tlv.h> -#include <sound/jack.h> -#include <linux/workqueue.h> -#include <sound/hda_verbs.h> +#include <linux/regmap.h> #include "rl6347a.h" diff --git a/sound/soc/codecs/rl6347a.h b/sound/soc/codecs/rl6347a.h index 1cb56e5..e127919 100644 --- a/sound/soc/codecs/rl6347a.h +++ b/sound/soc/codecs/rl6347a.h @@ -12,6 +12,8 @@ #ifndef __RL6347A_H__ #define __RL6347A_H__ +#include <sound/hda_verbs.h> + #define VERB_CMD(V, N, D) ((N << 20) | (V << 8) | D) #define RL6347A_VENDOR_REGISTERS 0x20 diff --git a/sound/soc/codecs/rt286.c b/sound/soc/codecs/rt286.c index bd93658..1fbdb4f 100644 --- a/sound/soc/codecs/rt286.c +++ b/sound/soc/codecs/rt286.c @@ -29,7 +29,6 @@ #include <sound/jack.h> #include <linux/workqueue.h> #include <sound/rt286.h> -#include <sound/hda_verbs.h> #include "rl6347a.h" #include "rt286.h" diff --git a/sound/soc/codecs/rt298.c b/sound/soc/codecs/rt298.c index 3c2f0f8..2a6c2ba 100644 --- a/sound/soc/codecs/rt298.c +++ b/sound/soc/codecs/rt298.c @@ -28,7 +28,6 @@ #include <sound/jack.h> #include <linux/workqueue.h> #include <sound/rt298.h> -#include <sound/hda_verbs.h> #include "rl6347a.h" #include "rt298.h" -- 2.1.4

2 1