October 2011 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] Future of the HDA driver
by David Henningsson 04 Oct '11

04 Oct '11

Hi Takashi etc, 1) I think it would make sense to have a designated time and room for a "future of HDA" discussion in Prague. We could e g discuss input jacks as kcontrols, and exposing routing to user space, as IIRC Mark Brown was suggestion earlier. What do you think? 2) With Ubuntu 11.10 in a "Freeze" state and PulseAudio 1.0 out the door, I might have some time to contribute to the HDA driver...at least if not a lot of urgent stuff comes up, and up to the 3.2 merge window or so. (Any idea how far away that would be?) Do you think it would make sense to split hda_codec.c into hda_codec.c and hda_autoparser.c, move snd_hda_parse_pin_defcfg there, then add more functions as discovered to be useful to more than one autoparser? 3) One thing that has been annoyed me lately is the moving of hp out or speaker out to line out, which IMO leads to somewhat messy code. Seen in retrospect of course, don't you think it would make more sense to do let line_out_pins be "line out" only, and add one more variable primary_out that would be initialized as: primary_out_pins = line_outs ? &line_out_pins : (speaker_outs ? &speaker_out_pins : (hp_outs ? &hp_out_pins : NULL)) ..and then you could do something like: #define hp_is_primary_out(_auto) ((_auto)->primary_out_pins == &(_auto)->hp_out_pins) Redoing that will probably require careful reading to avoid regressions though... -- David Henningsson, Canonical Ltd. http://launchpad.net/~diwic

4 13

[alsa-devel] [RFC 00/12] Combining snd_soc_*_volsw/volsw_2r
by Peter Ujfalusi 04 Oct '11

04 Oct '11

Hello Mark, This series will combine the snd_soc_*_volsw, and snd_soc_*_volsw_2r callbacks. We are going to drop the volsw_r2 callbacks, and merge the support to the _volsw functions. In order to achieve this, the macros need to be adjusted, and also the drivers, which were not using the macros to construct the soc_mixer_control needed to be changed, so I'm not going to introduce any breakage, inconsistency. This has been suggested in this thread: http://mailman.alsa-project.org/pipermail/alsa-devel/2011-September/044287.… By Mark in this mail (I hope I did not misunderstood it): http://mailman.alsa-project.org/pipermail/alsa-devel/2011-September/044343.… The use of the existing macros will not change, but underneath we are not going to have two sets of functions for single, or double mixer controls. I think the last 3 patch can be squashed, I did not wanted to touch the core, and a codec driver in a same patch. Generated on top of: git://opensource.wolfsonmicro.com/linux-2.6-asoc, for-3.2 branch Regards, Peter --- Peter Ujfalusi (12): ASoC: core: Introduce SOC_DOUBLE_VALUE macro ASoC: core: Introduce SOC_DOUBLE_R_VALUE macro ASoC: Consolidate use of controls with custom get/put function ASoC: twl6040: Simplify custom get_volsw callback ASoC: twl6040: Simplify custom put_volsw callback ASoC: twl6040: Prepare for core put_volsw/volsw_2r merger ASoC: core: Change SOC_SINGLE/DOUBLE_VALUE representation ASoC: core: Combine snd_soc_info_volsw/info_volsw_2r functions ASoC: core: Combine snd_soc_get_volsw/get_volsw_2r functions ASoC: core: Combine snd_soc_out_volsw/put_volsw_2r functions ASoC: twl6040: Simply call snd_soc_put_volsw form the custom code ASoC: core: Remove snd_soc_put_volsw_2r definition include/sound/soc.h | 82 +++++++++++---------- sound/soc/codecs/tlv320aic23.c | 14 +--- sound/soc/codecs/twl4030.c | 48 +++--------- sound/soc/codecs/twl6040.c | 71 ++++-------------- sound/soc/codecs/wm8350.c | 39 ++++------ sound/soc/codecs/wm8580.c | 36 +++------ sound/soc/codecs/wm_hubs.c | 18 +--- sound/soc/soc-core.c | 161 +++++++++------------------------------- 8 files changed, 142 insertions(+), 327 deletions(-) -- 1.7.7

3 21

[alsa-devel] [PATCH 1/2] ASoC: Remove unneeded hw_write initialisation in ak4671
by Axel Lin 04 Oct '11

04 Oct '11

It is not required now. Signed-off-by: Axel Lin <axel.lin(a)gmail.com> --- sound/soc/codecs/ak4671.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/ak4671.c b/sound/soc/codecs/ak4671.c index 2ecf128..41e3d55 100644 --- a/sound/soc/codecs/ak4671.c +++ b/sound/soc/codecs/ak4671.c @@ -628,8 +628,6 @@ static int ak4671_probe(struct snd_soc_codec *codec) struct ak4671_priv *ak4671 = snd_soc_codec_get_drvdata(codec); int ret; - codec->hw_write = (hw_write_t)i2c_master_send; - ret = snd_soc_codec_set_cache_io(codec, 8, 8, ak4671->control_type); if (ret < 0) { dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); -- 1.7.4.1

2 2

[alsa-devel] [PATCH 1/4 v2] ASoC: wm8711: Use snd_soc_update_bits for read-modify-write
by Axel Lin 04 Oct '11

04 Oct '11

Use snd_soc_update_bits for read-modify-write register access instead of open-coding it using snd_soc_read and snd_soc_write Signed-off-by: Axel Lin <axel.lin(a)gmail.com> --- v2: also remove unused variable 'reg'. sound/soc/codecs/wm8711.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/sound/soc/codecs/wm8711.c b/sound/soc/codecs/wm8711.c index 8457d3c..47c7fd5 100644 --- a/sound/soc/codecs/wm8711.c +++ b/sound/soc/codecs/wm8711.c @@ -364,7 +364,7 @@ static int wm8711_resume(struct snd_soc_codec *codec) static int wm8711_probe(struct snd_soc_codec *codec) { struct wm8711_priv *wm8711 = snd_soc_codec_get_drvdata(codec); - int ret, reg; + int ret; ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8711->bus_type); if (ret < 0) { @@ -381,10 +381,8 @@ static int wm8711_probe(struct snd_soc_codec *codec) wm8711_set_bias_level(codec, SND_SOC_BIAS_STANDBY); /* Latch the update bits */ - reg = snd_soc_read(codec, WM8711_LOUT1V); - snd_soc_write(codec, WM8711_LOUT1V, reg | 0x0100); - reg = snd_soc_read(codec, WM8711_ROUT1V); - snd_soc_write(codec, WM8711_ROUT1V, reg | 0x0100); + snd_soc_update_bits(codec, WM8711_LOUT1V, 0x0100, 0x0100); + snd_soc_update_bits(codec, WM8711_ROUT1V, 0x0100, 0x0100); snd_soc_add_controls(codec, wm8711_snd_controls, ARRAY_SIZE(wm8711_snd_controls)); -- 1.7.4.1

2 3

[alsa-devel] [RFC][PATCH] ASoC: Avoid writing to WM8971_RESET in wm8971_resume
by Axel Lin 04 Oct '11

04 Oct '11

Writing to WM8971_RESET resets all registers to the default state. Thus we should avoid writing to WM8971_RESET on resume. Signed-off-by: Axel Lin <axel.lin(a)gmail.com> --- Hi, While reading the code, I don't understand why we need to do (in wm8971_resume): for (i = 0; i < ARRAY_SIZE(wm8971_reg); i++) { if (i + 1 == WM8971_RESET) continue; My understanding is that we want to avoid writing to WM8971_RESET on resume. Thus I send this patch for review. I don't have the hardware for testing, I'd appreciate if someone can test this patch. Thanks, Axel sound/soc/codecs/wm8971.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/codecs/wm8971.c b/sound/soc/codecs/wm8971.c index 572bb80..7ec4165 100644 --- a/sound/soc/codecs/wm8971.c +++ b/sound/soc/codecs/wm8971.c @@ -612,7 +612,7 @@ static int wm8971_resume(struct snd_soc_codec *codec) /* Sync reg_cache with the hardware */ for (i = 0; i < ARRAY_SIZE(wm8971_reg); i++) { - if (i + 1 == WM8971_RESET) + if (i == WM8971_RESET) continue; data[0] = (i << 1) | ((cache[i] >> 8) & 0x0001); data[1] = cache[i] & 0x00ff; -- 1.7.4.1

2 1

[alsa-devel] ASoC updates for 3.2
by Mark Brown 04 Oct '11

04 Oct '11

The following changes since commit 02890535269338a6d2034ad3ce8b22beb24b449a: ASoC: ssm2602: Support setting the oscillator and the clock output state (2011-09-27 13:30:48 +0100) are available in the git repository at: git://opensource.wolfsonmicro.com/linux-2.6-asoc.git for-3.2 One MFD change for wm1811 which is here to avoid collisions with wm1811. Arnd Bergmann (5): ASoC: use a valid device for dev_err() in Zylonite ASoC: omap_mcpdm_remove cannot be __devexit ASoC: imx: eukrea_tlv320 needs i2c ASoC: sh: use correct __iomem annotations ASoC: samsung: WM8994 depends on MFD_WM8994 Axel Lin (41): ASoC: Remove unused "control_data" field of struct wm8940_priv ASoC: Remove unused "control_data" field of struct wm8960_priv ASoC: Remove unused "control_data" field of struct wm8978_priv ASoC: Remove unused "control_data" field of struct wm9081_priv ASoC: Remove unused "control_data" field of struct wm9090_priv ASoC: Remove unused "control_data" field of struct wm8904_priv ASoC: Fix setting adau1373_dai->master for SND_SOC_DAIFMT_CBS_CFS ASoC: adau1701: Initialize codec->control_data before using it ASoC: Remove unused "control_data" field of struct alc5623_priv ASoC: Remove unused "control_data" field of struct cs4270_private ASoC: Remove unused "control_data" field of struct cs42l51_private ASoC: Remove unused "control_data" field of struct max98088_priv ASoC: Remove unused "control_data" field of struct max98095_priv ASoC: Remove unused "control_data" field of struct ak4671_priv ASoC: adau1701: Fix prototype for adau1701_set_sysclk ASoC: tlv320dac33: Add guarding parentheses to macros ASoC: Remove unused "control_data" field of struct cs4271_private ASoC: Remove unused "control_data" field of struct aic3x_priv ASoC: Add missed regulator_unregister_notifier and regulator_bulk_free in wm8995_remove ASoC: sn95031: Do not use static variable for channel_index ASoC: tlv320aic3x: Use driver_data field of struct i2c_device_id to identify models ASoC: Fix setting update bits for WM8753_LADC and WM8753_RADC ASoC: wm8782: Add __devexit_p at necessary place ASoC: kirkwood-i2s: Add __devexit_p at necessary place ASoC: samsung: Add __devexit_p at necessary places ASoC: tegra: Staticise tegra_i2s_dai and tegra_spdif_dai ASoC: Staticise samsung_spdif_dai ASoC: Staticise sh4_ssi_dai ASoC: Remove unused rate variable in magician_playback_hw_params ASoC: Remove unused srate variable in tegra_spdif_hw_params ASoC: Remove needless codec->dapm.bias_level assignment to SND_SOC_BIAS_OFF ASoC: Staticise simtec_audio_resume() ASoC: Staticise ep93xx_ac97_dai ASoC: txx9: Add __exit_p at necessary place ASoC: Fix setting update bits for WM8741_DACRMSB_ATTENUATION ASoC: samsung: s3c-i2s-v2.c needs module.h ASoC: wm8711: Use snd_soc_update_bits for read-modify-write ASoC: wm8971: Use snd_soc_update_bits for read-modify-write ASoC: wm8988: Use snd_soc_update_bits for read-modify-write ASoC: wm8994: Slightly optimize configure_clock ASoC: wm8995: Slightly optimize configure_clock Jarkko Nikula (5): ASoC: Davinci: Fix FS polarity for I2S format ASoC: omap-mcbsp: Fix FS polarity for LEFT_J, DSP_A and DSP_B formats ASoC: omap-mcbsp: Prepare for init time DAI format setting ASoC: omap: Convert bunch of machine drivers to use init time DAI format ASoC: omap: Use single hw_params callback in sdp3430 and zoom2 Karl Tsou (1): ASoC: Add DRC control for WM8996 Mark Brown (12): ASoC: Add device ID for WM9093 to WM9090 driver ASoC: Allow DAI formats to be specified in the dai_link ASoC: Use dai_fmt in speyside_wm8962 ASoC: Also count neighbour checks for supplies ASoC: Staticise non-exported symbols in rt5631 ASoC: Remove unused function check_vdac_to_outmix from rt5631 Merge branch 'for-3.1' into for-3.2 Merge branch 'for-3.1' into for-3.2 ASoC: Instantiate DAPM widgets before we do the DAI link init ASoC: Fix typo in 24.576MHz rate in WM5100 mfd: Add WM1811 support ASoC: Add WM1811 support Peter Ujfalusi (5): ASoC: twl6040: One workqueue should be enough ASoC: twl6040: correct loop counters for HS/HF ramp code ASoC: twl6040: Shift 2 identifies the HS output in out_drv_event ASoC: twl6040: Simplify code in out_drv_event for pending work check ASoC: omap-pcm: Fix the no period wakeup implementation Ryan Mallon (2): ASoC: max98088 codec: Catch driver bugs for eq channel name ASoC: max98095 codec: Catch driver bugs for biquad channel name Susan Gao (1): ASoC: Fix a bug in WM8962 DSP_A and DSP_B settings Ujfalusi, Peter (1): ASoC: sdp4430: Fix string for FM input name drivers/mfd/wm8994-core.c | 27 ++++++++++ include/linux/mfd/wm8994/core.h | 1 + include/linux/mfd/wm8994/registers.h | 4 ++ include/sound/soc-dai.h | 34 ++++++------ include/sound/soc.h | 2 + sound/soc/codecs/adau1373.c | 2 +- sound/soc/codecs/adau1701.c | 3 +- sound/soc/codecs/ak4671.c | 2 - sound/soc/codecs/alc5623.c | 2 - sound/soc/codecs/cs4270.c | 6 +-- sound/soc/codecs/cs4271.c | 5 -- sound/soc/codecs/cs42l51.c | 6 +-- sound/soc/codecs/max98088.c | 36 ++++++++----- sound/soc/codecs/max98095.c | 34 ++++++++---- sound/soc/codecs/rt5631.c | 20 +------ sound/soc/codecs/sn95031.c | 3 +- sound/soc/codecs/tlv320aic3x.c | 16 ++---- sound/soc/codecs/tlv320dac33.c | 6 +- sound/soc/codecs/twl6040.c | 81 ++++++++++++------------------ sound/soc/codecs/wm5100.c | 6 +-- sound/soc/codecs/wm8711.c | 6 +-- sound/soc/codecs/wm8741.c | 2 +- sound/soc/codecs/wm8753.c | 4 +- sound/soc/codecs/wm8782.c | 2 +- sound/soc/codecs/wm8904.c | 2 - sound/soc/codecs/wm8940.c | 3 - sound/soc/codecs/wm8960.c | 3 - sound/soc/codecs/wm8962.c | 4 +- sound/soc/codecs/wm8971.c | 27 +++------- sound/soc/codecs/wm8978.c | 3 - sound/soc/codecs/wm8988.c | 15 ++---- sound/soc/codecs/wm8994.c | 94 +++++++++++++++++++++++++++++---- sound/soc/codecs/wm8995.c | 19 ++++--- sound/soc/codecs/wm8996.c | 9 +++- sound/soc/codecs/wm9081.c | 3 - sound/soc/codecs/wm9090.c | 4 +- sound/soc/davinci/davinci-i2s.c | 5 ++- sound/soc/ep93xx/ep93xx-ac97.c | 2 +- sound/soc/imx/Kconfig | 1 + sound/soc/kirkwood/kirkwood-i2s.c | 2 +- sound/soc/omap/am3517evm.c | 22 +------- sound/soc/omap/igep0020.c | 23 +-------- sound/soc/omap/n810.c | 19 +------ sound/soc/omap/omap-mcbsp.c | 21 ++++++-- sound/soc/omap/omap-pcm.c | 8 +++ sound/soc/omap/omap3evm.c | 23 +-------- sound/soc/omap/omap3pandora.c | 20 ++------ sound/soc/omap/osk5912.c | 23 +-------- sound/soc/omap/overo.c | 23 +-------- sound/soc/omap/rx51.c | 20 +------- sound/soc/omap/sdp3430.c | 70 ++----------------------- sound/soc/omap/sdp4430.c | 6 +- sound/soc/omap/zoom2.c | 70 ++----------------------- sound/soc/pxa/magician.c | 3 +- sound/soc/pxa/zylonite.c | 8 ++-- sound/soc/samsung/Kconfig | 6 ++ sound/soc/samsung/ac97.c | 2 +- sound/soc/samsung/i2s.c | 2 +- sound/soc/samsung/pcm.c | 2 +- sound/soc/samsung/s3c-i2s-v2.c | 1 + sound/soc/samsung/s3c2412-i2s.c | 2 +- sound/soc/samsung/s3c24xx-i2s.c | 2 +- sound/soc/samsung/s3c24xx_simtec.c | 2 +- sound/soc/samsung/spdif.c | 4 +- sound/soc/samsung/speyside_wm8962.c | 19 +------ sound/soc/sh/fsi.c | 10 ++-- sound/soc/sh/ssi.c | 2 +- sound/soc/soc-core.c | 27 +++++++++- sound/soc/soc-dapm.c | 2 + sound/soc/tegra/tegra_i2s.c | 2 +- sound/soc/tegra/tegra_spdif.c | 5 +- sound/soc/txx9/txx9aclc-generic.c | 2 +- 72 files changed, 389 insertions(+), 568 deletions(-)

2 3

[alsa-devel] ASoC: wm8994: Is the rate_reg for wm8994-aif2 correct?
by Axel Lin 04 Oct '11

04 Oct '11

hi Mark, While reading wm8994.c, it seems the correct rate_reg for wm8994-aif2 should be WM8994_AIF2_RATE. I cannot find wm8994 datasheet, could you help checking it? Thanks, Axel

2 1

[alsa-devel] ASoC updates for 3.1
by Mark Brown 04 Oct '11

04 Oct '11

The following changes since commit 9058020cd9ae3423d6fe7de591698dc96b6701aa: ASoC: ssm2602: Re-enable oscillator after suspend (2011-09-27 11:20:38 +0100) are available in the git repository at: git://opensource.wolfsonmicro.com/linux-2.6-asoc.git for-3.1 None of these should be super critical so no need to rush them out but if there's an opportunity to send stuff they're small, local fixes which are nice to have. Arnd Bergmann (2): ASoC: use a valid device for dev_err() in Zylonite ASoC: omap_mcpdm_remove cannot be __devexit Axel Lin (1): ASoC: Fix setting update bits for WM8753_LADC and WM8753_RADC sound/soc/codecs/wm8753.c | 4 ++-- sound/soc/omap/mcpdm.c | 2 +- sound/soc/omap/mcpdm.h | 2 +- sound/soc/pxa/zylonite.c | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-)

2 3

[PATCH] ASoC: wm8994: Fix setting rate_reg for wm8994-aif2
by Axel Lin 04 Oct '11

04 Oct '11

For wm8994-aif2, the rate_reg should be WM8994_AIF2_RATE. Signed-off-by: Axel Lin <axel.lin(a)gmail.com> --- sound/soc/codecs/wm8994.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 4225e1f..d5b69c0 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -2421,7 +2421,7 @@ static void wm8994_aif_shutdown(struct snd_pcm_substream *substream, rate_reg = WM8994_AIF1_RATE; break; case 2: - rate_reg = WM8994_AIF1_RATE; + rate_reg = WM8994_AIF2_RATE; break; default: break; -- 1.7.4.1

1 0

[alsa-devel] [PATCH 1/2] ASoC: wm8994: Slightly optimize configure_clock
by Axel Lin 04 Oct '11

04 Oct '11

snd_soc_update_bits() will only write new register value if the old value is different from the new value. In additional, snd_soc_update_bits() returns 0 for no change. No need to read WM8994_CLOCKING_1 register before calling snd_soc_update_bits(). Signed-off-by: Axel Lin <axel.lin(a)gmail.com> --- sound/soc/codecs/wm8994.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index e537267..4225e1f 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -208,7 +208,7 @@ static int configure_aif_clock(struct snd_soc_codec *codec, int aif) static int configure_clock(struct snd_soc_codec *codec) { struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec); - int old, new; + int change, new; /* Bring up the AIF clocks first */ configure_aif_clock(codec, 0); @@ -229,14 +229,11 @@ static int configure_clock(struct snd_soc_codec *codec) else new = 0; - old = snd_soc_read(codec, WM8994_CLOCKING_1) & WM8994_SYSCLK_SRC; - - /* If there's no change then we're done. */ - if (old == new) + change = snd_soc_update_bits(codec, WM8994_CLOCKING_1, + WM8994_SYSCLK_SRC, new); + if (!change) return 0; - snd_soc_update_bits(codec, WM8994_CLOCKING_1, WM8994_SYSCLK_SRC, new); - snd_soc_dapm_sync(&codec->dapm); return 0; -- 1.7.4.1

2 2