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

[alsa-devel] [PATCH v2 0/9] asoc: Add audio for sti platforms
by Arnaud Pouliquen 02 Jun '15

02 Jun '15

version 2: corrections after first review - bindings: . suppress useless dts declarations - uniperif_player.c: . Suppress standby mode in uniplayer ( will be part of a dedicated patch) . Deliver IEC and clock adjustement controls in separate patch - uniperif_reader.c: . kept as separate file as behavior and feature not same than uniplayer . minor corrections - codec/sti-sas.c . implement DAPM for DAC . rework registers declaration to separate device and driver part version 1: - First patches submission Arnaud Pouliquen (9): ASoC: sti: add binding for ASoc driver ASoC: sti: Add uniperipheral header file ASoC: sti: Add CPU DAI driver for playback ASoC: sti: Add CPU DAI driver for capture ASoC: sti: Add platform driver ASoC: Add ability to build sti drivers ASoC: Codec: Add sti platform codec ASoC: sti: Add clock adjustement control ASoC: sti: Add IEC control .../devicetree/bindings/sound/st,sti-asoc-card.txt | 158 +++ sound/soc/Kconfig | 1 + sound/soc/Makefile | 1 + sound/soc/codecs/Kconfig | 4 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/sti-sas.c | 645 +++++++++++ sound/soc/sti/Kconfig | 17 + sound/soc/sti/Makefile | 5 + sound/soc/sti/sti_platform.c | 642 ++++++++++ sound/soc/sti/uniperif.h | 1224 ++++++++++++++++++++ sound/soc/sti/uniperif_player.c | 1218 +++++++++++++++++++ sound/soc/sti/uniperif_reader.c | 459 ++++++++ 12 files changed, 4376 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt create mode 100644 sound/soc/codecs/sti-sas.c create mode 100644 sound/soc/sti/Kconfig create mode 100644 sound/soc/sti/Makefile create mode 100644 sound/soc/sti/sti_platform.c create mode 100644 sound/soc/sti/uniperif.h create mode 100644 sound/soc/sti/uniperif_player.c create mode 100644 sound/soc/sti/uniperif_reader.c -- 1.9.1

3 24

[alsa-devel] [PATCH 18/98] include/uapi/sound/emu10k1.h: added EMU10K1 version of DECLARE_BITMAP etc macros
by Mikko Rapeli 02 Jun '15

02 Jun '15

Fixes userspace compilation error: error: expected specifier-qualifier-list before ‘DECLARE_BITMAP’ DECLARE_BITMAP(gpr_valid, 0x200); /* bitmask of valid initializers */ DECLARE_BITMAP etc macros are not meant for userspace headers and thus added here as private copies for emu10k.h. Fix was suggested by Arnd Bergmann <arnd(a)arndb.de> in message <2168807.4Yxh5gl11Q@wuerfel> on lkml. Signed-off-by: Mikko Rapeli <mikko.rapeli(a)iki.fi> --- include/uapi/sound/emu10k1.h | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/include/uapi/sound/emu10k1.h b/include/uapi/sound/emu10k1.h index ec1535b..7575f0f 100644 --- a/include/uapi/sound/emu10k1.h +++ b/include/uapi/sound/emu10k1.h @@ -34,6 +34,23 @@ #define EMU10K1_FX8010_PCM_COUNT 8 +/* + * Following definitions are copies from kernel headers to support compiling + * this header file in userspace. The definitions are not generally available + * in uapi headers so the needed things are copied here wtih __EMU10k1 prefix. + */ + +/* From include/linux/bitops.h */ +#define __EMU10K1_BITS_PER_BYTE 8 +/* From include/linux/kernel.h */ +#define __EMU10K1_DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d)) +/* From include/linux/bitops.h */ +#define __EMU10K1_BITS_TO_LONGS(nr) \ + __EMU10K1_DIV_ROUND_UP(nr, __EMU10K1_BITS_PER_BYTE * sizeof(long)) +/* From include/linux/types.h */ +#define __EMU10K1_DECLARE_BITMAP(name,bits) \ + unsigned long name[__EMU10K1_BITS_TO_LONGS(bits)] + /* instruction set */ #define iMAC0 0x00 /* R = A + (X * Y >> 31) ; saturation */ #define iMAC1 0x01 /* R = A + (-X * Y >> 31) ; saturation */ @@ -300,7 +317,7 @@ struct snd_emu10k1_fx8010_control_old_gpr { struct snd_emu10k1_fx8010_code { char name[128]; - DECLARE_BITMAP(gpr_valid, 0x200); /* bitmask of valid initializers */ + __EMU10K1_DECLARE_BITMAP(gpr_valid, 0x200); /* bitmask of valid initializers */ __u32 __user *gpr_map; /* initializers */ unsigned int gpr_add_control_count; /* count of GPR controls to add/replace */ @@ -313,11 +330,11 @@ struct snd_emu10k1_fx8010_code { unsigned int gpr_list_control_total; /* total count of GPR controls */ struct snd_emu10k1_fx8010_control_gpr __user *gpr_list_controls; /* listed GPR controls */ - DECLARE_BITMAP(tram_valid, 0x100); /* bitmask of valid initializers */ + __EMU10K1_DECLARE_BITMAP(tram_valid, 0x100); /* bitmask of valid initializers */ __u32 __user *tram_data_map; /* data initializers */ __u32 __user *tram_addr_map; /* map initializers */ - DECLARE_BITMAP(code_valid, 1024); /* bitmask of valid instructions */ + __EMU10K1_DECLARE_BITMAP(code_valid, 1024); /* bitmask of valid instructions */ __u32 __user *code; /* one instruction - 64 bits */ }; -- 2.1.4

2 3

[alsa-devel] [WM5102/ARIZONA] spi driver needs to support ACPI
by Christian Hartmann 02 Jun '15

02 Jun '15

Hi list, I need ACPI support for the arizona-core / arizona-spi driver for the ACPI ID WM5102. This audio codec is build into the Lenovo Yoga 851F. This device is a 32Bit (UEFI) system http://support.lenovo.com/de/de/products/tablets/yoga-series/yoga-tablet-2-… I have tested with vanilla kernels from kernel.org 3.19.y ,4.0.y and master (from torvalds) currently its 4.1.0-rc3. As distribution I am working with Fedora / Fedlet was the initial install image. With all vanilla kernels I got at first an error message from spi32766: [ 0.296297] pxa2xx-spi 80860F0E:00: cs1 >= max 1 [ 0.296311] spi_master spi32766: failed to add SPI device WM510205:00 from ACPI so I have at first patched as suggested by broonie the arizona-core commit 48203a0fede057d6a8c5f6872c53326395350f45 Author: somebody anybody <somebody(a)foobar.com> Date: Mon May 11 13:35:43 2015 +0200 spi-pxa2xx : raise chipselect Signed-off-by: somebody anybody <somebody(a)foobar.com> diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c index e3223ac..9c919ea 100644 --- a/drivers/spi/spi-pxa2xx.c +++ b/drivers/spi/spi-pxa2xx.c @@ -1279,7 +1279,7 @@ pxa2xx_spi_acpi_get_pdata(struct platform_device *pdev) if (adev->pnp.unique_id && !kstrtoint(adev->pnp.unique_id, 0, &devid)) ssp->port_id = devid; - pdata->num_chipselect = 1; + pdata->num_chipselect = 20; pdata->enable_dma = true; return pdata; This leds the spi master do the further ACPI configuration and inital setup for the arizona-spi device, but adding the ACPI ID to it does not work yet as expected: The current last patchset on top of master is Author: somebody anybody <somebody(a)foobar.com> Date: Wed May 13 11:36:25 2015 +0200 arizona : added ACPI id of wm5102 to SPI driver, too Signed-off-by: somebody anybody <somebody(a)foobar.com> diff --git a/drivers/mfd/arizona-spi.c b/drivers/mfd/arizona-spi.c index 1e845f6..c19a4c1 100644 --- a/drivers/mfd/arizona-spi.c +++ b/drivers/mfd/arizona-spi.c @@ -17,6 +17,7 @@ #include <linux/regulator/consumer.h> #include <linux/slab.h> #include <linux/spi/spi.h> +#include <linux/acpi.h> #include <linux/of.h> #include <linux/mfd/arizona/core.h> @@ -82,6 +83,15 @@ static int arizona_spi_remove(struct spi_device *spi) return 0; } +#ifdef CONFIG_ACPI +static struct acpi_device_id wm5102_acpi_match[] = { + { "WM5102", 0}, + { "WM510205", 0}, + { }, +}; +MODULE_DEVICE_TABLE(acpi, wm5102_acpi_match); +#endif + static const struct spi_device_id arizona_spi_ids[] = { { "wm5102", WM5102 }, { "wm5110", WM5110 }, @@ -96,6 +106,9 @@ static struct spi_driver arizona_spi_driver = { .owner = THIS_MODULE, .pm = &arizona_pm_ops, .of_match_table = of_match_ptr(arizona_of_match), +#ifdef CONFIG_ACPI + .acpi_match_table = ACPI_PTR(wm5102_acpi_match), +#endif }, .probe = arizona_spi_probe, .remove = arizona_spi_remove, commit 268e21d29c942205e40f749c6d71c77839dc67da Author: somebody anybody <somebody(a)foobar.com> Date: Wed May 13 11:36:04 2015 +0200 arizona : added ACPI id of wm5102 to i2c driver Signed-off-by: somebody anybody <somebody(a)foobar.com> diff --git a/drivers/mfd/arizona-i2c.c b/drivers/mfd/arizona-i2c.c index ff782a5..45ece1b 100644 --- a/drivers/mfd/arizona-i2c.c +++ b/drivers/mfd/arizona-i2c.c @@ -18,6 +18,7 @@ #include <linux/regulator/consumer.h> #include <linux/slab.h> #include <linux/of.h> +#include <linux/acpi.h> #include <linux/mfd/arizona/core.h> @@ -85,6 +86,15 @@ static int arizona_i2c_remove(struct i2c_client *i2c) return 0; } +#ifdef CONFIG_ACPI +static struct acpi_device_id wm5102_acpi_match[] = { + { "WM5102", 0}, + { "WM510205", 0}, + { }, +}; +MODULE_DEVICE_TABLE(acpi, wm5102_acpi_match); +#endif + static const struct i2c_device_id arizona_i2c_id[] = { { "wm5102", WM5102 }, { "wm5110", WM5110 }, @@ -100,6 +110,9 @@ static struct i2c_driver arizona_i2c_driver = { .owner = THIS_MODULE, .pm = &arizona_pm_ops, .of_match_table = of_match_ptr(arizona_of_match), +#ifdef CONFIG_ACPI + .acpi_match_table = ACPI_PTR(wm5102_acpi_match), +#endif }, .probe = arizona_i2c_probe, .remove = arizona_i2c_remove, with these two patches the local master branch compiles fine, but at initialzing the arizona-spi driver gots a NULL pointer exception. I attach the whole dmesg of 4.1.0-rc3 (build 4.1.0.24-rc3). I need some assistance or hints to the right direction, I am looking myself and I also try what I can, but I think it would be easy peasy with some experts like here on this list :) PS: the message : spi_master spi32766: raised num_chipselect to 20 for WM510205:00 is a dev_err() line added to the function static acpi_status acpi_spi_add_device(), there I had raised the num_chipselect first (that was wrong, the raise is now done as in the first patch above. this is only a debug message and will be removed soon) PPS: for me it seems that there is a missing 'link' from WM5102 to the sst-acpi 80860F28:00 device, which complaints NOW / the first time with the three patches applied on top on master.... will have a look into it. I hope I got this device working with some more help from you. cheers chris

2 5

[alsa-devel] [PATCH] ALSA: hda/realtek - Add a fixup for another Acer Aspire 9420
by Takashi Iwai 02 Jun '15

02 Jun '15

Acer Aspire 9420 with ALC883 (1025:0107) needs the fixup for EAPD to make the sound working like other Aspire models. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=94111 Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 80be33ce1a9e..0320cb523d9e 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -2168,6 +2168,7 @@ static const struct hda_fixup alc882_fixups[] = { static const struct snd_pci_quirk alc882_fixup_tbl[] = { SND_PCI_QUIRK(0x1025, 0x006c, "Acer Aspire 9810", ALC883_FIXUP_ACER_EAPD), SND_PCI_QUIRK(0x1025, 0x0090, "Acer Aspire", ALC883_FIXUP_ACER_EAPD), + SND_PCI_QUIRK(0x1025, 0x0107, "Acer Aspire", ALC883_FIXUP_ACER_EAPD), SND_PCI_QUIRK(0x1025, 0x010a, "Acer Ferrari 5000", ALC883_FIXUP_ACER_EAPD), SND_PCI_QUIRK(0x1025, 0x0110, "Acer Aspire", ALC883_FIXUP_ACER_EAPD), SND_PCI_QUIRK(0x1025, 0x0112, "Acer Aspire 9303", ALC883_FIXUP_ACER_EAPD), -- 2.4.2

1 0

[alsa-devel] [PATCH] ASoC: DAPM: fix snd_soc_dapm_new_control() implicit declaration
by Vladimir Zapolskiy 02 Jun '15

02 Jun '15

The change fixes the following compilation problem: sound/soc/soc-dapm.c: In function 'dapm_kcontrol_data_alloc': sound/soc/soc-dapm.c:388:4: error: implicit declaration of function 'snd_soc_dapm_new_control' [-Werror=implicit-function-declaration] data->widget = snd_soc_dapm_new_control(widget->dapm, ^ sound/soc/soc-dapm.c:387:17: warning: assignment makes pointer from integer without a cast [enabled by default] data->widget = snd_soc_dapm_new_control(widget->dapm, ^ sound/soc/soc-dapm.c: At top level: sound/soc/soc-dapm.c:3269:1: error: conflicting types for 'snd_soc_dapm_new_control' snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm, ^ In addition to the fix add static qualifier to snd_soc_dapm_new_control() function to silence checkpatch. Fixes: 02aa78abec ("ASoC: DAPM: Add APIs to create individual DAPM controls.") Signed-off-by: Vladimir Zapolskiy <vz(a)mleia.com> --- sound/soc/soc-dapm.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 78d96e1..0d800ac 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -52,6 +52,11 @@ static int snd_soc_dapm_add_path(struct snd_soc_dapm_context *dapm, const char *control, int (*connected)(struct snd_soc_dapm_widget *source, struct snd_soc_dapm_widget *sink)); + +static struct snd_soc_dapm_widget * +snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm, + const struct snd_soc_dapm_widget *widget); + struct snd_soc_dapm_widget * snd_soc_dapm_new_control_unlocked(struct snd_soc_dapm_context *dapm, const struct snd_soc_dapm_widget *widget); @@ -3265,7 +3270,7 @@ int snd_soc_dapm_put_pin_switch(struct snd_kcontrol *kcontrol, } EXPORT_SYMBOL_GPL(snd_soc_dapm_put_pin_switch); -struct snd_soc_dapm_widget * +static struct snd_soc_dapm_widget * snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm, const struct snd_soc_dapm_widget *widget) { -- 2.1.4

2 1

[alsa-devel] [PATCH v4 0/7] ASoC: intel - add skylake PCM driver
by Vinod Koul 02 Jun '15

02 Jun '15

SKL has HDA controller based audio subsystem with DSP and support for I2S, HDA, PDM links. The hda core code has been moved to sound/hda/ by Takashi which current HDA drivers use and will also be used by ASoC SKL driver. The SKL platform driver will load and create the soc_hdac_bus which embeds the hdac_bus, same for hdac_device (hda codecs) and hdac_stream (pcms) This is on top of hdac code in Takashi's topic/hda This patch provides the match function for asoc type hda codecs and let's them get enumerated by hdac. The second patch in this series adds the controller specific soc code. Common parts are in hdac core with changes introduced as part of SKL controller in soc part. Then we add the rest of controller PCM driver code (still HDA) and last patch breaks the HDA streams to host and link which will allow insertion of DSP in between these links. The subsequent series will add IPC driver for SKL (using common IPC routines), then DSP topology handlers, DSP code with I2S support and then lastly when DFW is accepted then its handlers. This patch series adds the hda codec match functions followed by asoc hda controller routines, then SKL PCM driver and last decouples the controller for splitting the links Fixes in v4: Updates changelog in patch1 and few other patches Address Takashi's comment Address Marks comments Jeeja KP (7): ASoC: hda - add ASoC HDA codec match function ALSA: hda - add new HDA registers ASoC: hda - add asoc hda core bus, controller and stream helpers ASoC: intel - add Skylake HDA platform driver ASoC: intel - add Skylake HDA audio driver ASoC: intel - add makefile support for SKL driver ASoC: intel - adds support for decoupled mode in skl driver include/sound/hda_register.h | 88 ++++ include/sound/soc-hda-codec.h | 49 ++ include/sound/soc-hdaudio.h | 360 +++++++++++++ sound/soc/Kconfig | 1 + sound/soc/Makefile | 1 + sound/soc/hda/Kconfig | 3 + sound/soc/hda/Makefile | 4 + sound/soc/hda/soc-hda-codec.c | 89 ++++ sound/soc/hda/soc-hdac-bus.c | 115 +++++ sound/soc/hda/soc-hdac-controller.c | 296 +++++++++++ sound/soc/hda/soc-hdac-stream.c | 409 +++++++++++++++ sound/soc/intel/Kconfig | 17 + sound/soc/intel/Makefile | 1 + sound/soc/intel/skylake/Makefile | 3 + sound/soc/intel/skylake/hda-skl-pcm.c | 937 ++++++++++++++++++++++++++++++++++ sound/soc/intel/skylake/hda-skl.c | 670 ++++++++++++++++++++++++ sound/soc/intel/skylake/hda-skl.h | 74 +++ 17 files changed, 3117 insertions(+) create mode 100644 include/sound/soc-hda-codec.h create mode 100644 include/sound/soc-hdaudio.h create mode 100644 sound/soc/hda/Kconfig create mode 100644 sound/soc/hda/Makefile create mode 100644 sound/soc/hda/soc-hda-codec.c create mode 100644 sound/soc/hda/soc-hdac-bus.c create mode 100644 sound/soc/hda/soc-hdac-controller.c create mode 100644 sound/soc/hda/soc-hdac-stream.c create mode 100644 sound/soc/intel/skylake/Makefile create mode 100644 sound/soc/intel/skylake/hda-skl-pcm.c create mode 100644 sound/soc/intel/skylake/hda-skl.c create mode 100644 sound/soc/intel/skylake/hda-skl.h -- 1.9.1

3 56

[alsa-devel] ASoC: PATCH: wm8731 - reinitialize regmap cache after hardware reset
by Sergey Kiselev 02 Jun '15

02 Jun '15

Hi, I am working on a machine driver that uses wm8731 codec and I've noticed that it will not work after rmmod/modprobe of that machine driver. The issue is that wm8731_probe() resets the hardware, but it doesn't reinitialize the regmap cache to the default values. The patch below fixes this issue. I also skimmed through other codecs, and some of them might have similar issue (wm8510.c, wm8711.c, wm8750.c, wm8753.c, wm8940.c, wm8960.c, wm8971.c, wm8974.c, wm8988.c, wm8990.c) Another way to avoid this issue might be resetting the codec in the *_spi_probe()/*_i2c_probe(), so that it only gets reset once when codec is loading. Thanks in advance for any comments/suggestions on the patch. Thanks, Sergey Signed-off-by: Sergey Kiselev <skiselev(a)gmail.com> diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c index 2245b6a..76af75b 100644 --- a/sound/soc/codecs/wm8731.c +++ b/sound/soc/codecs/wm8731.c @@ -84,7 +84,7 @@ static bool wm8731_writeable(struct device *dev, unsigned int reg) return reg <= WM8731_RESET; } -#define wm8731_reset(c) snd_soc_write(c, WM8731_RESET, 0) +static int wm8731_reset(struct snd_soc_codec *codec); static const char *wm8731_input_select[] = {"Line In", "Mic"}; @@ -665,6 +665,21 @@ static const struct regmap_config wm8731_regmap = { .num_reg_defaults = ARRAY_SIZE(wm8731_reg_defaults), }; +static int wm8731_reset(struct snd_soc_codec *codec) +{ + int ret; + struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec); + + ret = snd_soc_write(codec, WM8731_RESET, 0); + + if (ret != 0) + return ret; + + regmap_reinit_cache(wm8731->regmap, &wm8731_regmap); + + return 0; +} + #if defined(CONFIG_SPI_MASTER) static int wm8731_spi_probe(struct spi_device *spi) {

4 3

[alsa-devel] [PATCH] ASoC: davinci-mcasp: Choose PCM driver based on configured DMA controller
by Jyri Sarha 02 Jun '15

02 Jun '15

Find the configured DMA controller by asking for a DMA channel in the probe phase and releasing it right after. The controller device can be found via the dma_chan struct and the controller is recognized from the compatible property of its device node. The patch assumes EDMA if there is no device node. Signed-off-by: Jyri Sarha <jsarha(a)ti.com> --- sound/soc/davinci/davinci-mcasp.c | 61 ++++++++++++++++++++++++++++++++------- 1 file changed, 51 insertions(+), 10 deletions(-) diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index d793494..5bc2712 100644 --- a/sound/soc/davinci/davinci-mcasp.c +++ b/sound/soc/davinci/davinci-mcasp.c @@ -1565,6 +1565,46 @@ static int davinci_mcasp_init_ch_constraints(struct davinci_mcasp *mcasp) return ret; } +enum { + MCASP_EDMA = 1, + MCASP_SDMA, +}; +static const char *sdma_prefix = "ti,omap"; + +static int davinci_mcasp_get_dma_type(struct davinci_mcasp *mcasp) +{ + struct dma_chan *chan; + const char *tmp; + int ret = MCASP_EDMA; + + tmp = mcasp->dma_data[SNDRV_PCM_STREAM_PLAYBACK].filter_data; + chan = dma_request_slave_channel_reason(mcasp->dev, tmp); + if (IS_ERR(chan)) { + if (PTR_ERR(chan) != -EPROBE_DEFER) + dev_err(mcasp->dev, + "Can't verify DMA configuration (%ld)\n", + PTR_ERR(chan)); + return PTR_ERR(chan); + } + BUG_ON(!chan->device || !chan->device->dev); + + if (chan->device->dev->of_node) + ret = of_property_read_string(chan->device->dev->of_node, + "compatible", &tmp); + else + dev_dbg(mcasp->dev, "DMA controller has no of-node\n"); + + dma_release_channel(chan); + if (ret) + return ret; + + dev_dbg(mcasp->dev, "DMA controller compatible = \"%s\"\n", tmp); + if (!strncmp(tmp, sdma_prefix, strlen(sdma_prefix))) + return MCASP_SDMA; + + return MCASP_EDMA; +} + static int davinci_mcasp_probe(struct platform_device *pdev) { struct snd_dmaengine_dai_dma_data *dma_data; @@ -1763,27 +1803,28 @@ static int davinci_mcasp_probe(struct platform_device *pdev) if (ret != 0) goto err; - switch (mcasp->version) { + ret = -EINVAL; + switch (davinci_mcasp_get_dma_type(mcasp)) { + case MCASP_EDMA: #if IS_BUILTIN(CONFIG_SND_EDMA_SOC) || \ (IS_MODULE(CONFIG_SND_DAVINCI_SOC_MCASP) && \ IS_MODULE(CONFIG_SND_EDMA_SOC)) - case MCASP_VERSION_1: - case MCASP_VERSION_2: - case MCASP_VERSION_3: ret = edma_pcm_platform_register(&pdev->dev); - break; +#else + dev_err(&pdev->dev, "Missing SND_EDMA_SOC\n"); #endif + break; + case MCASP_SDMA: #if IS_BUILTIN(CONFIG_SND_OMAP_SOC) || \ (IS_MODULE(CONFIG_SND_DAVINCI_SOC_MCASP) && \ IS_MODULE(CONFIG_SND_OMAP_SOC)) - case MCASP_VERSION_4: ret = omap_pcm_platform_register(&pdev->dev); - break; +#else + dev_err(&pdev->dev, "Missing SND_SDMA_SOC\n"); #endif + break; default: - dev_err(&pdev->dev, "Invalid McASP version: %d\n", - mcasp->version); - ret = -EINVAL; + dev_err(&pdev->dev, "No DMA controller found\n"); break; } -- 1.9.1

3 6

[alsa-devel] [PATCH v4 00/18] new MFD LoCoMo driver set
by Dmitry Eremin-Solenikov 02 Jun '15

02 Jun '15

Sharp Zaurus SL-5500 and SL-5600 use special companion Gate Array. With this patchset I tried to modernise and restructure the LoCoMo drivers. * Use platform bus and mfd core code * Use GPIO API instead of custom locomo GPIO code * Use irqdomains to manage IRQs * Split mixed locomolcd driver to lcd and backlight parts * Implement IRQ handling in GPIO driver * Implement SPI driver used as a host for mmc_spi device to control SD cards Changes since v3: * Removed magic values in locomo irq handling code * Using mutex in locomokbd driver * Dropped empty locomokbd_remove * Small rearrangement of headers/comments/etc in core and input drivers The following changes since commit b787f68c36d49bb1d9236f403813641efa74a031: Linux 4.1-rc1 (2015-04-26 17:59:10 -0700) are available in the git repository at: git://git.infradead.org/users/dbaryshkov/zaurus.git locomo-v4 for you to fetch changes up to 7c8e8e05ca27a4ad82356eb57ad12a7ca39bfd95: ARM: drop old LoCoMo driver (2015-05-25 14:29:23 +0300) ---------------------------------------------------------------- Dmitry Eremin-Solenikov (18): mfd: add new driver for Sharp LoCoMo leds: port locomo leds driver to new locomo core input: convert LoCoMo keyboard driver to use new locomo core input: locomokbd: differentiate between two Enter keys input: make LoCoMo keyboard driver support both poodle and collie video: backlight: add new locomo backlight driver video: lcd: add LoCoMo LCD driver gpio: port LoCoMo gpio support from old driver gpio: locomo: implement per-pin irq handling spi: add locomo SPI driver i2c: add locomo i2c driver ARM: sa1100: make collie use new locomo drivers ARM: sa1100: don't preallocate IRQ space for locomo ASoC: pxa: poodle: make use of new locomo GPIO interface ARM: pxa: poodle: use new LoCoMo driver ARM: pxa: poodle: don't preallocate IRQ space for locomo video: backlight: drop old locomo bl/lcd driver ARM: drop old LoCoMo driver arch/arm/common/Kconfig | 3 - arch/arm/common/Makefile | 1 - arch/arm/common/locomo.c | 914 ----------------------------- arch/arm/include/asm/hardware/locomo.h | 221 ------- arch/arm/mach-pxa/Kconfig | 1 - arch/arm/mach-pxa/include/mach/poodle.h | 8 +- arch/arm/mach-pxa/poodle.c | 58 +- arch/arm/mach-sa1100/Kconfig | 1 - arch/arm/mach-sa1100/collie.c | 213 +++++-- arch/arm/mach-sa1100/include/mach/collie.h | 16 +- arch/arm/mach-sa1100/include/mach/irqs.h | 19 +- drivers/gpio/Kconfig | 13 + drivers/gpio/Makefile | 1 + drivers/gpio/gpio-locomo.c | 285 +++++++++ drivers/i2c/busses/Kconfig | 12 + drivers/i2c/busses/Makefile | 1 + drivers/i2c/busses/i2c-locomo.c | 135 +++++ drivers/input/keyboard/Kconfig | 2 +- drivers/input/keyboard/locomokbd.c | 262 ++++----- drivers/leds/Kconfig | 2 +- drivers/leds/leds-locomo.c | 117 ++-- drivers/mfd/Kconfig | 10 + drivers/mfd/Makefile | 1 + drivers/mfd/locomo.c | 336 +++++++++++ drivers/spi/Kconfig | 10 + drivers/spi/Makefile | 1 + drivers/spi/spi-locomo.c | 332 +++++++++++ drivers/video/backlight/Kconfig | 16 +- drivers/video/backlight/Makefile | 3 +- drivers/video/backlight/locomo_bl.c | 153 +++++ drivers/video/backlight/locomo_lcd.c | 285 +++++++++ drivers/video/backlight/locomolcd.c | 255 -------- include/linux/mfd/locomo.h | 169 ++++++ sound/soc/pxa/poodle.c | 52 +- 34 files changed, 2205 insertions(+), 1703 deletions(-) delete mode 100644 arch/arm/common/locomo.c delete mode 100644 arch/arm/include/asm/hardware/locomo.h create mode 100644 drivers/gpio/gpio-locomo.c create mode 100644 drivers/i2c/busses/i2c-locomo.c create mode 100644 drivers/mfd/locomo.c create mode 100644 drivers/spi/spi-locomo.c create mode 100644 drivers/video/backlight/locomo_bl.c create mode 100644 drivers/video/backlight/locomo_lcd.c delete mode 100644 drivers/video/backlight/locomolcd.c create mode 100644 include/linux/mfd/locomo.h

5 26

[alsa-devel] [PATCH] ASoC: Intel: don't need compress offload for broadwell
by Jie Yang 02 Jun '15

02 Jun '15

We don't need compress offload feature for broadwell broadwell machine, here remove the non exist dependency. Signed-off-by: Jie Yang <yang.jie(a)intel.com> --- sound/soc/intel/Kconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig index ee03dbd..3a08f79 100644 --- a/sound/soc/intel/Kconfig +++ b/sound/soc/intel/Kconfig @@ -79,7 +79,6 @@ config SND_SOC_INTEL_BROADWELL_MACH depends on SND_SOC_INTEL_SST && X86_INTEL_LPSS && DW_DMAC && \ I2C_DESIGNWARE_PLATFORM select SND_SOC_INTEL_HASWELL - select SND_COMPRESS_OFFLOAD select SND_SOC_RT286 help This adds support for the Wilcatpoint Audio DSP on Intel(R) Broadwell -- 1.9.1

2 1