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

[alsa-devel] [PATCH 1/4] ASoC: Intel: Clear stored Baytrail DSP DMA pointer before stream start
by Jarkko Nikula 01 Jun '14

01 Jun '14

Stored DSP DMA pointer must be cleared before starting the stream since PCM pointer callback sst_byt_pcm_pointer() can be called before pointer is updated. In that case last position of previous stream was wronly returned. Signed-off-by: Jarkko Nikula <jarkko.nikula(a)linux.intel.com> --- sound/soc/intel/sst-baytrail-pcm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/intel/sst-baytrail-pcm.c b/sound/soc/intel/sst-baytrail-pcm.c index 3af38576e91e..8eab97368ea7 100644 --- a/sound/soc/intel/sst-baytrail-pcm.c +++ b/sound/soc/intel/sst-baytrail-pcm.c @@ -180,6 +180,7 @@ static int sst_byt_pcm_trigger(struct snd_pcm_substream *substream, int cmd) switch (cmd) { case SNDRV_PCM_TRIGGER_START: + pcm_data->hw_ptr = 0; sst_byt_stream_start(byt, pcm_data->stream, 0); break; case SNDRV_PCM_TRIGGER_RESUME: -- 2.0.0.rc2

2 5

[alsa-devel] [PATCH v3] ASoC: cs42l56: Fix new value argument in snd_soc_update_bits calls
by Axel Lin 01 Jun '14

01 Jun '14

The new value argument needs proper shift to match the mask bit fields. Signed-off-by: Axel Lin <axel.lin(a)ingics.com> --- v3: Define CS42L56_MUTE_ALL as 0xff, so all the mask bits will be set. v2: Address Brian's comment in v1. sound/soc/codecs/cs42l56.c | 70 ++++++++++++++++++++-------------------------- sound/soc/codecs/cs42l56.h | 10 ++++--- 2 files changed, 37 insertions(+), 43 deletions(-) diff --git a/sound/soc/codecs/cs42l56.c b/sound/soc/codecs/cs42l56.c index 5bb134b..fdc4bd2 100644 --- a/sound/soc/codecs/cs42l56.c +++ b/sound/soc/codecs/cs42l56.c @@ -763,14 +763,14 @@ static int cs42l56_set_sysclk(struct snd_soc_dai *codec_dai, case CS42L56_MCLK_11P2896MHZ: case CS42L56_MCLK_12MHZ: case CS42L56_MCLK_12P288MHZ: - cs42l56->mclk_div2 = 1; + cs42l56->mclk_div2 = CS42L56_MCLK_DIV2; cs42l56->mclk_prediv = 0; break; case CS42L56_MCLK_22P5792MHZ: case CS42L56_MCLK_24MHZ: case CS42L56_MCLK_24P576MHZ: - cs42l56->mclk_div2 = 1; - cs42l56->mclk_prediv = 1; + cs42l56->mclk_div2 = CS42L56_MCLK_DIV2; + cs42l56->mclk_prediv = CS42L56_MCLK_PREDIV; break; default: return -EINVAL; @@ -844,57 +844,49 @@ static int cs42l56_digital_mute(struct snd_soc_dai *dai, int mute) /* Hit the DSP Mixer first */ snd_soc_update_bits(codec, CS42L56_DSP_MUTE_CTL, CS42L56_ADCAMIX_MUTE_MASK | - CS42L56_ADCBMIX_MUTE_MASK | - CS42L56_PCMAMIX_MUTE_MASK | - CS42L56_PCMBMIX_MUTE_MASK | - CS42L56_MSTB_MUTE_MASK | - CS42L56_MSTA_MUTE_MASK, - CS42L56_MUTE); + CS42L56_ADCBMIX_MUTE_MASK | + CS42L56_PCMAMIX_MUTE_MASK | + CS42L56_PCMBMIX_MUTE_MASK | + CS42L56_MSTB_MUTE_MASK | + CS42L56_MSTA_MUTE_MASK, + CS42L56_MUTE_ALL); /* Mute ADC's */ snd_soc_update_bits(codec, CS42L56_MISC_ADC_CTL, - CS42L56_ADCA_MUTE_MASK | - CS42L56_ADCB_MUTE_MASK, - CS42L56_MUTE); + CS42L56_ADCA_MUTE_MASK | + CS42L56_ADCB_MUTE_MASK, + CS42L56_MUTE_ALL); /* HP And LO */ snd_soc_update_bits(codec, CS42L56_HPA_VOLUME, - CS42L56_HP_MUTE_MASK, - CS42L56_MUTE); + CS42L56_HP_MUTE_MASK, CS42L56_MUTE_ALL); snd_soc_update_bits(codec, CS42L56_HPB_VOLUME, - CS42L56_HP_MUTE_MASK, - CS42L56_MUTE); + CS42L56_HP_MUTE_MASK, CS42L56_MUTE_ALL); snd_soc_update_bits(codec, CS42L56_LOA_VOLUME, - CS42L56_LO_MUTE_MASK, - CS42L56_MUTE); + CS42L56_LO_MUTE_MASK, CS42L56_MUTE_ALL); snd_soc_update_bits(codec, CS42L56_LOB_VOLUME, - CS42L56_LO_MUTE_MASK, - CS42L56_MUTE); - - + CS42L56_LO_MUTE_MASK, CS42L56_MUTE_ALL); } else { snd_soc_update_bits(codec, CS42L56_DSP_MUTE_CTL, CS42L56_ADCAMIX_MUTE_MASK | - CS42L56_ADCBMIX_MUTE_MASK | - CS42L56_PCMAMIX_MUTE_MASK | - CS42L56_PCMBMIX_MUTE_MASK | - CS42L56_MSTB_MUTE_MASK | - CS42L56_MSTA_MUTE_MASK, - CS42L56_UNMUTE); + CS42L56_ADCBMIX_MUTE_MASK | + CS42L56_PCMAMIX_MUTE_MASK | + CS42L56_PCMBMIX_MUTE_MASK | + CS42L56_MSTB_MUTE_MASK | + CS42L56_MSTA_MUTE_MASK, + CS42L56_UNMUTE); + snd_soc_update_bits(codec, CS42L56_MISC_ADC_CTL, - CS42L56_ADCA_MUTE_MASK | - CS42L56_ADCB_MUTE_MASK, - CS42L56_UNMUTE); + CS42L56_ADCA_MUTE_MASK | + CS42L56_ADCB_MUTE_MASK, + CS42L56_UNMUTE); + snd_soc_update_bits(codec, CS42L56_HPA_VOLUME, - CS42L56_HP_MUTE_MASK, - CS42L56_UNMUTE); + CS42L56_HP_MUTE_MASK, CS42L56_UNMUTE); snd_soc_update_bits(codec, CS42L56_HPB_VOLUME, - CS42L56_HP_MUTE_MASK, - CS42L56_UNMUTE); + CS42L56_HP_MUTE_MASK, CS42L56_UNMUTE); snd_soc_update_bits(codec, CS42L56_LOA_VOLUME, - CS42L56_LO_MUTE_MASK, - CS42L56_UNMUTE); + CS42L56_LO_MUTE_MASK, CS42L56_UNMUTE); snd_soc_update_bits(codec, CS42L56_LOB_VOLUME, - CS42L56_LO_MUTE_MASK, - CS42L56_UNMUTE); + CS42L56_LO_MUTE_MASK, CS42L56_UNMUTE); } return 0; } diff --git a/sound/soc/codecs/cs42l56.h b/sound/soc/codecs/cs42l56.h index ad2b50a..5025ec9 100644 --- a/sound/soc/codecs/cs42l56.h +++ b/sound/soc/codecs/cs42l56.h @@ -80,19 +80,21 @@ #define CS42L56_PDN_HPB_MASK 0xc0 /* serial port and clk masks */ -#define CS42L56_MASTER_MODE 1 +#define CS42L56_MASTER_MODE 0x40 #define CS42L56_SLAVE_MODE 0 #define CS42L56_MS_MODE_MASK 0x40 -#define CS42L56_SCLK_INV 1 +#define CS42L56_SCLK_INV 0x20 #define CS42L56_SCLK_INV_MASK 0x20 #define CS42L56_SCLK_MCLK_MASK 0x18 +#define CS42L56_MCLK_PREDIV 0x04 #define CS42L56_MCLK_PREDIV_MASK 0x04 +#define CS42L56_MCLK_DIV2 0x02 #define CS42L56_MCLK_DIV2_MASK 0x02 #define CS42L56_MCLK_DIS_MASK 0x01 #define CS42L56_CLK_AUTO_MASK 0x20 #define CS42L56_CLK_RATIO_MASK 0x1f #define CS42L56_DIG_FMT_I2S 0 -#define CS42L56_DIG_FMT_LEFT_J 1 +#define CS42L56_DIG_FMT_LEFT_J 0x08 #define CS42L56_DIG_FMT_MASK 0x08 /* Class H and misc ctl masks */ @@ -116,7 +118,7 @@ #define CS42L56_DEEMPH_MASK 0x40 #define CS42L56_PLYBCK_GANG_MASK 0x10 #define CS42L56_PCM_INV_MASK 0x0c -#define CS42L56_MUTE 1 +#define CS42L56_MUTE_ALL 0xff #define CS42L56_UNMUTE 0 #define CS42L56_ADCAMIX_MUTE_MASK 0x40 #define CS42L56_ADCBMIX_MUTE_MASK 0x80 -- 1.8.3.2

3 2

[alsa-devel] [PATCHv2] ASoC: Intel: Add Baytrail byt-max98090 machine driver
by Jarkko Nikula 01 Jun '14

01 Jun '14

Add machine driver and ACPI probing for Baytrail SST with MAX98090 codec. Jack detect code from Kevin Strasser <kevin.strasser(a)intel.com>, GPIO resolving from Mika Westerberg <mika.westerberg(a)linux.intel.com> and fixes and cleanups from Liam Girdwood <liam.r.girdwood(a)linux.intel.com>. Signed-off-by: Jarkko Nikula <jarkko.nikula(a)linux.intel.com> --- This is for for-next branch since depends on commit f025d3b9c64e("ASoC: jack: Add support for GPIO descriptor defined jack pins"). Or merge topic/gpio or for-next to topic/intel before applying. v2: - Needless DAPM calls removed from init - Using snd_soc_pm_ops for suspend/resume - Using new GPIO descriptors support from ASoC jack - devm_snd_soc_register_card - Bogus Kconfig symbol removed from Makefile - Various cleanups --- sound/soc/intel/Kconfig | 9 ++ sound/soc/intel/Makefile | 2 + sound/soc/intel/byt-max98090.c | 203 +++++++++++++++++++++++++++++++++++++++++ sound/soc/intel/sst-acpi.c | 1 + 4 files changed, 215 insertions(+) create mode 100644 sound/soc/intel/byt-max98090.c diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig index 3c81b3891209..cd3498736e91 100644 --- a/sound/soc/intel/Kconfig +++ b/sound/soc/intel/Kconfig @@ -49,3 +49,12 @@ config SND_SOC_INTEL_BYT_RT5640_MACH help This adds audio driver for Intel Baytrail platform based boards with the RT5640 audio codec. + +config SND_SOC_INTEL_BYT_MAX98090_MACH + tristate "ASoC Audio driver for Intel Baytrail with MAX98090 codec" + depends on SND_SOC_INTEL_SST && X86_INTEL_LPSS + select SND_SOC_INTEL_BAYTRAIL + select SND_SOC_MAX98090 + help + This adds audio driver for Intel Baytrail platform based boards + with the MAX98090 audio codec. diff --git a/sound/soc/intel/Makefile b/sound/soc/intel/Makefile index 0db4e2f336dc..4bfca79a42ba 100644 --- a/sound/soc/intel/Makefile +++ b/sound/soc/intel/Makefile @@ -23,6 +23,8 @@ obj-$(CONFIG_SND_SOC_INTEL_BAYTRAIL) += snd-soc-sst-baytrail-pcm.o # Machine support snd-soc-sst-haswell-objs := haswell.o snd-soc-sst-byt-rt5640-mach-objs := byt-rt5640.o +snd-soc-sst-byt-max98090-mach-objs := byt-max98090.o obj-$(CONFIG_SND_SOC_INTEL_HASWELL_MACH) += snd-soc-sst-haswell.o obj-$(CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH) += snd-soc-sst-byt-rt5640-mach.o +obj-$(CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH) += snd-soc-sst-byt-max98090-mach.o diff --git a/sound/soc/intel/byt-max98090.c b/sound/soc/intel/byt-max98090.c new file mode 100644 index 000000000000..5fc98c64a3f4 --- /dev/null +++ b/sound/soc/intel/byt-max98090.c @@ -0,0 +1,203 @@ +/* + * Intel Baytrail SST MAX98090 machine driver + * Copyright (c) 2014, Intel Corporation. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + */ + +#include <linux/init.h> +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/acpi.h> +#include <linux/device.h> +#include <linux/gpio.h> +#include <linux/gpio/consumer.h> +#include <linux/slab.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/soc.h> +#include <sound/jack.h> +#include "../codecs/max98090.h" + +struct byt_max98090_private { + struct snd_soc_jack jack; +}; + +static const struct snd_soc_dapm_widget byt_max98090_widgets[] = { + SND_SOC_DAPM_HP("Headphone", NULL), + SND_SOC_DAPM_MIC("Headset Mic", NULL), + SND_SOC_DAPM_MIC("Int Mic", NULL), + SND_SOC_DAPM_SPK("Ext Spk", NULL), +}; + +static const struct snd_soc_dapm_route byt_max98090_audio_map[] = { + {"IN34", NULL, "Headset Mic"}, + {"IN34", NULL, "MICBIAS"}, + {"MICBIAS", NULL, "Headset Mic"}, + {"DMICL", NULL, "Int Mic"}, + {"Headphone", NULL, "HPL"}, + {"Headphone", NULL, "HPR"}, + {"Ext Spk", NULL, "SPKL"}, + {"Ext Spk", NULL, "SPKR"}, +}; + +static const struct snd_kcontrol_new byt_max98090_controls[] = { + SOC_DAPM_PIN_SWITCH("Headphone"), + SOC_DAPM_PIN_SWITCH("Headset Mic"), + SOC_DAPM_PIN_SWITCH("Int Mic"), + SOC_DAPM_PIN_SWITCH("Ext Spk"), +}; + +static struct snd_soc_jack_pin hs_jack_pins[] = { + { + .pin = "Headphone", + .mask = SND_JACK_HEADPHONE, + }, + { + .pin = "Headset Mic", + .mask = SND_JACK_MICROPHONE, + }, + { + .pin = "Ext Spk", + .mask = SND_JACK_LINEOUT, + }, + { + .pin = "Int Mic", + .mask = SND_JACK_LINEIN, + }, +}; + +static struct snd_soc_jack_gpio hs_jack_gpios[] = { + { + .name = "hp-gpio", + .idx = 0, + .report = SND_JACK_HEADPHONE | SND_JACK_LINEOUT, + .debounce_time = 200, + }, + { + .name = "mic-gpio", + .idx = 1, + .report = SND_JACK_MICROPHONE | SND_JACK_LINEIN, + .debounce_time = 200, + }, +}; + +static int byt_max98090_init(struct snd_soc_pcm_runtime *runtime) +{ + int ret; + struct snd_soc_codec *codec = runtime->codec; + struct snd_soc_card *card = runtime->card; + struct byt_max98090_private *drv = snd_soc_card_get_drvdata(card); + struct snd_soc_jack *jack = &drv->jack; + + card->dapm.idle_bias_off = true; + + ret = snd_soc_dai_set_sysclk(runtime->codec_dai, + M98090_REG_SYSTEM_CLOCK, + 25000000, SND_SOC_CLOCK_IN); + if (ret < 0) { + dev_err(card->dev, "Can't set codec clock %d\n", ret); + return ret; + } + + /* Enable jack detection */ + ret = snd_soc_jack_new(codec, "Headphone", SND_JACK_HEADPHONE, jack); + if (ret) + return ret; + + ret = snd_soc_jack_add_pins(jack, ARRAY_SIZE(hs_jack_pins), + hs_jack_pins); + if (ret) + return ret; + + ret = snd_soc_jack_add_gpiods(card->dev->parent, jack, + ARRAY_SIZE(hs_jack_gpios), + hs_jack_gpios); + if (ret) + return ret; + + return max98090_mic_detect(codec, jack); +} + +static struct snd_soc_dai_link byt_max98090_dais[] = { + { + .name = "Baytrail Audio", + .stream_name = "Audio", + .cpu_dai_name = "baytrail-pcm-audio", + .codec_dai_name = "HiFi", + .codec_name = "i2c-193C9890:00", + .platform_name = "baytrail-pcm-audio", + .init = byt_max98090_init, + .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBS_CFS, + }, +}; + +static struct snd_soc_card byt_max98090_card = { + .name = "byt-max98090", + .dai_link = byt_max98090_dais, + .num_links = ARRAY_SIZE(byt_max98090_dais), + .dapm_widgets = byt_max98090_widgets, + .num_dapm_widgets = ARRAY_SIZE(byt_max98090_widgets), + .dapm_routes = byt_max98090_audio_map, + .num_dapm_routes = ARRAY_SIZE(byt_max98090_audio_map), + .controls = byt_max98090_controls, + .num_controls = ARRAY_SIZE(byt_max98090_controls), +}; + +static int byt_max98090_probe(struct platform_device *pdev) +{ + int ret_val = 0; + struct byt_max98090_private *priv; + + priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_ATOMIC); + if (!priv) { + dev_err(&pdev->dev, "allocation failed\n"); + return -ENOMEM; + } + + byt_max98090_card.dev = &pdev->dev; + snd_soc_card_set_drvdata(&byt_max98090_card, priv); + ret_val = devm_snd_soc_register_card(&pdev->dev, &byt_max98090_card); + if (ret_val) { + dev_err(&pdev->dev, + "snd_soc_register_card failed %d\n", ret_val); + return ret_val; + } + + return ret_val; +} + +static int byt_max98090_remove(struct platform_device *pdev) +{ + struct snd_soc_card *card = platform_get_drvdata(pdev); + struct byt_max98090_private *priv = snd_soc_card_get_drvdata(card); + + snd_soc_jack_free_gpios(&priv->jack, ARRAY_SIZE(hs_jack_gpios), + hs_jack_gpios); + + return 0; +} + +static struct platform_driver byt_max98090_driver = { + .probe = byt_max98090_probe, + .remove = byt_max98090_remove, + .driver = { + .name = "byt-max98090", + .owner = THIS_MODULE, + .pm = &snd_soc_pm_ops, + }, +}; +module_platform_driver(byt_max98090_driver) + +MODULE_DESCRIPTION("ASoC Intel(R) Baytrail Machine driver"); +MODULE_AUTHOR("Omair Md Abdullah, Jarkko Nikula"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:byt-max98090"); diff --git a/sound/soc/intel/sst-acpi.c b/sound/soc/intel/sst-acpi.c index 18aee77f8d4a..42edc6f4fc4a 100644 --- a/sound/soc/intel/sst-acpi.c +++ b/sound/soc/intel/sst-acpi.c @@ -247,6 +247,7 @@ static struct sst_acpi_desc sst_acpi_broadwell_desc = { static struct sst_acpi_mach baytrail_machines[] = { { "10EC5640", "byt-rt5640", "intel/fw_sst_0f28.bin-i2s_master" }, + { "193C9890", "byt-max98090", "intel/fw_sst_0f28.bin-i2s_master" }, {} }; -- 2.0.0.rc2

2 1

[alsa-devel] [PATCH] ASoC: Intel: byt/hsw: Add missing kthread_stop to error/cleanup path
by Jarkko Nikula 01 Jun '14

01 Jun '14

From: Imre Deak <imre.deak(a)intel.com> Baytrail and Haswell SST IPC don't stop the kernel thread in error and cleanup path thus leaving orphan kernel thread behind in such a case. Also while at it, fix one error path in sst-haswell-ipc.c that doesn't free hsw->msg. [Jarkko: I edited the commit log a little] Signed-off-by: Imre Deak <imre.deak(a)intel.com> Signed-off-by: Jarkko Nikula <jarkko.nikula(a)linux.intel.com> --- sound/soc/intel/sst-baytrail-ipc.c | 5 ++++- sound/soc/intel/sst-haswell-ipc.c | 12 ++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/sound/soc/intel/sst-baytrail-ipc.c b/sound/soc/intel/sst-baytrail-ipc.c index 0d31dbbf4806..d4b8c827c8b8 100644 --- a/sound/soc/intel/sst-baytrail-ipc.c +++ b/sound/soc/intel/sst-baytrail-ipc.c @@ -824,7 +824,7 @@ int sst_byt_dsp_init(struct device *dev, struct sst_pdata *pdata) byt->dsp = sst_dsp_new(dev, &byt_dev, pdata); if (byt->dsp == NULL) { err = -ENODEV; - goto err_free_msg; + goto dsp_err; } /* keep the DSP in reset state for base FW loading */ @@ -856,6 +856,8 @@ boot_err: sst_fw_free(byt_sst_fw); fw_err: sst_dsp_free(byt->dsp); +dsp_err: + kthread_stop(byt->tx_thread); err_free_msg: kfree(byt->msg); @@ -870,6 +872,7 @@ void sst_byt_dsp_free(struct device *dev, struct sst_pdata *pdata) sst_dsp_reset(byt->dsp); sst_fw_free_all(byt->dsp); sst_dsp_free(byt->dsp); + kthread_stop(byt->tx_thread); kfree(byt->msg); } EXPORT_SYMBOL_GPL(sst_byt_dsp_free); diff --git a/sound/soc/intel/sst-haswell-ipc.c b/sound/soc/intel/sst-haswell-ipc.c index e7996b39a484..bee192d42032 100644 --- a/sound/soc/intel/sst-haswell-ipc.c +++ b/sound/soc/intel/sst-haswell-ipc.c @@ -1730,7 +1730,7 @@ int sst_hsw_dsp_init(struct device *dev, struct sst_pdata *pdata) ret = msg_empty_list_init(hsw); if (ret < 0) - goto list_err; + return -ENOMEM; /* start the IPC message thread */ init_kthread_worker(&hsw->kworker); @@ -1740,7 +1740,7 @@ int sst_hsw_dsp_init(struct device *dev, struct sst_pdata *pdata) if (IS_ERR(hsw->tx_thread)) { ret = PTR_ERR(hsw->tx_thread); dev_err(hsw->dev, "error: failed to create message TX task\n"); - goto list_err; + goto err_free_msg; } init_kthread_work(&hsw->kwork, ipc_tx_msgs); @@ -1750,7 +1750,7 @@ int sst_hsw_dsp_init(struct device *dev, struct sst_pdata *pdata) hsw->dsp = sst_dsp_new(dev, &hsw_dev, pdata); if (hsw->dsp == NULL) { ret = -ENODEV; - goto list_err; + goto dsp_err; } /* keep the DSP in reset state for base FW loading */ @@ -1794,8 +1794,11 @@ boot_err: sst_fw_free(hsw_sst_fw); fw_err: sst_dsp_free(hsw->dsp); +dsp_err: + kthread_stop(hsw->tx_thread); +err_free_msg: kfree(hsw->msg); -list_err: + return ret; } EXPORT_SYMBOL_GPL(sst_hsw_dsp_init); @@ -1808,6 +1811,7 @@ void sst_hsw_dsp_free(struct device *dev, struct sst_pdata *pdata) sst_fw_free_all(hsw->dsp); sst_dsp_free(hsw->dsp); kfree(hsw->scratch); + kthread_stop(hsw->tx_thread); kfree(hsw->msg); } EXPORT_SYMBOL_GPL(sst_hsw_dsp_free); -- 2.0.0.rc2

2 1

[alsa-devel] [PATCH] ASoC: tlv320aci3x: Fix custom snd_soc_dapm_put_volsw_aic3x() function
by Peter Ujfalusi 01 Jun '14

01 Jun '14

For some unknown reason the parameters for snd_soc_test_bits() were in wrong order: It was: snd_soc_test_bits(codec, val, mask, reg); /* WRONG!!! */ while it should be: snd_soc_test_bits(codec, reg, mask, val); Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)ti.com> --- Hi, so the failures I was seeing was indeed caused by something one never expects: wrong parameter order for snd_soc_test_bits() in the tlv320aic3x driver, so regmap failed time to time when we asked it to read a register out of the valid range, since the value was sent as register number :o Regards, Peter sound/soc/codecs/tlv320aic3x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c index d7349bc89ad3..e12fafbb1e09 100644 --- a/sound/soc/codecs/tlv320aic3x.c +++ b/sound/soc/codecs/tlv320aic3x.c @@ -169,7 +169,7 @@ static int snd_soc_dapm_put_volsw_aic3x(struct snd_kcontrol *kcontrol, mask <<= shift; val <<= shift; - change = snd_soc_test_bits(codec, val, mask, reg); + change = snd_soc_test_bits(codec, reg, mask, val); if (change) { update.kcontrol = kcontrol; update.reg = reg; -- 1.9.3

2 1

[alsa-devel] [PATCH 1/2] ASoC: cs4265: bindings: sound: Add bindings for CS4265 CODEC
by Paul Handrigan 01 Jun '14

01 Jun '14

This patch adds binding documentation for the Cirrus Logic CS4265 CODEC. Signed-off-by: Paul Handrigan <paul.handrigan(a)cirrus.com> --- Documentation/devicetree/bindings/sound/cs4265.txt | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/cs4265.txt diff --git a/Documentation/devicetree/bindings/sound/cs4265.txt b/Documentation/devicetree/bindings/sound/cs4265.txt new file mode 100644 index 0000000..03d0dde --- /dev/null +++ b/Documentation/devicetree/bindings/sound/cs4265.txt @@ -0,0 +1,29 @@ +CS4265 audio CODEC + +This device supports I2C only. + +Required properties: + + - compatible : "cirrus,cs4265" + + - reg : the I2C address of the device for I2C. The I2C address depends on + the state of the AD0 pin. If AD0 is high, the i2c address is 0x4f. + If it is low, the i2c address is 0x4e. + +Optional properties: + + - reset-gpio : a GPIO spec for the reset pin. If specified, it will be + deasserted before communication to the codec starts. + +Examples: + +codec_ad0_high: cs4265@4f { /* AD0 Pin is high */ + compatible = "cirrus,cs4265"; + reg = <0x4f>; +}; + + +codec_ad0_low: cs4265@4e { /* AD0 Pin is low */ + compatible = "cirrus,cs4265"; + reg = <0x4e>; +}; -- 1.9.1

4 7

[alsa-devel] Bug report: [alsa-sink-USB Audio] alsa-sink.c: Most likely this is a bug in the ALSA driver '(null)'. Please report this issue to the ALSA
by Justin Piszcz 31 May '14

31 May '14

Hi, Bug report: ==> /var/log/user.log <== May 25 06:38:06 atom pulseaudio[6754]: [alsa-sink-USB Audio] alsa-sink.c: ALSA woke us up to write new data to the device, but there was actually nothing to write! May 25 06:38:06 atom pulseaudio[6754]: [alsa-sink-USB Audio] alsa-sink.c: Most likely this is a bug in the ALSA driver '(null)'. Please report this issue to the ALSA developers. May 25 06:38:06 atom pulseaudio[6754]: [alsa-sink-USB Audio] alsa-sink.c: We were woken up with POLLOUT set -- however a subsequent snd_pcm_avail() returned 0 or another value < min_avail. $ uname -a Linux atom 3.14.0 #2 SMP Wed Apr 2 06:30:21 EDT 2014 x86_64 GNU/Linux $ lsusb Bus 002 Device 004: ID 0764:0501 Cyber Power System, Inc. CP1500 AVR UPS Bus 002 Device 008: ID 0baf:0303 U.S. Robotics Bus 002 Device 007: ID 067b:2303 Prolific Technology, Inc. PL2303 Serial Port Bus 002 Device 010: ID 0461:4d15 Primax Electronics, Ltd Dell Optical Mouse Bus 002 Device 009: ID 413c:2002 Dell Computer Corp. SK-8125 Keyboard Bus 002 Device 006: ID 413c:1002 Dell Computer Corp. Keyboard Hub Bus 002 Device 005: ID 0d8c:0008 C-Media Electronics, Inc. Bus 002 Device 003: ID 2001:f103 D-Link Corp. DUB-H7 7-port USB 2.0 hub Bus 002 Device 002: ID 8087:0024 Intel Corp. Integrated Rate Matching Hub Bus 002 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub Bus 001 Device 003: ID 0557:2221 ATEN International Co., Ltd Winbond Hermon Bus 001 Device 002: ID 8087:0024 Intel Corp. Integrated Rate Matching Hub Bus 001 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub Justin.

2 5

[alsa-devel] [PATCH] ALSA: Docs: Fix typo in tegra_hda doc.
by Dylan Reid 31 May '14

31 May '14

The correct name of the third clock is hda2codec_2x. Signed-off-by: Dylan Reid <dgreid(a)chromium.org> --- Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt b/Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt index c26f8ca..b4730c2 100644 --- a/Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt +++ b/Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt @@ -20,9 +20,9 @@ hda@0,70030000 { clocks = <&tegra_car TEGRA124_CLK_HDA>, <&tegra_car TEGRA124_CLK_HDA2HDMI>, <&tegra_car TEGRA124_CLK_HDA2CODEC_2X>; - clock-names = "hda", "hda2hdmi", "hdacodec_2x"; + clock-names = "hda", "hda2hdmi", "hda2codec_2x"; resets = <&tegra_car 125>, /* hda */ <&tegra_car 128>; /* hda2hdmi */ <&tegra_car 111>, /* hda2codec_2x */ - reset-names = "hda", "hda2hdmi", "hdacodec_2x"; + reset-names = "hda", "hda2hdmi", "hda2codec_2x"; }; -- 1.8.1.3.605.g02339dd

2 1

[alsa-devel] [PATCH 00/49 v4] Enhancement for support of Firewire devices
by Takashi Sakamoto 31 May '14

31 May '14

This 49 patchset is to update previous series: [alsa-devel] [PATCH 00/44 v3] Enhancement of support for Firewire devices http://mailman.alsa-project.org/pipermail/alsa-devel/2014-March/074624.html 4 patches are newly added: [PATCH 09/48] dice/firewire-lib: Keep dualwire mode but obsolete CIP_HI_DUALWIRE - Make firewire-lib simpler. [PATCH 10/48] firewire-lib/dice/speakers: Add common PCM constraints for AMDTP streams - To share codes for drivers. Currently no improvement. [PATCH 25/48] fireworks/firewire-lib: Add a quirk to reset data block counter at bus reset [PATCH 46/48] bebob: Add a quirk of data blocks for MIDI messages for some M-Audio devices - New quirks are identified. For reviewers, you can see previous series in 'request_v3' branch of my remote repository. I hope this will help your work. ---------------------------------------------------------------- The following changes since commit 38137a064199a02630f136ce7bb1580d5d3fedeb: ALSA: lx_core: Translate comments from french to english (2014-04-18 09:57:03 +0200) are available in the git repository at: https://github.com/takaswie/sound.git request_v4 for you to fetch changes up to e851b7740f218d5d5a8e957851b383bde3e28654: firewire/bebob: Add a workaround for M-Audio special Firewire series (2014-04-25 22:29:32 +0900) ---------------------------------------------------------------- Takashi Sakamoto (49): firewire-lib: Rename functions, structure, member for AMDTP firewire-lib: Add macros instead of fixed value for AMDTP firewire-lib: Add 'direction' member to 'amdtp_stream' structure firewire-lib: Split some codes into functions to reuse for both streams firewire-lib: Add support for AMDTP in-stream and PCM capture firewire-lib: Add support for MIDI capture/playback firewire-lib: Give syt value as parameter to handle_out_packet() firewire-lib: Add support for duplex streams synchronization in blocking mode firewire-lib: Add support for channel mapping dice/firewire-lib: Keep dualwire mode but obsolete CIP_HI_DUALWIRE firewire-lib/dice/speakers: Add common PCM constraints for AMDTP streams firewire-lib: Restrict calling flush_context_completion() when context exists firewire-lib: Rename macros, variables and functions for CMP firewire-lib: Add 'direction' member to 'cmp_connection' structure firewire-lib: Add handling output connection by CMP firewire-lib: Add a new function to check others' connection firewire-lib: Add support for deferred transaction firewire-lib: Add some AV/C general commands fireworks: Add skelton for Fireworks based devices fireworks: Add transaction and some commands fireworks: Add connection and stream management fireworks/firewire-lib: Add a quirk for empty packet with TAG0 fireworks/firewire-lib: Add a quirk for the meaning of dbc fireworks/firewire-lib: Add a quirk for wrong dbs in tx packets fireworks/firewire-lib: Add a quirk for fixed interval of reported dbc fireworks/firewire-lib: Add a quirk to reset data block counter at bus reset fireworks: Add proc interface for debugging purpose fireworks: Add MIDI interface fireworks/firewire-lib: Add a quirk of data blocks for MIDI in out-stream fireworks: Add PCM interface fireworks: Add hwdep interface fireworks: Add command/response functionality into hwdep interface bebob: Add skelton for BeBoB based devices bebob: Add commands and connections/streams management bebob/firewire-lib: Add a quirk for discontinuity at bus reset bebob: Add proc interface for debugging purpose bebob: Add MIDI interface bebob: Add PCM interface bebob: Add hwdep interface bebob: Prepare for device specific operations bebob: Add support for Terratec PHASE, EWS series and Aureon bebob: Add support for Yamaha GO series bebob: Add support for Focusrite Saffire/SaffirePro series bebob: Add support for M-Audio usual Firewire series bebob: Add support for M-Audio special Firewire series bebob/firewire-lib: Add a quirk of wrong dbc in empty packet for M-Audio special Firewire series bebob: Add a quirk of data blocks for MIDI messages for some M-Audio devices bebob: Send a cue to load firmware for M-Audio Firewire series firewire/bebob: Add a workaround for M-Audio special Firewire series drivers/firewire/core.h | 1 - include/linux/firewire.h | 3 + include/uapi/sound/asound.h | 4 +- include/uapi/sound/firewire.h | 23 +- sound/firewire/Kconfig | 59 ++ sound/firewire/Makefile | 2 + sound/firewire/amdtp.c | 797 +++++++++++------ sound/firewire/amdtp.h | 200 ++++- sound/firewire/bebob/Makefile | 4 + sound/firewire/bebob/bebob.c | 472 ++++++++++ sound/firewire/bebob/bebob.h | 257 ++++++ sound/firewire/bebob/bebob_command.c | 282 ++++++ sound/firewire/bebob/bebob_focusrite.c | 279 ++++++ sound/firewire/bebob/bebob_hwdep.c | 199 +++++ sound/firewire/bebob/bebob_maudio.c | 792 +++++++++++++++++ sound/firewire/bebob/bebob_midi.c | 168 ++++ sound/firewire/bebob/bebob_pcm.c | 378 ++++++++ sound/firewire/bebob/bebob_proc.c | 196 +++++ sound/firewire/bebob/bebob_stream.c | 1020 ++++++++++++++++++++++ sound/firewire/bebob/bebob_terratec.c | 68 ++ sound/firewire/bebob/bebob_yamaha.c | 50 ++ sound/firewire/cmp.c | 203 +++-- sound/firewire/cmp.h | 14 +- sound/firewire/dice.c | 88 +- sound/firewire/fcp.c | 189 +++- sound/firewire/fcp.h | 21 + sound/firewire/fireworks/Makefile | 4 + sound/firewire/fireworks/fireworks.c | 357 ++++++++ sound/firewire/fireworks/fireworks.h | 232 +++++ sound/firewire/fireworks/fireworks_command.c | 372 ++++++++ sound/firewire/fireworks/fireworks_hwdep.c | 298 +++++++ sound/firewire/fireworks/fireworks_midi.c | 168 ++++ sound/firewire/fireworks/fireworks_pcm.c | 403 +++++++++ sound/firewire/fireworks/fireworks_proc.c | 232 +++++ sound/firewire/fireworks/fireworks_stream.c | 372 ++++++++ sound/firewire/fireworks/fireworks_transaction.c | 326 +++++++ sound/firewire/speakers.c | 100 +-- 37 files changed, 8173 insertions(+), 460 deletions(-) create mode 100644 sound/firewire/bebob/Makefile create mode 100644 sound/firewire/bebob/bebob.c create mode 100644 sound/firewire/bebob/bebob.h create mode 100644 sound/firewire/bebob/bebob_command.c create mode 100644 sound/firewire/bebob/bebob_focusrite.c create mode 100644 sound/firewire/bebob/bebob_hwdep.c create mode 100644 sound/firewire/bebob/bebob_maudio.c create mode 100644 sound/firewire/bebob/bebob_midi.c create mode 100644 sound/firewire/bebob/bebob_pcm.c create mode 100644 sound/firewire/bebob/bebob_proc.c create mode 100644 sound/firewire/bebob/bebob_stream.c create mode 100644 sound/firewire/bebob/bebob_terratec.c create mode 100644 sound/firewire/bebob/bebob_yamaha.c create mode 100644 sound/firewire/fireworks/Makefile create mode 100644 sound/firewire/fireworks/fireworks.c create mode 100644 sound/firewire/fireworks/fireworks.h create mode 100644 sound/firewire/fireworks/fireworks_command.c create mode 100644 sound/firewire/fireworks/fireworks_hwdep.c create mode 100644 sound/firewire/fireworks/fireworks_midi.c create mode 100644 sound/firewire/fireworks/fireworks_pcm.c create mode 100644 sound/firewire/fireworks/fireworks_proc.c create mode 100644 sound/firewire/fireworks/fireworks_stream.c create mode 100644 sound/firewire/fireworks/fireworks_transaction.c -- 1.8.3.2

4 64

Re: [alsa-devel] Donation of ARM CubieTruck to anyone interested in developing
by Alexey Eromenko 30 May '14

30 May '14

> I might be interested in helping. > > 1) What is your expected timeline to get this working? I would prefer for it to be ready for Debian 8.0 (not a requirement) > 2) Is there enough support in mainline to at least boot the board to a linux console? Mainline has some support for it, yeah, (but not for sound) Linux mainlining effort http://linux-sunxi.org/Linux_mainlining_effort > 3) If so what kernel? The system officially supports Linux-Android kernel 3.4, which has all the drivers built-in and open-sourced (but sound driver is crappy there) Lubuntu Desktop/Server SD Card Installation for Cubietruck: http://docs.cubieboard.org/tutorials/ct1/installation/install_lubuntu_deskt… -- -Alexey Eromenko "Technologov"

1 0