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

[alsa-devel] [PATCH] Add rudimentary DT support to SSM2518 codec driver
by Ricard Wanderlof 13 Aug '15

13 Aug '15

For some reason, the SSM2518 codec driver has device tree bindings specified (Documentation/devicetree/bindings/sound/ssm2518.txt) but the actual driver doesn't seem to support DT. This patch adds rudimentary support for the compatible property so that the driver can be used in a DT based setup. --- sound/soc/codecs/ssm2518.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/ssm2518.c b/sound/soc/codecs/ssm2518.c index 67ea55a..ecf9996 100644 --- a/sound/soc/codecs/ssm2518.c +++ b/sound/soc/codecs/ssm2518.c @@ -811,6 +810,14 @@ static int ssm2518_i2c_remove(struct i2c_client *client) return 0; } +#ifdef CONFIG_OF +static const struct of_device_id ssm2518_dt_ids[] = { + { .compatible = "adi,ssm2518", }, + { } +}; +MODULE_DEVICE_TABLE(of, ssm2518_dt_ids); +#endif + static const struct i2c_device_id ssm2518_i2c_ids[] = { { "ssm2518", 0 }, { } @@ -821,6 +828,9 @@ static struct i2c_driver ssm2518_driver = { .driver = { .name = "ssm2518", .owner = THIS_MODULE, +#ifdef CONFIG_OF + .of_match_table = of_match_ptr(ssm2518_dt_ids), +#endif }, .probe = ssm2518_i2c_probe, .remove = ssm2518_i2c_remove, -- 1.7.10.4 -- Ricard Wolf Wanderlöf ricardw(at)axis.com Axis Communications AB, Lund, Sweden www.axis.com Phone +46 46 272 2016 Fax +46 46 13 61 30

1 0

[alsa-devel] [PATCH 2/2] topology: Add API to set a vendor specific version number
by mengdong.lin＠intel.com 13 Aug '15

13 Aug '15

From: Mengdong Lin <mengdong.lin(a)intel.com> This vendor-specific version number is optional. It will be written to the 'version' field of each block header of the binary toplogy data file. The vendor driver can check this number for further processing in kernel. The topology ABI version number is still stored in the 'abi' field of block headers. Signed-off-by: Mengdong Lin <mengdong.lin(a)intel.com> diff --git a/include/topology.h b/include/topology.h index 6ff8c5f..9b84bd9 100644 --- a/include/topology.h +++ b/include/topology.h @@ -690,6 +690,14 @@ int snd_tplg_build(snd_tplg_t *tplg, const char *outfile); */ int snd_tplg_set_manifest_data(snd_tplg_t *tplg, const void *data, int len); +/** + * \brief Set an optional vendor specific version number. + * \param tplg Topology instance. + * \param version Vendor specific version number. + * \return Zero on success, otherwise a negative error code + */ +int snd_tplg_set_version(snd_tplg_t *tplg, unsigned int version); + /* \} */ #ifdef __cplusplus diff --git a/src/topology/builder.c b/src/topology/builder.c index 3bccd44..2f01137 100644 --- a/src/topology/builder.c +++ b/src/topology/builder.c @@ -89,7 +89,7 @@ static int write_data_block(snd_tplg_t *tplg, int size, int tplg_type, /* write the header for this block */ ret = write_block_header(tplg, tplg_type, 0, - SND_SOC_TPLG_ABI_VERSION, 0, size, 1); + tplg->version, 0, size, 1); if (ret < 0) { SNDERR("error: failed to write %s block %d\n", obj_name, ret); return ret; @@ -125,7 +125,7 @@ static int write_elem_block(snd_tplg_t *tplg, } ret = write_block_header(tplg, tplg_type, vendor_type, - SND_SOC_TPLG_ABI_VERSION, 0, size, count); + tplg->version, 0, size, count); if (ret < 0) { SNDERR("error: failed to write %s block %d\n", obj_name, ret); @@ -243,7 +243,7 @@ static int write_manifest_data(snd_tplg_t *tplg) /* write the header for this block */ ret = write_block_header(tplg, SND_SOC_TPLG_TYPE_MANIFEST, 0, - SND_SOC_TPLG_ABI_VERSION, 0, + tplg->version, 0, sizeof(tplg->manifest) + tplg->manifest.priv.size, 1); if (ret < 0) { SNDERR("error: failed to write manifest block %d\n", ret); diff --git a/src/topology/parser.c b/src/topology/parser.c index 7ca244c..c0ab5e4 100644 --- a/src/topology/parser.c +++ b/src/topology/parser.c @@ -362,6 +362,13 @@ int snd_tplg_set_manifest_data(snd_tplg_t *tplg, const void *data, int len) return 0; } +int snd_tplg_set_version(snd_tplg_t *tplg, unsigned int version) +{ + tplg->version = version; + + return 0; +} + void snd_tplg_verbose(snd_tplg_t *tplg, int verbose) { tplg->verbose = verbose; -- 1.9.1

1 0

[alsa-devel] [PATCH 1/2] topology: Fix missing return value for snd_tplg_set_manifest_data()
by mengdong.lin＠intel.com 13 Aug '15

13 Aug '15

From: Mengdong Lin <mengdong.lin(a)intel.com> Signed-off-by: Mengdong Lin <mengdong.lin(a)intel.com> diff --git a/src/topology/parser.c b/src/topology/parser.c index ca7de06..7ca244c 100644 --- a/src/topology/parser.c +++ b/src/topology/parser.c @@ -358,6 +358,8 @@ int snd_tplg_set_manifest_data(snd_tplg_t *tplg, const void *data, int len) { tplg->manifest.priv.size = len; tplg->manifest_pdata = data; + + return 0; } void snd_tplg_verbose(snd_tplg_t *tplg, int verbose) -- 1.9.1

1 0

[alsa-devel] [PATCH] ALSA: hda - Fix the white noise on Dell laptop
by woodrow.shen＠canonical.com 13 Aug '15

13 Aug '15

From: Woodrow Shen <woodrow.shen(a)canonical.com> Dell laptop causes the white noise by login screen and headphone, and the fixup function ALC292_FIXUP_DISABLE_AAMIX can eliminate this noise. Codec: Realtek ALC3235 Vendor Id: 0x10ec0293 Subsystem Id: 0x102806db Cc: <stable(a)vger.kernel.org> BugLink: https://bugs.launchpad.net/bugs/1484334 Signed-off-by: Woodrow Shen <woodrow.shen(a)canonical.com> --- 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 0e3fe01..1de427a 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -5190,6 +5190,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x1028, 0x06d9, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1028, 0x06da, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1028, 0x06de, "Dell", ALC292_FIXUP_DISABLE_AAMIX), + SND_PCI_QUIRK(0x1028, 0x06db, "Dell", ALC292_FIXUP_DISABLE_AAMIX), SND_PCI_QUIRK(0x1028, 0x164a, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1028, 0x164b, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC2), -- 2.1.4

2 1

[alsa-devel] M-Audio transit: illegal sync type and noise on startup?
by Pierre-Louis Bossart 13 Aug '15

13 Aug '15

While playing with my M-Audio Transit USB device (0763:2006) I saw a synchronization type that doesn't exist in the USB audio class. I get audio out but often the start is garbled with white noise and cracks. Wondering what's going on. more /proc/asound/card1/stream0 M-Audio Transit USB at usb-0000:00:14.0-2, full speed : USB Audio Playback: Status: Stop Interface 1 Altset 1 Format: S24_3LE Channels: 2 Endpoint: 3 OUT (ADAPTIVE) Rates: 48001 - 96000 (continuous)u Interface 1 Altset 2 Format: S24_3LE Channels: 2 Endpoint: 3 OUT (NONE) <<<<<<< illegal Rates: 8000 - 48000 (continuous) Interface 1 Altset 3 Format: S16_LE Channels: 2 Endpoint: 3 OUT (ASYNC) Rates: 8000 - 48000 (continuous) The only definitions in the spec are Asynchronous, Adaptive or Synchronous... lsusb tells me that there seems to be a synch endpoint for this setting: Endpoint Descriptor: bLength 9 bDescriptorType 5 bEndpointAddress 0x03 EP 3 OUT bmAttributes 1 Transfer Type Isochronous Synch Type None Usage Type Data wMaxPacketSize 0x0126 1x 294 bytes bInterval 1 bRefresh 0 bSynchAddress 131 AudioControl Endpoint Descriptor: bLength 7 bDescriptorType 37 bDescriptorSubtype 1 (EP_GENERAL) bmAttributes 0x01 Sampling Frequency bLockDelayUnits 1 Milliseconds wLockDelay 100 Milliseconds Endpoint Descriptor: bLength 9 bDescriptorType 5 bEndpointAddress 0x83 EP 3 IN bmAttributes 1 Transfer Type Isochronous Synch Type None Usage Type Data wMaxPacketSize 0x0003 1x 3 bytes bInterval 1 bRefresh 2 bSynchAddress 0 I couldn't figure out what the code does in this case. I didn't find any sync URBs being retired so wondering if this is considered as a synchronous or asynchronous endpoint based on the additional sync endpoint? Any idea on how to debug further? It looks like there could be a second error in the descriptors: if this is a synchronous endpoint then the sync endpoint is meaningless, and if it is asynchronous then the information on locking time is irrelevant... Regarding the noise on startup, should a delay be inserted after the mode is set? the spec recommends that the host sends silence periods for adaptive and synchronous modes. I see a set of mdelays being added in the quirks, should a new one be added? Thanks for any pointers, -Pierre

1 0

[alsa-devel] Questions about ASoC driver implementation
by Matt Campbell 12 Aug '15

12 Aug '15

Hi All, I'm diving into adding support for a new codec (AK4621) targeting IMX6 SoC and as this is my first dive into ALSA driver code (and first deep dive in to Linux driver development) I've come up with a few questions. I've done a lot of digging in available documentation as well as reading a lot of code, but some things remain unclear. First, I'm a little confused with what appears to be inconsistent terminology. The SoC overview.txt lists three types of component drivers: codec, platform and machine. However, in the code there are four types of snd_soc_register_* functions: card, platform, codec and component. From looking at the underlying structs and how these are used in existing code this is my best guess but please correct me if I'm wrong: codec -> snd_soc_register_codec machine -> snd_soc_register_card platform -> snd_soc_register_component and snd_soc_register_platform? (not sure about this, from what I can gather at some point there was an API switch to using component rather than platforms for the DAIs) My second question is around adding support for an amplifier external to the codec. The amplifier is a PGA controlled over SPI. One possible way I can see to adding this is to create a SPI based codec driver for the PGA that exposes an ALSA control for the gain level and give it a dummy DAI then add it to the card as an aux_dev. This feels a little kludgy as the PGA isn't a perfect fit for the codec class. Another option would be to have PGA driver separate from the ASoC framework, add the controls for the gain level directly in the ASoC card and put the glue code to interact with the device in the machine driver. This feels somewhat better to me, but has two problems. First, I don't know the best way to interact with the external PGA driver from the machine driver. Second, this leaves the PGA driver outside of the ASoC framework, If it was in ASoC it could be useful for others that come across this chip when writing machine drivers. Sorry for the long email, but there has been a bit of a learning curve up front. I tried to do my best with documentation and code reading before coming to the mailing list. I'll greatly appreciate any help the community can offer and look forward to contributing to the ALSA project. Best, ~Matt

2 2

[alsa-devel] [PATCH v2 1/4] drm/i915: Add audio set_ncts callback
by libin.yang＠intel.com 12 Aug '15

12 Aug '15

From: Libin Yang <libin.yang(a)intel.com> Add the set_ncts callback. With the callback, audio driver can trigger i915 driver to set the proper N/CTS based on different sample rates. Signed-off-by: Libin Yang <libin.yang(a)intel.com> --- include/drm/i915_component.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/drm/i915_component.h b/include/drm/i915_component.h index c9a8b64..7305881 100644 --- a/include/drm/i915_component.h +++ b/include/drm/i915_component.h @@ -33,6 +33,8 @@ struct i915_audio_component { void (*put_power)(struct device *); void (*codec_wake_override)(struct device *, bool enable); int (*get_cdclk_freq)(struct device *); + int (*set_ncts)(struct device *, int port, int dev_entry, + int rate); } *ops; }; -- 1.9.1

5 35

[alsa-devel] [PATCH v3 0/3] topology: Add external API for building topology data
by Liam Girdwood 12 Aug '15

12 Aug '15

Currently we can build topology binary data files from topology text files. However it is sometimes necessary for DSP FW vendors to build topology binary data within a toolset and create topology binary data directly from within vendor tools. This series adds an API to the alsa-lib topology core so that vendor tools can create topology data directly. Changes since V2:- o Fixed elem memory leaks on error handling paths o Fixed indentation. o Moved container_of and ARRAY_SIZE to local.h o remove use of unlink() and fixed file permissions. Changes since V1:- o Split out refactoring of OBJECT_TYPE to SND_TPLG_TYPE_ o Removed inclusing of type_compat.h from asoc.h Liam Girdwood (1): core: add convenience macros to local.h Mengdong Lin (2): topology: Add C templates structure for building topology from C programs topology: A API calls to directly build topology data from templates include/local.h | 7 ++ include/topology.h | 202 ++++++++++++++++++++++++++++++++ src/topology/ctl.c | 292 ++++++++++++++++++++++++++++++++++++++++++++++ src/topology/dapm.c | 183 ++++++++++++++++++++++++++--- src/topology/elem.c | 17 +++ src/topology/parser.c | 59 +++++++++- src/topology/tplg_local.h | 26 ++--- 7 files changed, 749 insertions(+), 37 deletions(-) -- 2.1.4

2 4

[alsa-devel] [PATCH v3] ASoC: fsl-sai: add 32 bit word length support
by Zidan Wang 11 Aug '15

11 Aug '15

Add 32 bit word length support. There are no code changes required in the SAI driver since it has already wirten the word width to the corresponding register. Signed-off-by: Zidan Wang <zidan.wang(a)freescale.com> --- sound/soc/fsl/fsl_sai.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/fsl/fsl_sai.h b/sound/soc/fsl/fsl_sai.h index 0662809..d137290 100644 --- a/sound/soc/fsl/fsl_sai.h +++ b/sound/soc/fsl/fsl_sai.h @@ -13,7 +13,8 @@ #define FSL_SAI_FORMATS (SNDRV_PCM_FMTBIT_S16_LE |\ SNDRV_PCM_FMTBIT_S20_3LE |\ - SNDRV_PCM_FMTBIT_S24_LE) + SNDRV_PCM_FMTBIT_S24_LE |\ + SNDRV_PCM_FMTBIT_S32_LE) /* SAI Register Map Register */ #define FSL_SAI_TCSR 0x00 /* SAI Transmit Control */ -- 1.9.1

3 2

[alsa-devel] [PATCH] ASoC: rt5640: fix line out no sound issue
by John Lin 11 Aug '15

11 Aug '15

The power for line out was not turned on when line out is enabled. So we add "LOUT amp" widget to turn on the power for line out. Signed-off-by: John Lin <john.lin(a)realtek.com> --- sound/soc/codecs/rt5640.c | 40 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 37 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c index 7d488d8..3c5b496 100644 --- a/sound/soc/codecs/rt5640.c +++ b/sound/soc/codecs/rt5640.c @@ -985,6 +985,35 @@ static int rt5640_hp_event(struct snd_soc_dapm_widget *w, return 0; } +static int rt5640_lout_event(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *kcontrol, int event) +{ + struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); + + switch (event) { + case SND_SOC_DAPM_POST_PMU: + hp_amp_power_on(codec); + snd_soc_update_bits(codec, RT5640_PWR_ANLG1, + RT5640_PWR_LM, RT5640_PWR_LM); + snd_soc_update_bits(codec, RT5640_OUTPUT, + RT5640_L_MUTE | RT5640_R_MUTE, 0); + break; + + case SND_SOC_DAPM_PRE_PMD: + snd_soc_update_bits(codec, RT5640_OUTPUT, + RT5640_L_MUTE | RT5640_R_MUTE, + RT5640_L_MUTE | RT5640_R_MUTE); + snd_soc_update_bits(codec, RT5640_PWR_ANLG1, + RT5640_PWR_LM, 0); + break; + + default: + return 0; + } + + return 0; +} + static int rt5640_hp_power_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) { @@ -1180,13 +1209,16 @@ static const struct snd_soc_dapm_widget rt5640_dapm_widgets[] = { 0, rt5640_spo_l_mix, ARRAY_SIZE(rt5640_spo_l_mix)), SND_SOC_DAPM_MIXER("SPOR MIX", SND_SOC_NOPM, 0, 0, rt5640_spo_r_mix, ARRAY_SIZE(rt5640_spo_r_mix)), - SND_SOC_DAPM_MIXER("LOUT MIX", RT5640_PWR_ANLG1, RT5640_PWR_LM_BIT, 0, + SND_SOC_DAPM_MIXER("LOUT MIX", SND_SOC_NOPM, 0, 0, rt5640_lout_mix, ARRAY_SIZE(rt5640_lout_mix)), SND_SOC_DAPM_SUPPLY_S("Improve HP Amp Drv", 1, SND_SOC_NOPM, 0, 0, rt5640_hp_power_event, SND_SOC_DAPM_POST_PMU), SND_SOC_DAPM_PGA_S("HP Amp", 1, SND_SOC_NOPM, 0, 0, rt5640_hp_event, SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU), + SND_SOC_DAPM_PGA_S("LOUT amp", 1, SND_SOC_NOPM, 0, 0, + rt5640_lout_event, + SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU), SND_SOC_DAPM_SUPPLY("HP L Amp", RT5640_PWR_ANLG1, RT5640_PWR_HP_L_BIT, 0, NULL, 0), SND_SOC_DAPM_SUPPLY("HP R Amp", RT5640_PWR_ANLG1, @@ -1501,8 +1533,10 @@ static const struct snd_soc_dapm_route rt5640_dapm_routes[] = { {"HP R Playback", "Switch", "HP Amp"}, {"HPOL", NULL, "HP L Playback"}, {"HPOR", NULL, "HP R Playback"}, - {"LOUTL", NULL, "LOUT MIX"}, - {"LOUTR", NULL, "LOUT MIX"}, + + {"LOUT amp", NULL, "LOUT MIX"}, + {"LOUTL", NULL, "LOUT amp"}, + {"LOUTR", NULL, "LOUT amp"}, }; static const struct snd_soc_dapm_route rt5640_specific_dapm_routes[] = { -- 1.8.1.1.439.g50a6b54

2 1