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

Re: [alsa-devel] Fw: Using loopback card to Connect GSM two way call to the real sound card UDA1345TS
by Clemens Ladisch 03 Jun '15

03 Jun '15

Srinivasan S wrote: > $ aplay -f dat -D VOUTL new.wav > Playing WAVE 'new.wav' : Signed 16 bit Little Endian, Rate 48000 Hz, Stereo > aplay: set_params:1087: Channels count non available You are trying to play a two-channel file on a single-channel device. Regards, Clemens

2 16

[alsa-devel] [PATCH] ASoC: add config to enable/disable asoc compress
by Jie Yang 03 Jun '15

03 Jun '15

From: "vivian,zhang" <vivian.zhang(a)intel.com> To reduce memory footprint, we can disable asoc compress when it is not used. Here add SND_SOC_COMPRESS to configure it. Signed-off-by: vivian,zhang <vivian.zhang(a)intel.com> Modified-by: Jie Yang <yang.jie(a)intel.com> Signed-off-by: Jie Yang <yang.jie(a)intel.com> --- include/sound/soc.h | 7 +++++++ sound/soc/Kconfig | 10 +++++++++- sound/soc/Makefile | 6 +++++- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index f6226914..6e2da70 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -430,7 +430,14 @@ int snd_soc_platform_read(struct snd_soc_platform *platform, int snd_soc_platform_write(struct snd_soc_platform *platform, unsigned int reg, unsigned int val); int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num); +#ifdef CONFIG_SND_SOC_COMPRESS int soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num); +#else +static inline int soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num) +{ + return -EPERM; +} +#endif struct snd_pcm_substream *snd_soc_get_dai_substream(struct snd_soc_card *card, const char *dai_link, int stream); diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig index 3ba52da..7e7a8e1 100644 --- a/sound/soc/Kconfig +++ b/sound/soc/Kconfig @@ -9,7 +9,7 @@ menuconfig SND_SOC select SND_JACK if INPUT=y || INPUT=SND select REGMAP_I2C if I2C select REGMAP_SPI if SPI_MASTER - select SND_COMPRESS_OFFLOAD + select SND_COMPRESS_OFFLOAD if SND_SOC_COMPRESS ---help--- If you want ASoC support, you should say Y here and also to the @@ -30,6 +30,14 @@ config SND_SOC_GENERIC_DMAENGINE_PCM bool select SND_DMAENGINE_PCM +config SND_SOC_COMPRESS + bool "Asoc compress offload support" if EXPERT + default y + help + Say 'N" to disable Asoc compress offload support, which may reduce code + size about 10KB on X86_64 platform. + If unsure say Y. + # All the supported SoCs source "sound/soc/adi/Kconfig" source "sound/soc/atmel/Kconfig" diff --git a/sound/soc/Makefile b/sound/soc/Makefile index 974ba70..0832c3b 100644 --- a/sound/soc/Makefile +++ b/sound/soc/Makefile @@ -1,5 +1,5 @@ snd-soc-core-objs := soc-core.o soc-dapm.o soc-jack.o soc-cache.o soc-utils.o -snd-soc-core-objs += soc-pcm.o soc-compress.o soc-io.o soc-devres.o soc-ops.o +snd-soc-core-objs += soc-pcm.o soc-io.o soc-devres.o soc-ops.o ifneq ($(CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM),) snd-soc-core-objs += soc-generic-dmaengine-pcm.o @@ -9,6 +9,10 @@ ifneq ($(CONFIG_SND_SOC_AC97_BUS),) snd-soc-core-objs += soc-ac97.o endif +ifneq ($(CONFIG_SND_SOC_COMPRESS),) +snd-soc-core-objs += soc-compress.o +endif + obj-$(CONFIG_SND_SOC) += snd-soc-core.o obj-$(CONFIG_SND_SOC) += codecs/ obj-$(CONFIG_SND_SOC) += generic/ -- 1.9.1

4 3

[alsa-devel] [PATCH 0/4] new fix for broadwell module removing failed issue
by Jie Yang 03 Jun '15

03 Jun '15

This patch series are based on broonie/sound.git for-next branch, commit 01a4d5083562fcdeab99d42b0873aabc5fcca018. The broadwell platform driver had module removing failed issue, and the two commits("ASoC: Intel: remove unused function hsw_pcm_free_modules()" and "ASoC: Intel: fix broadwell module removing failed issue") workaround it. But at the same time, we shouldn't leave the device as suspended state after module freed, it is not good to do runtime suspend at driver free either, so the fix was workaround only and not good enough. Here revert the old fix, and replace it with new unified procedure for runtime modules freeing: suspends firmware ==> frees runtime modules ==> unloads firmware. With this new procedure, we remove the runtime modules at both runtime suspend(D0->D3) and module(snd_soc_sst_haswell_pcm) removing, but make sure we do it only once. Jie Yang (4): Revert "ASoC: Intel: remove unused function hsw_pcm_free_modules()" Revert "ASoC: Intel: fix broadwell module removing failed issue" ASoC: Intel: check and clear runtime module pointer ASoC: Intel: handle haswell pcm suspend including runtime modules freeing sound/soc/intel/haswell/sst-haswell-pcm.c | 46 +++++++++++++++++++++++++------ 1 file changed, 37 insertions(+), 9 deletions(-) -- 1.9.1

3 6

[alsa-devel] [PATCH] ASoC: wm8731: initialize the hardware when loading the codec driver; use regmap for I/O
by Sergey Kiselev 02 Jun '15

02 Jun '15

Hi, This patch moves the request supplies and hardware reset and initialization from wm8731_probe to wm8731_i2c_probe and wm8731_spi_probe. So that the codec hardware is initialized when loading the codec driver, and not when loading the machine driver. The I/O is converted to regmap_write and regmap_update_bits. (Mostly as a side effect, since snd_soc_write and friends won't work before snd_soc_register_codec is called) Signed-off-by: Sergey Kiselev <sergey.kiselev(a)intel.com> --- wm8731.c | 107 ++++++++++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 72 insertions(+), 35 deletions(-) diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c index 2245b6a..05fa4d6 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) +#define wm8731_reset(m) regmap_write(m, WM8731_RESET, 0) static const char *wm8731_input_select[] = {"Line In", "Mic"}; @@ -118,7 +118,7 @@ static int wm8731_set_deemph(struct snd_soc_codec *codec) dev_dbg(codec->dev, "Set deemphasis %d (%dHz)\n", best, wm8731_deemph[best]); - return snd_soc_update_bits(codec, WM8731_APDIGI, 0x6, val); + return regmap_update_bits(wm8731->regmap, WM8731_APDIGI, 0x6, val); } static int wm8731_get_deemph(struct snd_kcontrol *kcontrol, @@ -344,7 +344,7 @@ static int wm8731_hw_params(struct snd_pcm_substream *substream, { struct snd_soc_codec *codec = dai->codec; struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec); - u16 iface = snd_soc_read(codec, WM8731_IFACE) & 0xfff3; + unsigned int format = 0; int i = get_coeff(wm8731->sysclk, params_rate(params)); u16 srate = (coeff_div[i].sr << 2) | (coeff_div[i].bosr << 1) | coeff_div[i].usb; @@ -358,28 +358,27 @@ static int wm8731_hw_params(struct snd_pcm_substream *substream, case 16: break; case 20: - iface |= 0x0004; + format = 0x4; break; case 24: - iface |= 0x0008; + format = 0x8; break; } wm8731_set_deemph(codec); - snd_soc_write(codec, WM8731_IFACE, iface); - return 0; + return regmap_update_bits(wm8731->regmap, WM8731_IFACE, 0x0c, format); } static int wm8731_mute(struct snd_soc_dai *dai, int mute) { struct snd_soc_codec *codec = dai->codec; - u16 mute_reg = snd_soc_read(codec, WM8731_APDIGI) & 0xfff7; + struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec); if (mute) - snd_soc_write(codec, WM8731_APDIGI, mute_reg | 0x8); + regmap_update_bits(wm8731->regmap, WM8731_APDIGI, 0x8, 0x8); else - snd_soc_write(codec, WM8731_APDIGI, mute_reg); + regmap_update_bits(wm8731->regmap, WM8731_APDIGI, 0x8, 0); return 0; } @@ -431,6 +430,7 @@ static int wm8731_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) { struct snd_soc_codec *codec = codec_dai->codec; + struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec); u16 iface = 0; /* set master/slave audio interface */ @@ -482,7 +482,7 @@ static int wm8731_set_dai_fmt(struct snd_soc_dai *codec_dai, } /* set iface */ - snd_soc_write(codec, WM8731_IFACE, iface); + regmap_write(wm8731->regmap, WM8731_IFACE, iface); return 0; } @@ -491,7 +491,6 @@ static int wm8731_set_bias_level(struct snd_soc_codec *codec, { struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec); int ret; - u16 reg; switch (level) { case SND_SOC_BIAS_ON: @@ -511,13 +510,12 @@ static int wm8731_set_bias_level(struct snd_soc_codec *codec, } /* Clear PWROFF, gate CLKOUT, everything else as-is */ - reg = snd_soc_read(codec, WM8731_PWR) & 0xff7f; - snd_soc_write(codec, WM8731_PWR, reg | 0x0040); + regmap_update_bits(wm8731->regmap, WM8731_PWR, 0xc0, 0x40); break; case SND_SOC_BIAS_OFF: if (wm8731->mclk) clk_disable_unprepare(wm8731->mclk); - snd_soc_write(codec, WM8731_PWR, 0xffff); + regmap_write(wm8731->regmap, WM8731_PWR, 0xff); regulator_bulk_disable(ARRAY_SIZE(wm8731->supplies), wm8731->supplies); regcache_mark_dirty(wm8731->regmap); @@ -573,42 +571,53 @@ static struct snd_soc_dai_driver wm8731_dai = { static int wm8731_probe(struct snd_soc_codec *codec) { - struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec); - int ret = 0, i; + wm8731_set_bias_level(codec, SND_SOC_BIAS_STANDBY); + + return 0; +} + +static int wm8731_request_supplies(struct device *dev, + struct wm8731_priv *wm8731) +{ + int ret = 0, i ; for (i = 0; i < ARRAY_SIZE(wm8731->supplies); i++) wm8731->supplies[i].supply = wm8731_supply_names[i]; - ret = devm_regulator_bulk_get(codec->dev, ARRAY_SIZE(wm8731->supplies), + ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(wm8731->supplies), wm8731->supplies); if (ret != 0) { - dev_err(codec->dev, "Failed to request supplies: %d\n", ret); + dev_err(dev, "Failed to request supplies: %d\n", ret); return ret; } ret = regulator_bulk_enable(ARRAY_SIZE(wm8731->supplies), wm8731->supplies); if (ret != 0) { - dev_err(codec->dev, "Failed to enable supplies: %d\n", ret); + dev_err(dev, "Failed to enable supplies: %d\n", ret); return ret; } - ret = wm8731_reset(codec); + return 0; +} + +static int wm8731_hw_init(struct device *dev, struct wm8731_priv *wm8731) +{ + int ret = 0; + + ret = wm8731_reset(wm8731->regmap); if (ret < 0) { - dev_err(codec->dev, "Failed to issue reset: %d\n", ret); + dev_err(dev, "Failed to issue reset: %d\n", ret); goto err_regulator_enable; } - wm8731_set_bias_level(codec, SND_SOC_BIAS_STANDBY); - - /* Latch the update bits */ - snd_soc_update_bits(codec, WM8731_LOUT1V, 0x100, 0); - snd_soc_update_bits(codec, WM8731_ROUT1V, 0x100, 0); - snd_soc_update_bits(codec, WM8731_LINVOL, 0x100, 0); - snd_soc_update_bits(codec, WM8731_RINVOL, 0x100, 0); + /* Clear POWEROFF, keep everything else disabled */ + regmap_write(wm8731->regmap, WM8731_PWR, 0x7f); /* Disable bypass path by default */ - snd_soc_update_bits(codec, WM8731_APANA, 0x8, 0); + regmap_update_bits(wm8731->regmap, WM8731_APANA, 0x8, 0); + + regcache_mark_dirty(wm8731->regmap); /* Regulators will have been enabled by bias management */ regulator_bulk_disable(ARRAY_SIZE(wm8731->supplies), wm8731->supplies); @@ -624,9 +633,7 @@ err_regulator_enable: /* power down chip */ static int wm8731_remove(struct snd_soc_codec *codec) { - struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec); - - regulator_bulk_disable(ARRAY_SIZE(wm8731->supplies), wm8731->supplies); + wm8731_set_bias_level(codec, SND_SOC_BIAS_OFF); return 0; } @@ -690,6 +697,13 @@ static int wm8731_spi_probe(struct spi_device *spi) mutex_init(&wm8731->lock); + spi_set_drvdata(spi, wm8731); + + ret = wm8731_request_supplies(&spi->dev, wm8731); + if (ret != 0) { + return ret; + } + wm8731->regmap = devm_regmap_init_spi(spi, &wm8731_regmap); if (IS_ERR(wm8731->regmap)) { ret = PTR_ERR(wm8731->regmap); @@ -698,7 +712,10 @@ static int wm8731_spi_probe(struct spi_device *spi) return ret; } - spi_set_drvdata(spi, wm8731); + ret = wm8731_hw_init(&spi->dev, wm8731); + if (ret != 0) { + return ret; + } ret = snd_soc_register_codec(&spi->dev, &soc_codec_dev_wm8731, &wm8731_dai, 1); @@ -712,7 +729,12 @@ static int wm8731_spi_probe(struct spi_device *spi) static int wm8731_spi_remove(struct spi_device *spi) { + struct wm8731_priv *wm8731 = spi_get_drvdata(spi); + snd_soc_unregister_codec(&spi->dev); + + regulator_bulk_disable(ARRAY_SIZE(wm8731->supplies), wm8731->supplies); + return 0; } @@ -754,6 +776,13 @@ static int wm8731_i2c_probe(struct i2c_client *i2c, mutex_init(&wm8731->lock); + i2c_set_clientdata(i2c, wm8731); + + ret = wm8731_request_supplies(&i2c->dev, wm8731); + if (ret != 0) { + return ret; + } + wm8731->regmap = devm_regmap_init_i2c(i2c, &wm8731_regmap); if (IS_ERR(wm8731->regmap)) { ret = PTR_ERR(wm8731->regmap); @@ -762,7 +791,10 @@ static int wm8731_i2c_probe(struct i2c_client *i2c, return ret; } - i2c_set_clientdata(i2c, wm8731); + ret = wm8731_hw_init(&i2c->dev, wm8731); + if (ret != 0) { + return ret; + } ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_wm8731, &wm8731_dai, 1); @@ -776,7 +808,12 @@ static int wm8731_i2c_probe(struct i2c_client *i2c, static int wm8731_i2c_remove(struct i2c_client *client) { + struct wm8731_priv *wm8731 = i2c_get_clientdata(client); + snd_soc_unregister_codec(&client->dev); + + regulator_bulk_disable(ARRAY_SIZE(wm8731->supplies), wm8731->supplies); + return 0; } -- Sergey

3 3

[alsa-devel] [PATCH 30/98] hdspm.h: use __u8, __u32 and __u64 from linux/types.h
by Mikko Rapeli 02 Jun '15

02 Jun '15

Fixes userspace compilation errors like: sound/hdspm.h:43:2: error: unknown type name ‘uint32_t’ Signed-off-by: Mikko Rapeli <mikko.rapeli(a)iki.fi> --- include/uapi/sound/hdspm.h | 40 ++++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/include/uapi/sound/hdspm.h b/include/uapi/sound/hdspm.h index 5737332..c4db6f5 100644 --- a/include/uapi/sound/hdspm.h +++ b/include/uapi/sound/hdspm.h @@ -20,11 +20,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifdef __KERNEL__ #include <linux/types.h> -#else -#include <stdint.h> -#endif /* Maximum channels is 64 even on 56Mode you have 64playbacks to matrix */ #define HDSPM_MAX_CHANNELS 64 @@ -46,15 +42,15 @@ enum hdspm_speed { /* -------------------- IOCTL Peak/RMS Meters -------------------- */ struct hdspm_peak_rms { - uint32_t input_peaks[64]; - uint32_t playback_peaks[64]; - uint32_t output_peaks[64]; + __u32 input_peaks[64]; + __u32 playback_peaks[64]; + __u32 output_peaks[64]; - uint64_t input_rms[64]; - uint64_t playback_rms[64]; - uint64_t output_rms[64]; + __u64 input_rms[64]; + __u64 playback_rms[64]; + __u64 output_rms[64]; - uint8_t speed; /* enum {ss, ds, qs} */ + __u8 speed; /* enum {ss, ds, qs} */ int status2; }; @@ -155,21 +151,21 @@ enum hdspm_syncsource { }; struct hdspm_status { - uint8_t card_type; /* enum hdspm_io_type */ + __u8 card_type; /* enum hdspm_io_type */ enum hdspm_syncsource autosync_source; - uint64_t card_clock; - uint32_t master_period; + __u64 card_clock; + __u32 master_period; union { struct { - uint8_t sync_wc; /* enum hdspm_sync */ - uint8_t sync_madi; /* enum hdspm_sync */ - uint8_t sync_tco; /* enum hdspm_sync */ - uint8_t sync_in; /* enum hdspm_sync */ - uint8_t madi_input; /* enum hdspm_madi_input */ - uint8_t channel_format; /* enum hdspm_madi_channel_format */ - uint8_t frame_format; /* enum hdspm_madi_frame_format */ + __u8 sync_wc; /* enum hdspm_sync */ + __u8 sync_madi; /* enum hdspm_sync */ + __u8 sync_tco; /* enum hdspm_sync */ + __u8 sync_in; /* enum hdspm_sync */ + __u8 madi_input; /* enum hdspm_madi_input */ + __u8 channel_format; /* enum hdspm_madi_channel_format */ + __u8 frame_format; /* enum hdspm_madi_frame_format */ } madi; } card_specific; }; @@ -184,7 +180,7 @@ struct hdspm_status { #define HDSPM_ADDON_TCO 1 struct hdspm_version { - uint8_t card_type; /* enum hdspm_io_type */ + __u8 card_type; /* enum hdspm_io_type */ char cardname[20]; unsigned int serial; unsigned short firmware_rev; -- 2.1.4

2 2

[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 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