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

[alsa-devel] [PATCH 1/2] mfd: wm5102: Update register patch
by Charles Keepax 03 Feb '14

03 Feb '14

Update the register patch based on latest evaluation of the device. Signed-off-by: Charles Keepax <ckeepax(a)opensource.wolfsonmicro.com> --- drivers/mfd/wm5102-tables.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/mfd/wm5102-tables.c b/drivers/mfd/wm5102-tables.c index 1e9a4b2..f9b1e96 100644 --- a/drivers/mfd/wm5102-tables.c +++ b/drivers/mfd/wm5102-tables.c @@ -73,6 +73,7 @@ static const struct reg_default wm5102_revb_patch[] = { { 0x171, 0x0000 }, { 0x35E, 0x000C }, { 0x2D4, 0x0000 }, + { 0x4DC, 0x0900 }, { 0x80, 0x0000 }, }; -- 1.7.2.5

3 7

[alsa-devel] [PATCH v3 0/6] ASoC: tlv320aic32x4: DT support
by Markus Pargmann 03 Feb '14

03 Feb '14

Hi, The series adds basic DT support for the TI tlv320aic32x4 codec. Patch 3 ("ASoC: tlv320aic32x4: Use signed int mixer controls") depends on series "[PATCH 0/2] ASoC: core: volume control using signed register values". I added the remaining two patches of the "ASoC: tlv320aic32x4 bugfixes" series to the beginning of this series to have all tlv320aic32x4 patches in one series. Regards, Markus Changes in v3: - Rename property gpio-reset to reset-gpios - Use negative constants as minimum volume instead of casting to negative integers Changes in v2: - Regulator support - Fix documentation for gpio property Markus Pargmann (6): ASoC: tlv320aic32x4: Fix mono playback ASoC: tlv320aic32x4: Fix MICPGA input configuration ASoC: tlv320aic32x4: Use signed int mixer controls ASoC: tlv320aic32x4: DT support ASoC: tlv320aic32x4: Support for master clock ASoC: tlv320aic32x4: Support for regulators .../devicetree/bindings/sound/tlv320aic32x4.txt | 28 ++++ sound/soc/codecs/tlv320aic32x4.c | 154 ++++++++++++++++++--- sound/soc/codecs/tlv320aic32x4.h | 3 + 3 files changed, 164 insertions(+), 21 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/tlv320aic32x4.txt -- 1.8.5.2

3 16

[alsa-devel] [PATCH 0/4] ASoC: davinci-mcasp: Fix master mode capture (w/o playback)
by Peter Ujfalusi 03 Feb '14

03 Feb '14

Hi, When McASP is master the TX clocks are used for capture clocking as well. Other parts of the code already does the configuration for both tx and rx - for different bits in xxFMT/xxFMCT registers we should do the same in other places. Along with this fix I have added three cleanup patch which came along when I was debugging the issue. Regards, Peter --- Peter Ujfalusi (4): ASoC: davinci-mcasp: Harmonize the sub hw_params function names ASoC: davinci-mcasp: Configure xxTDM, xxFMT and xxFMCT registers synchronously ASoC: davinci-mcasp: Return value handling cleanup for mcasp_common_hw_param() ASoC: davinci-mcasp: Code cleanup in davinci_mcasp_hw_params() sound/soc/davinci/davinci-mcasp.c | 81 +++++++++++++++++++-------------------- 1 file changed, 39 insertions(+), 42 deletions(-) -- 1.8.5.3

2 9

[alsa-devel] [RFC][PATCH 0/8] A new driver for OXFW970/971 based devices
by Takashi Sakamoto 03 Feb '14

03 Feb '14

This series of patch is based on my previous series below: http://mailman.alsa-project.org/pipermail/alsa-devel/2013-December/070424.h… This series of patch add a new driver, snd-oxfw, for OXFW970/971 based devices. These chipsets are already supported by snd-firewire-speakers but this new driver aim to support recording equipment. Current supported devices: * Behringer F-Control Audio 202 * Mackie Onyx-i series (former model) * Mackie Onyx Satellite Devices possible to be supported if identifying IDs: * Mackie, d.2 pro * Mackie, d.4 pro * Mackie, U.420 * Mackie, U.420d * Mackie, Tapco Link.Firewire I worked with Behringer F-Control Audio 202. So I want someone to test with the other devices, especially about some quirks. Clemens, would you gime me your opinions about issues below? And if you know something about this chipset, would you share the information? 1.snd-firewire-speakers and snd-oxfw With this series of patches, ALSA has two drivers for the same chipsets. Merging these two drivers is a bit difficult because: - snd-firewire-speakers has control interface but snd-oxfw don't - snd-firewire-speakers don't support in-stream but snd-oxfw supports 2.currently snd-oxfw works with streams in SYT-Match Due to invalid sequence of 'presentation timestamp' in transmitted packets. In detail, please see 4th patch. 3.assumption of channnel formation Some commands may not be implemented. In detail, please see 3rd patch. 4.don't check source of clock All of supported devices (including can be) don't have the functionality to switch source of clock. So I want to omit this. For issue 3 and 4, Descriptor mechanism in 'Enhancements to the AV/C General Specification 3.0 Version 1.1' may be a best solution but it costs much to implement against the number of available devices. I want to avoid this huge mechanism if possible. Regards Takashi Sakamoto Takashi Sakamoto (8): oxfw: Add skelton for OXFW970/971 based devices oxfw: Read firmware version to name card oxfw: Add some AV/C commands for channel formation of AMDTP stream oxfw: Add connections and streams management oxfw: Add proc interface for debugging purpose oxfw: Add MIDI interface oxfw: Add PCM interface oxfw: Add hwdep interface include/uapi/sound/asound.h | 3 +- include/uapi/sound/firewire.h | 3 +- sound/firewire/Kconfig | 17 + sound/firewire/Makefile | 1 + sound/firewire/oxfw/Makefile | 3 + sound/firewire/oxfw/oxfw.c | 243 ++++++++++++++ sound/firewire/oxfw/oxfw.h | 140 ++++++++ sound/firewire/oxfw/oxfw_command.c | 161 ++++++++++ sound/firewire/oxfw/oxfw_hwdep.c | 197 ++++++++++++ sound/firewire/oxfw/oxfw_midi.c | 156 +++++++++ sound/firewire/oxfw/oxfw_pcm.c | 421 ++++++++++++++++++++++++ sound/firewire/oxfw/oxfw_proc.c | 61 ++++ sound/firewire/oxfw/oxfw_stream.c | 639 +++++++++++++++++++++++++++++++++++++ 13 files changed, 2043 insertions(+), 2 deletions(-) create mode 100644 sound/firewire/oxfw/Makefile create mode 100644 sound/firewire/oxfw/oxfw.c create mode 100644 sound/firewire/oxfw/oxfw.h create mode 100644 sound/firewire/oxfw/oxfw_command.c create mode 100644 sound/firewire/oxfw/oxfw_hwdep.c create mode 100644 sound/firewire/oxfw/oxfw_midi.c create mode 100644 sound/firewire/oxfw/oxfw_pcm.c create mode 100644 sound/firewire/oxfw/oxfw_proc.c create mode 100644 sound/firewire/oxfw/oxfw_stream.c -- 1.8.3.2

4 37

[alsa-devel] [PATCH 1/4] ASoC: wm8962: Hold a runtime PM reference while handling interrupts
by Mark Brown 31 Jan '14

31 Jan '14

From: Mark Brown <broonie(a)linaro.org> If the device is runtime suspended then we can't interact with it as it may have been powered off and the register map will be in cache only mode. Signed-off-by: Mark Brown <broonie(a)linaro.org> --- sound/soc/codecs/wm8962.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 97db3b45b411..aa7ae76d5e28 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -3003,6 +3003,12 @@ static irqreturn_t wm8962_irq(int irq, void *data) unsigned int active; int reg, ret; + ret = pm_runtime_get_sync(dev); + if (ret < 0) { + dev_err(dev, "Failed to resume: %d\n", ret); + return ret; + } + ret = regmap_read(wm8962->regmap, WM8962_INTERRUPT_STATUS_2_MASK, &mask); if (ret != 0) { @@ -3019,8 +3025,10 @@ static irqreturn_t wm8962_irq(int irq, void *data) active &= ~mask; - if (!active) + if (!active) { + pm_runtime_put(dev); return IRQ_NONE; + } /* Acknowledge the interrupts */ ret = regmap_write(wm8962->regmap, WM8962_INTERRUPT_STATUS_2, active); @@ -3070,6 +3078,8 @@ static irqreturn_t wm8962_irq(int irq, void *data) msecs_to_jiffies(250)); } + pm_runtime_put(dev); + return IRQ_HANDLED; } -- 1.9.rc1

3 6

[alsa-devel] [PATCH 0/3] ASoC: davinci-mcasp/evm: PM related changes
by Peter Ujfalusi 31 Jan '14

31 Jan '14

Hi, In order to be able to benefit from the core's feature to handle the dai pinctrl default/sleep states the davinci-evm should set it's .pm section snd_soc_pm_ops. In the McASP driver consolidate the pm_runtime use to avoid unbalanced refcounting: trigger:start increased while trigger:stop did not decreased the pm counter. Move the pm callbacks from platfrom device to the soc_dai_driver. Now it is only a matter of dts update to enable the pin level power saving for McASP. Regards, Peter --- Peter Ujfalusi (3): ASoC: davinci-mcasp: Consolidate pm_runtime_get/put() use in the driver ASoC: davinci-evm: Add pm callbacks to platform driver ASoC: davinci-mcasp: Move pm callbacks from platform device to soc_dai_driver sound/soc/davinci/davinci-evm.c | 1 + sound/soc/davinci/davinci-mcasp.c | 97 +++++++++++++++++++-------------------- 2 files changed, 47 insertions(+), 51 deletions(-) -- 1.8.5.3

2 6

[alsa-devel] [PATCH] ALSA: hda/hdmi - allow PIN_OUT to be dynamically enabled
by Stephen Warren 31 Jan '14

31 Jan '14

From: Stephen Warren <swarren(a)nvidia.com> Commit 384a48d71520 "ALSA: hda: HDMI: Support codecs with fewer cvts than pins" dynamically enabled each pin widget's PIN_OUT only when the pin was actively in use. This was required on certain NVIDIA CODECs for correct operation. Specifically, if multiple pin widgets each had their mux input select the same audio converter widget and each pin widget had PIN_OUT enabled, then only one of the pin widgets would actually receive the audio, and often not the one the user wanted! However, this apparently broke some Intel systems, and commit 6169b673618b "ALSA: hda - Always turn on pins for HDMI/DP" reverted the dynamic setting of PIN_OUT. This in turn broke the afore-mentioned NVIDIA CODECs. This change supports either dynamic or static handling of PIN_OUT, selected by a flag set up during CODEC initialization. This flag is enabled for all recent NVIDIA GPUs. Reported-by: Uosis <uosisl(a)gmail.com> Cc: <stable(a)vger.kernel.org> # v3.13 Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- v3.12 or earlier stable require some manual back-porting effort, or perhaps just a variety of other commits to be backported. I'm investigating exactly which commits, and whether they're appropriate for stable. --- sound/pci/hda/patch_hdmi.c | 40 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 64f0a5e73a25..5ef95034d041 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -132,6 +132,9 @@ struct hdmi_spec { struct hdmi_eld temp_eld; struct hdmi_ops ops; + + bool dyn_pin_out; + /* * Non-generic VIA/NVIDIA specific */ @@ -500,15 +503,25 @@ static void hdmi_write_dip_byte(struct hda_codec *codec, hda_nid_t pin_nid, static void hdmi_init_pin(struct hda_codec *codec, hda_nid_t pin_nid) { + struct hdmi_spec *spec = codec->spec; + int pin_out; + /* Unmute */ if (get_wcaps(codec, pin_nid) & AC_WCAP_OUT_AMP) snd_hda_codec_write(codec, pin_nid, 0, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE); - /* Enable pin out: some machines with GM965 gets broken output when - * the pin is disabled or changed while using with HDMI - */ + + if (spec->dyn_pin_out) + /* Disable pin out until stream is active */ + pin_out = 0; + else + /* Enable pin out: some machines with GM965 gets broken output + * when the pin is disabled or changed while using with HDMI + */ + pin_out = PIN_OUT; + snd_hda_codec_write(codec, pin_nid, 0, - AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT); + AC_VERB_SET_PIN_WIDGET_CONTROL, pin_out); } static int hdmi_get_channel_count(struct hda_codec *codec, hda_nid_t cvt_nid) @@ -1735,6 +1748,7 @@ static int generic_hdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo, struct hdmi_spec_per_pin *per_pin = get_pin(spec, pin_idx); hda_nid_t pin_nid = per_pin->pin_nid; bool non_pcm; + int pinctl; non_pcm = check_non_pcm_per_cvt(codec, cvt_nid); mutex_lock(&per_pin->lock); @@ -1744,6 +1758,14 @@ static int generic_hdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo, hdmi_setup_audio_infoframe(codec, per_pin, non_pcm); mutex_unlock(&per_pin->lock); + if (spec->dyn_pin_out) { + pinctl = snd_hda_codec_read(codec, pin_nid, 0, + AC_VERB_GET_PIN_WIDGET_CONTROL, 0); + snd_hda_codec_write(codec, pin_nid, 0, + AC_VERB_SET_PIN_WIDGET_CONTROL, + pinctl | PIN_OUT); + } + return spec->ops.setup_stream(codec, cvt_nid, pin_nid, stream_tag, format); } @@ -1763,6 +1785,7 @@ static int hdmi_pcm_close(struct hda_pcm_stream *hinfo, int cvt_idx, pin_idx; struct hdmi_spec_per_cvt *per_cvt; struct hdmi_spec_per_pin *per_pin; + int pinctl; if (hinfo->nid) { cvt_idx = cvt_nid_to_cvt_index(spec, hinfo->nid); @@ -1779,6 +1802,14 @@ static int hdmi_pcm_close(struct hda_pcm_stream *hinfo, return -EINVAL; per_pin = get_pin(spec, pin_idx); + if (spec->dyn_pin_out) { + pinctl = snd_hda_codec_read(codec, per_pin->pin_nid, 0, + AC_VERB_GET_PIN_WIDGET_CONTROL, 0); + snd_hda_codec_write(codec, per_pin->pin_nid, 0, + AC_VERB_SET_PIN_WIDGET_CONTROL, + pinctl & ~PIN_OUT); + } + snd_hda_spdif_ctls_unassign(codec, pin_idx); mutex_lock(&per_pin->lock); @@ -2840,6 +2871,7 @@ static int patch_nvhdmi(struct hda_codec *codec) return err; spec = codec->spec; + spec->dyn_pin_out = true; spec->ops.chmap_cea_alloc_validate_get_type = nvhdmi_chmap_cea_alloc_validate_get_type; -- 1.8.1.5

2 1

[alsa-devel] [PATCH v2 0/5] add a TDA998x CODEC
by Jean-Francois Moine 30 Jan '14

30 Jan '14

The TDA998x HDMI transmitter accepts audio input from either I2S or S/PDIF. Theses inputs have different intrinsic constraints and these constraints may be modified by the audio parameters of the connected video device. The choice of I2S or S/PDIF may be the done by the user or by automatic processing (DPCM?) at each audio starting time. This asks for a dynamic audio input switch in the HDMI driver. This patch series implements the TDA998x specific CODEC. A simple function call mechanism is used for exchanges between the CODEC and the HDMI driver. Note: the changes in the TDA998x I2C driver are based on my previous patch series: http://lists.freedesktop.org/archives/dri-devel/2014-January/052837.html - v2 - add ACLK setting and code optimization in patch 1 - from Mark Brown's remarks in patch 2: - don't compile the codec when CONFIG_ALL_CODECS - simplify the code about start/stop audio - fix coding style errors - add audio-port-names associated to audio-ports - add audio-port-names in patch 4 - add patch 5 'adjust the audio CTS_N pre-divider from audio format' for the Beaglebone-Black board (Jyri Sarha) Jean-Francois Moine (5): drm/i2c: tda998x: add a function for dynamic audio input switch ASoC: tda998x: add a codec driver for TDA998x ASoC: tda998x: add DT documentation ASoC: tda998x: adjust the audio hw parameters from EDID ASoC: tda998x: adjust the audio CTS_N pre-divider from audio format .../devicetree/bindings/sound/tda998x.txt | 16 + drivers/gpu/drm/i2c/tda998x_drv.c | 82 +++++- include/drm/i2c/tda998x.h | 11 +- sound/soc/codecs/Kconfig | 6 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/tda998x.c | 325 +++++++++++++++++++++ 6 files changed, 436 insertions(+), 6 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/tda998x.txt create mode 100644 sound/soc/codecs/tda998x.c -- 1.9.rc1

2 6

[alsa-devel] [PATCH RFC v3 0/8] Beaglebone-Black HDMI audio
by Jyri Sarha 30 Jan '14

30 Jan '14

Changes since RFC v2 version of the patches: - Dropped out already applied: ASoC: hdmi-codec: Add devicetree binding with documentation - Addresses Mark's comments here: http://mailman.alsa-project.org/pipermail/alsa-devel/2013-December/070605.h… - ASoC: davinci-evm: Add named clock reference to DT bindings - Get rid of unnecessary castings - Add mclk NULL checks - Use devm_clk_get() - Change clock name from "ti,codec-clock" to "mclk" - Address Mark's comments here: http://mailman.alsa-project.org/pipermail/alsa-devel/2013-December/070606.h… - ASoC: davinci-evm: HDMI audio support for TDA998x trough McASP I2S bus - Get rid of unnecessary castings - Update commit message - Add: ASoC: davinci-mcasp: Set BCLK divider if McASP is BCLK master - Use snd_soc_params_to_bclk() Changes since the first RFC version of the patches: - Drop out already applied: ASoC: hdmi-codec: Add SNDRV_PCM_FMTBIT_32_LE playback format - Change sound node's compatible property form: "ti,am33xx-beaglebone-black" to "ti,am33xx-beaglebone-black-audio" - Some minor style issue fixes from TI internal review Jyri Sarha (8): clk: add gpio controlled clock ASoC: davinci-evm: Add named clock reference to DT bindings ASoC: davinci-mcasp: Set BCLK divider if McASP is BCLK master ASoC: davinci-evm: HDMI audio support for TDA998x trough McASP I2S bus ASoC: davinci: HDMI audio build for AM33XX and TDA998x drm/tilcdc: Add I2C HDMI audio config for tda998x ARM: OMAP2+: omap2plus_defconfig: Enable tilcdc and TDA998X HDMI support ARM: OMAP2+: omap2plus_defconfig: Enable BeagleBone Black HDMI audio support .../devicetree/bindings/clock/gpio-clock.txt | 21 ++ .../bindings/sound/davinci-evm-audio.txt | 13 +- arch/arm/configs/omap2plus_defconfig | 5 + drivers/clk/Makefile | 1 + drivers/clk/clk-gpio.c | 210 +++++++++++++++++++ drivers/gpu/drm/tilcdc/tilcdc_slave.c | 24 ++- include/linux/clk-provider.h | 25 +++ sound/soc/davinci/Kconfig | 12 ++ sound/soc/davinci/Makefile | 1 + sound/soc/davinci/davinci-evm.c | 211 +++++++++++++++++++- sound/soc/davinci/davinci-mcasp.c | 20 ++ 11 files changed, 534 insertions(+), 9 deletions(-) create mode 100644 Documentation/devicetree/bindings/clock/gpio-clock.txt create mode 100644 drivers/clk/clk-gpio.c -- 1.7.9.5

4 22

[alsa-devel] [PATCH 00/11] HD-audio patches for 3.15
by Takashi Iwai 30 Jan '14

30 Jan '14

Hi, here is a series of patches for HD-audio for 3.15, i.e. no urgent fixes but mainly more enhancements and cleanups of static quirks. The patches are found in sound-unstable git tree topic/hda branch for now. They'll be merged to the main sound git tree once when the merge window is closed. Takashi

1 12