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

[alsa-devel] [PATCH v2 0/5][alsa-lib] ctl: sync UAPI header for TLV-related macros and apply misc changes
by Takashi Sakamoto 30 Sep '16

30 Sep '16

Hi, This patchset updates my former one: [alsa-devel] [PATCH 0/4][alsa-lib] ctl: sync UAPI header for TLV-related macros and apply misc changes http://mailman.alsa-project.org/pipermail/alsa-devel/2016-September/112853.… In this month, UAPI header of 4.9-pre kernel newly include existent macros related to TLV operation for user land. This is to allow applications to register TLV information to element set which they added. This patchset is for related changes in ALSA user land library. The macros are put into 'include/sound/tlv.h'. However corresponding macros are not put into 'include/control.h' yet because currently I have no better idea for library APIs to construct tlv information. This patchset also improves some corrections for documentation which committed with my misunderstandings. Takashi Sakamoto (5): Update include/sound/tlv.h from 4.9-pre kernel uapi test: use actual information for TLV operation ctl: improve API documentation for TLV operation ctl: improve documentation about TLV-related APIs ctl: correct documentation about TLV feature include/sound/tlv.h | 77 ++++++++++++++++ src/control/control.c | 47 +++++++--- test/user-ctl-element-set.c | 214 ++++++++++++++++++++++++++++++++++++-------- 3 files changed, 289 insertions(+), 49 deletions(-) -- 2.7.4

2 6

[alsa-devel] Alsa-lib strings?
by David Henningsson 30 Sep '16

30 Sep '16

Hi, I'm making some rust bindings for alsa-lib [1] and Rust is quite picky about strings; i e, requires them to be UTF-8. 1a) can I count on alsa-lib's strings (everything from card name and mixer identifiers to various descriptions) to be UTF-8 or perhaps even 7-bit? If not, what encoding is to be expected? 1b) In what way can buggy drivers violate the answers to 1a? 2) Can I count on the strings to be zero terminated? E g, I looked at snd_ctl_elem_id_set_name <http://www.alsa-project.org/alsa-doc/alsa-lib/group___control.html#ga813d02…> that sets all 44 characters without ensuring a zero at the last character, but snd_ctl_elem_id_get_name <http://www.alsa-project.org/alsa-doc/alsa-lib/group___control.html#gaa6cfea…> does not say anything about a max length, it just gives out a *const char. The question applies to all other strings as well. // David [1] https://docs.rs/alsa/

3 2

[alsa-devel] [PATCH] ASoC: fsl: Fix lockups with recent cache changes
by Mark Brown 29 Sep '16

29 Sep '16

The recent series of changes to the caching in the SSI driver have caused a number of problems to appear in some test systems. These are still not fully understood but we're coming up to the merge window so for now let's revert commit 7de2763d9b3 (ASoC: fsl_ssi: Remove .num_reg_defaults_raw from regmap_config) as backing that out seems to resolve the problem on affected systems. Reported-by: Maciej S. Szmigiero" <mail(a)maciej.szmigiero.name> Signed-off-by: Mark Brown <broonie(a)kernel.org> Cc: Marek Vasut <marex(a)denx.de> --- sound/soc/fsl/fsl_ssi.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index b73c102f1cf2..50349437d961 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -177,6 +177,7 @@ static const struct regmap_config fsl_ssi_regconfig = { .val_bits = 32, .reg_stride = 4, .val_format_endian = REGMAP_ENDIAN_NATIVE, + .num_reg_defaults_raw = CCSR_SSI_SACCDIS / sizeof(uint32_t) + 1, .readable_reg = fsl_ssi_readable_reg, .volatile_reg = fsl_ssi_volatile_reg, .precious_reg = fsl_ssi_precious_reg, @@ -1500,6 +1501,8 @@ static int fsl_ssi_probe(struct platform_device *pdev) * don't have SACC{ST,EN,DIS} regs. */ regconfig.max_register = CCSR_SSI_SRMSK; + regconfig.num_reg_defaults_raw = + CCSR_SSI_SRMSK / sizeof(uint32_t) + 1; } ret = of_property_match_string(np, "clock-names", "ipg"); -- 2.9.3

2 1

[alsa-devel] [PATCH] ASoC: Intel: Skylake: fix memory leak of module on error exit path
by Colin King 29 Sep '16

29 Sep '16

From: Colin Ian King <colin.king(a)canonical.com> Currently there is a memory leak of module on a ENOMEM return path. Fix this by kfree'ing module before returning. Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- sound/soc/intel/skylake/skl-sst-utils.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/soc/intel/skylake/skl-sst-utils.c b/sound/soc/intel/skylake/skl-sst-utils.c index d3120ba..8dc0303 100644 --- a/sound/soc/intel/skylake/skl-sst-utils.c +++ b/sound/soc/intel/skylake/skl-sst-utils.c @@ -354,8 +354,10 @@ int snd_skl_parse_uuids(struct sst_dsp *ctx, const struct firmware *fw, module->max_instance = mod_entry->instance_max_count; size = sizeof(int) * mod_entry->instance_max_count; module->instance_id = devm_kzalloc(ctx->dev, size, GFP_KERNEL); - if (!module->instance_id) + if (!module->instance_id) { + kfree(module); return -ENOMEM; + } list_add_tail(&module->list, &skl->uuid_list); -- 2.9.3

2 1

[alsa-devel] [PATCH] ASoC: rsnd: add SNDRV_PCM_TRIGGER_SUSPEND/RESUME
by Kuninori Morimoto 29 Sep '16

29 Sep '16

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> This patch adds SNDRV_PCM_TRIGGER_SUSPEND/RESUME. Otherwise, it breaks rsnd driver internal start/stop counter when suspend/resume. This issue was reported/tested by Hiep Tested-by: Hiep Cao Minh <cm-hiep(a)jinso.co.jp> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/sh/rcar/core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index f718a20..f181410 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -576,6 +576,7 @@ static int rsnd_soc_dai_trigger(struct snd_pcm_substream *substream, int cmd, switch (cmd) { case SNDRV_PCM_TRIGGER_START: + case SNDRV_PCM_TRIGGER_RESUME: rsnd_dai_stream_init(io, substream); ret = rsnd_dai_call(init, io, priv); @@ -592,6 +593,7 @@ static int rsnd_soc_dai_trigger(struct snd_pcm_substream *substream, int cmd, break; case SNDRV_PCM_TRIGGER_STOP: + case SNDRV_PCM_TRIGGER_SUSPEND: ret = rsnd_dai_call(irq, io, priv, 0); ret |= rsnd_dai_call(stop, io, priv); -- 1.9.1

2 1

[alsa-devel] [alsa-lib][PATCHv2] ucm: docs: typeset lists of identifiers explicitly
by Antonio Ospite 29 Sep '16

29 Sep '16

Doxygen doesn't preserve formatting that relies only on indentation, typeset lists of identifiers explicitly. This makes the HTML docs a lot more readable. This change comes along the lines of commit 72aa0f8332fb ("ucm: reformat snd_use_case_get() doc"). Some TABs has been added too in order to preserve the aligned look when reading the source code. Signed-off-by: Antonio Ospite <ao2(a)ao2.it> --- Changes since v1: * fix a typo where a '=' (equal) was used instead of a '-' (minus) at the start of one line. Thanks, Antonio include/use-case.h | 57 +++++++++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/include/use-case.h b/include/use-case.h index 9aac6e2..8911645 100644 --- a/include/use-case.h +++ b/include/use-case.h @@ -192,20 +192,21 @@ int snd_use_case_free_list(const char *list[], int items); * \return Number of list entries if success, otherwise a negative error code * * Defined identifiers: - * NULL - get card list - * (in pair cardname+comment) - * _verbs - get verb list - * (in pair verb+comment) - * _devices[/{verb}] - get list of supported devices - * (in pair device+comment) - * _modifiers[/{verb}]- get list of supported modifiers - * (in pair modifier+comment) - * TQ[/{verb}] - get list of TQ identifiers - * _enadevs - get list of enabled devices - * _enamods - get list of enabled modifiers + * - NULL - get card list + * (in pair cardname+comment) + * - _verbs - get verb list + * (in pair verb+comment) + * - _devices[/{verb}] - get list of supported devices + * (in pair device+comment) + * - _modifiers[/{verb}] - get list of supported modifiers + * (in pair modifier+comment) + * - TQ[/{verb}] - get list of TQ identifiers + * - _enadevs - get list of enabled devices + * - _enamods - get list of enabled modifiers + * + * - _supporteddevs/{modifier}|{device}[/{verb}] - list of supported devices + * - _conflictingdevs/{modifier}|{device}[/{verb}] - list of conflicting devices * - * _supporteddevs/{modifier}|{device}[/{verb}] - list of supported devices - * _conflictingdevs/{modifier}|{device}[/{verb}] - list of conflicting devices * Note that at most one of the supported/conflicting devs lists has * any entries, and when neither is present, all devices are supported. * @@ -331,8 +332,8 @@ int snd_use_case_get(snd_use_case_mgr_t *uc_mgr, * \return Zero if success, otherwise a negative error code * * Known identifiers: - * _devstatus/{device} - return status for given device - * _modstatus/{modifier} - return status for given modifier + * - _devstatus/{device} - return status for given device + * - _modstatus/{modifier} - return status for given modifier */ int snd_use_case_geti(snd_use_case_mgr_t *uc_mgr, const char *identifier, @@ -346,19 +347,19 @@ int snd_use_case_geti(snd_use_case_mgr_t *uc_mgr, * \return Zero if success, otherwise a negative error code * * Known identifiers: - * _verb - set current verb = value - * _enadev - enable given device = value - * _disdev - disable given device = value - * _swdev/{old_device} - new_device = value - * - disable old_device and then enable new_device - * - if old_device is not enabled just return - * - check transmit sequence firstly - * _enamod - enable given modifier = value - * _dismod - disable given modifier = value - * _swmod/{old_modifier} - new_modifier = value - * - disable old_modifier and then enable new_modifier - * - if old_modifier is not enabled just return - * - check transmit sequence firstly + * - _verb - set current verb = value + * - _enadev - enable given device = value + * - _disdev - disable given device = value + * - _swdev/{old_device} - new_device = value + * - disable old_device and then enable new_device + * - if old_device is not enabled just return + * - check transmit sequence firstly + * - _enamod - enable given modifier = value + * - _dismod - disable given modifier = value + * - _swmod/{old_modifier} - new_modifier = value + * - disable old_modifier and then enable new_modifier + * - if old_modifier is not enabled just return + * - check transmit sequence firstly */ int snd_use_case_set(snd_use_case_mgr_t *uc_mgr, const char *identifier, -- 2.9.3

2 1

[alsa-devel] [alsa-lib][PATCH] ucm: fix crash when calling snd_use_case_geti() with no device or modifier
by Antonio Ospite 29 Sep '16

29 Sep '16

When calling snd_use_case_geti(uc_mgr, "_devstatus", &lvalue) the code ends up calling device_status(uc_mgr, NULL), which result in a crash in strcmp(dev->name, NULL), when there are enabled devices. This happens because snd_use_case_geti() allows a "_devstatus" identifier even if it's only supposed to allow the form "_devstatus/{device}". So check that the device name is not null. The same issue occurs with "_modstatus", this change fixes that as well. Signed-off-by: Antonio Ospite <ao2(a)ao2.it> --- Hi, the bug can be reproduced with a command like this: # alsaucm -n -b - <<EOM open bytcr-rt5640 reset set _verb HiFi set _device Speaker geti _devstatus EOM Segmentation fault I decided to add the check once per command instead of doing this: @@ -1525,7 +1525,8 @@ int snd_use_case_geti(snd_use_case_mgr_t *uc_mgr, goto __end; } } else { - str = NULL; + err = -EINVAL; + goto __end; } because the function body seems to be prepared to accept other forms of identifiers, possibly even without a "prefix/suffix" structure. Ciao ciao, Antonio P.S. the source code in src/ucm has a mixed indentation style of TABs and spaces, would you accept a patch to uniform the style? src/ucm/main.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/ucm/main.c b/src/ucm/main.c index 24d9510..d5e418e 100644 --- a/src/ucm/main.c +++ b/src/ucm/main.c @@ -1528,12 +1528,20 @@ int snd_use_case_geti(snd_use_case_mgr_t *uc_mgr, str = NULL; } if (check_identifier(identifier, "_devstatus")) { + if(!str) { + err = -EINVAL; + goto __end; + } err = device_status(uc_mgr, str); if (err >= 0) { *value = err; err = 0; } } else if (check_identifier(identifier, "_modstatus")) { + if(!str) { + err = -EINVAL; + goto __end; + } err = modifier_status(uc_mgr, str); if (err >= 0) { *value = err; -- 2.9.3

2 1

[alsa-devel] [PATCH v2 0/5] ASOC: fix sparse warnings
by Takashi Sakamoto 29 Sep '16

29 Sep '16

Hi, This patchset updates my previous one, and for Linux 4.8-rc8. http://mailman.alsa-project.org/pipermail/alsa-devel/2016-July/110466.html This is to fix some sparse warnings in ALSA SoC part. Below items are going to be fixed: * fix a condition statement with a logical operation * purge old way to initialize array * complement missing 'static' and 'const' qualifier for file local symbols Takashi Sakamoto (5): ASOC: da7219: fix inappropriate condition statement ASOC: sst-bxt-rt298: fix obsoleted initializers for array ASOC: sst-bxt-da7219_max98357a: fix obsoleted initializers for array ASOC: rt5616: add static qualifier for file local symbols ASOC: tpa6130a2: add static qualifier for file local symbols sound/soc/codecs/da7219.c | 2 +- sound/soc/codecs/rt5616.c | 4 ++-- sound/soc/codecs/tpa6130a2.c | 2 +- sound/soc/intel/boards/bxt_da7219_max98357a.c | 12 ++++++------ sound/soc/intel/boards/bxt_rt298.c | 14 +++++++------- 5 files changed, 17 insertions(+), 17 deletions(-) -- 2.7.4

2 10

[alsa-devel] [PATCH 1/2] ASoC: cs4341: Add driver for CS4341 CODEC
by Alexander Shiyan 28 Sep '16

28 Sep '16

Initial commit of the Cirrus Logic CS4341. This is a very simple, playback only, stereo DAC. Signed-off-by: Alexander Shiyan <shc_work(a)mail.ru> --- sound/soc/codecs/Kconfig | 7 ++ sound/soc/codecs/Makefile | 1 + sound/soc/codecs/cs4341.c | 281 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 289 insertions(+) create mode 100644 sound/soc/codecs/cs4341.c diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 1cd6ab3..9853e79 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -458,6 +458,13 @@ config SND_SOC_CS42XX8_I2C select SND_SOC_CS42XX8 select REGMAP_I2C +config SND_SOC_CS4341 + tristate "Cirrus Logic CS4341 CODEC" + depends on SPI_MASTER + select REGMAP_SPI + help + Enable support for Cirrus Logic (Crystal) CS4341 CODEC. + # Cirrus Logic CS4349 HiFi DAC config SND_SOC_CS4349 tristate "Cirrus Logic CS4349 CODEC" diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index 58036af..f699105 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -50,6 +50,7 @@ snd-soc-cs4271-i2c-objs := cs4271-i2c.o snd-soc-cs4271-spi-objs := cs4271-spi.o snd-soc-cs42xx8-objs := cs42xx8.o snd-soc-cs42xx8-i2c-objs := cs42xx8-i2c.o +snd-soc-cs4341-objs := cs4341.o snd-soc-cs4349-objs := cs4349.o snd-soc-cs47l24-objs := cs47l24.o snd-soc-cs53l30-objs := cs53l30.o diff --git a/sound/soc/codecs/cs4341.c b/sound/soc/codecs/cs4341.c new file mode 100644 index 0000000..74907ad --- /dev/null +++ b/sound/soc/codecs/cs4341.c @@ -0,0 +1,281 @@ +/* + * Cirrus Logic CS4341A ALSA SoC Codec Driver + * + * Author: Alexander Shiyan <shc_work(a)mail.ru>, 2016 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + */ + +#include <linux/module.h> +#include <linux/of.h> +#include <linux/regmap.h> +#include <linux/spi/spi.h> + +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/soc.h> +#include <sound/tlv.h> + +/* + * CS4341 registers: + * High byte - SPI chip address (0x20) + * Low byte - Memory Address Pointer + */ +#define CS4341_REG_MODE1 0x00 +#define CS4341_REG_MODE2 0x01 +#define CS4341_REG_MIX 0x02 +#define CS4341_REG_VOLA 0x03 +#define CS4341_REG_VOLB 0x04 + +#define CS4341_MODE2_DIF (7 << 4) +#define CS4341_MODE2_DIF_I2S_24 (0 << 4) +#define CS4341_MODE2_DIF_I2S_16 (1 << 4) +#define CS4341_MODE2_DIF_LJ_24 (2 << 4) +#define CS4341_MODE2_DIF_RJ_24 (3 << 4) +#define CS4341_MODE2_DIF_RJ_16 (5 << 4) + +#define CS4341_VOLX_MUTE (1 << 7) + +struct cs4341_priv { + unsigned int fmt; + struct regmap *regmap; + struct regmap_config regcfg; +}; + +static const struct reg_default cs4341_reg_defaults[] = { + { CS4341_REG_MODE1, 0x00 }, + { CS4341_REG_MODE2, 0x82 }, + { CS4341_REG_MIX, 0x49 }, + { CS4341_REG_VOLA, 0x80 }, + { CS4341_REG_VOLB, 0x80 }, +}; + +static bool cs4341_reg_readable(struct device *dev, unsigned int reg) +{ + return false; +} + +static int cs4341_set_fmt(struct snd_soc_dai *dai, unsigned int format) +{ + struct snd_soc_codec *codec = dai->codec; + struct cs4341_priv *cs4341 = snd_soc_codec_get_drvdata(codec); + + switch (format & SND_SOC_DAIFMT_MASTER_MASK) { + case SND_SOC_DAIFMT_CBS_CFS: + break; + default: + goto fmt_err; + } + + switch (format & SND_SOC_DAIFMT_INV_MASK) { + case SND_SOC_DAIFMT_NB_NF: + break; + default: + goto fmt_err; + } + + switch (format & SND_SOC_DAIFMT_FORMAT_MASK) { + case SND_SOC_DAIFMT_I2S: + case SND_SOC_DAIFMT_LEFT_J: + case SND_SOC_DAIFMT_RIGHT_J: + cs4341->fmt = format & SND_SOC_DAIFMT_FORMAT_MASK; + return 0; + default: + break; + } + +fmt_err: + dev_err(codec->dev, "Invalid DAI format 0x%08x\n", format); + + return -EINVAL; +} + +static int cs4341_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params, + struct snd_soc_dai *dai) +{ + struct snd_soc_codec *codec = dai->codec; + struct cs4341_priv *cs4341 = snd_soc_codec_get_drvdata(codec); + int bits24 = 0; + + switch (params_format(params)) { + case SNDRV_PCM_FORMAT_S24_LE: + bits24 = 1; + break; + case SNDRV_PCM_FORMAT_S16_LE: + break; + default: + dev_err(codec->dev, "Unsupported PCM format\n"); + return -EINVAL; + } + + switch (cs4341->fmt) { + case SND_SOC_DAIFMT_I2S: + snd_soc_update_bits(codec, CS4341_REG_MODE2, CS4341_MODE2_DIF, + bits24 ? CS4341_MODE2_DIF_I2S_24 : + CS4341_MODE2_DIF_I2S_16); + break; + case SND_SOC_DAIFMT_LEFT_J: + snd_soc_update_bits(codec, CS4341_REG_MODE2, CS4341_MODE2_DIF, + CS4341_MODE2_DIF_LJ_24); + break; + case SND_SOC_DAIFMT_RIGHT_J: + snd_soc_update_bits(codec, CS4341_REG_MODE2, CS4341_MODE2_DIF, + bits24 ? CS4341_MODE2_DIF_RJ_24 : + CS4341_MODE2_DIF_RJ_16); + break; + default: + dev_err(codec->dev, "Unsupported DAI format\n"); + return -EINVAL; + } + + return 0; +} + +static int cs4341_digital_mute(struct snd_soc_dai *dai, int mute) +{ + struct snd_soc_codec *codec = dai->codec; + int ret; + + ret = snd_soc_update_bits(codec, CS4341_REG_VOLA, CS4341_VOLX_MUTE, + mute ? CS4341_VOLX_MUTE : 0); + if (ret < 0) + return ret; + + return snd_soc_update_bits(codec, CS4341_REG_VOLB, CS4341_VOLX_MUTE, + mute ? CS4341_VOLX_MUTE : 0); +} + +static DECLARE_TLV_DB_SCALE(out_tlv, -9000, 100, 0); + +static const char *deemph[] = { + "Disabled", "44.1 kHz", "48 kHz", "32 kHz", +}; + +static const struct soc_enum deemph_enum = + SOC_ENUM_SINGLE(CS4341_REG_MODE2, 2, 4, deemph); + +static const char *srzc[] = { + "Immediate", "Zero Cross", "Soft Ramp", "SR on ZC", +}; + +static const struct soc_enum srzc_enum = + SOC_ENUM_SINGLE(CS4341_REG_MIX, 5, 4, srzc); + + +static const struct snd_soc_dapm_widget cs4341_dapm_widgets[] = { + SND_SOC_DAPM_DAC("HiFi DAC", NULL, SND_SOC_NOPM, 0, 0), + SND_SOC_DAPM_OUTPUT("OutA"), + SND_SOC_DAPM_OUTPUT("OutB"), +}; + +static const struct snd_soc_dapm_route cs4341_routes[] = { + {"OutA", NULL, "HiFi DAC"}, + {"OutB", NULL, "HiFi DAC"}, + {"DAC Playback", NULL, "OutA"}, + {"DAC Playback", NULL, "OutB"}, +}; + +static const struct snd_kcontrol_new cs4341_controls[] = { + SOC_DOUBLE_R_TLV("Master Playback Volume", + CS4341_REG_VOLA, CS4341_REG_VOLB, 0, 90, 1, out_tlv), + SOC_ENUM("De-Emphasis Control", deemph_enum), + SOC_ENUM("Soft Ramp Zero Cross Control", srzc_enum), + SOC_SINGLE("Auto-Mute Switch", CS4341_REG_MODE2, 7, 1, 0), + SOC_SINGLE("Popguard Transient Control", CS4341_REG_MODE2, 1, 1, 0), +}; + +static const struct snd_soc_dai_ops cs4341_dai_ops = { + .set_fmt = cs4341_set_fmt, + .hw_params = cs4341_hw_params, + .digital_mute = cs4341_digital_mute, +}; + +static struct snd_soc_dai_driver cs4341_dai = { + .name = "cs4341a-hifi", + .symmetric_rates = 1, + .playback = { + .stream_name = "DAC Playback", + .channels_min = 1, + .channels_max = 2, + .rates = SNDRV_PCM_RATE_8000_96000, + .formats = SNDRV_PCM_FMTBIT_S16_LE | + SNDRV_PCM_FMTBIT_S24_LE, + }, + .ops = &cs4341_dai_ops, +}; + +static struct snd_soc_codec_driver soc_codec_cs4341 = { + .dapm_widgets = cs4341_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(cs4341_dapm_widgets), + .dapm_routes = cs4341_routes, + .num_dapm_routes = ARRAY_SIZE(cs4341_routes), + .controls = cs4341_controls, + .num_controls = ARRAY_SIZE(cs4341_controls), +}; + +static int cs4341_spi_probe(struct spi_device *spi) +{ + struct cs4341_priv *cs4341; + int i, ret; + + cs4341 = devm_kzalloc(&spi->dev, sizeof(*cs4341), GFP_KERNEL); + if (!cs4341) + return -ENOMEM; + + spi->bits_per_word = spi->bits_per_word ? : 8; + spi->max_speed_hz = spi->max_speed_hz ? : 6000000; + ret = spi_setup(spi); + if (ret) + return ret; + + cs4341->regcfg.reg_bits = 16; + cs4341->regcfg.val_bits = 8; + cs4341->regcfg.write_flag_mask = 0x20; + cs4341->regcfg.max_register = CS4341_REG_VOLB; + cs4341->regcfg.cache_type = REGCACHE_FLAT; + cs4341->regcfg.readable_reg = cs4341_reg_readable; + cs4341->regcfg.reg_defaults = cs4341_reg_defaults; + cs4341->regcfg.num_reg_defaults = ARRAY_SIZE(cs4341_reg_defaults); + cs4341->regmap = devm_regmap_init_spi(spi, &cs4341->regcfg); + if (IS_ERR(cs4341->regmap)) + return PTR_ERR(cs4341->regmap); + + spi_set_drvdata(spi, cs4341); + + for (i = 0; i < ARRAY_SIZE(cs4341_reg_defaults); i++) + regmap_write(cs4341->regmap, cs4341_reg_defaults[i].reg, + cs4341_reg_defaults[i].def); + + return snd_soc_register_codec(&spi->dev, &soc_codec_cs4341, &cs4341_dai, 1); +} + +static int cs4341_spi_remove(struct spi_device *spi) +{ + snd_soc_unregister_codec(&spi->dev); + + return 0; +} + +static const struct of_device_id __maybe_unused cs4341_dt_ids[] = { + { .compatible = "cirrus,cs4341a", }, + { } +}; +MODULE_DEVICE_TABLE(of, cs4341_dt_ids); + +static struct spi_driver cs4341_spi_driver = { + .driver = { + .name = "cs4341", + .of_match_table = of_match_ptr(cs4341_dt_ids), + }, + .probe = cs4341_spi_probe, + .remove = cs4341_spi_remove, +}; +module_spi_driver(cs4341_spi_driver); + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Alexander Shiyan <shc_work(a)mail.ru>"); +MODULE_DESCRIPTION("Cirrus Logic CS4341 ALSA SoC Codec Driver"); -- 2.7.3

3 5

[alsa-devel] [PATCH 1/5] ASoC: fsl_asrc: use flat regmap cache
by Marek Vasut 28 Sep '16

28 Sep '16

Same as commit ce492b3b8f99cf9d2f807ec22d8805c996a09503 Subject: drm/fsl-dcu: use flat regmap cache Using flat regmap cache instead of RB-tree to avoid the following lockdep warning on driver load: WARNING: CPU: 0 PID: 1 at kernel/locking/lockdep.c:2871 lockdep_trace_alloc+0x104/0x128 DEBUG_LOCKS_WARN_ON(irqs_disabled_flags(flags)) The RB-tree regmap cache needs to allocate new space on first writes. However, allocations in an atomic context (e.g. when a spinlock is held) are not allowed. The function regmap_write calls map->lock, which acquires a spinlock in the fast_io case. Since the driver uses MMIO, the regmap bus of type regmap_mmio is being used which has fast_io set to true. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Fabio Estevam <fabio.estevam(a)nxp.com> Cc: Liam Girdwood <lgirdwood(a)gmail.com> Cc: Mark Brown <broonie(a)kernel.org> Cc: Nicolin Chen <nicoleotsuka(a)gmail.com> Cc: Timur Tabi <timur(a)tabi.org> Cc: Xiubo Li <Xiubo.Lee(a)gmail.com> --- sound/soc/fsl/fsl_asrc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/fsl/fsl_asrc.c b/sound/soc/fsl/fsl_asrc.c index b7157ce..1d82f68 100644 --- a/sound/soc/fsl/fsl_asrc.c +++ b/sound/soc/fsl/fsl_asrc.c @@ -726,7 +726,7 @@ static const struct regmap_config fsl_asrc_regmap_config = { .readable_reg = fsl_asrc_readable_reg, .volatile_reg = fsl_asrc_volatile_reg, .writeable_reg = fsl_asrc_writeable_reg, - .cache_type = REGCACHE_RBTREE, + .cache_type = REGCACHE_FLAT, }; /** -- 2.9.3

5 30