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

[alsa-devel] [PATCH 0/2] Give the N_AMSDELTA line discipline more generic name
by Janusz Krzysztofik 07 Aug '09

07 Aug '09

This series of patches renames the N_AMSDELTA line discipline, used by the Amstrad Delta ASoC machine driver and the CX20442 ASoC codec driver for controlling the CX20442 voice codec over the CX81801 voice modem, giving it a more generic name: N_V253. The name has been chosen after the voice modem standard codename V.253. I think that even if the code of the line discipline is currently implemented inside those two specific drivers, the idea, if not the code, could be reused with other similar hardware configurations, if necessary. As the line discipline is conceived to be registered from a machine driver, there should be no conflicts, even if used by several different drivers that happen to be be built-in side-by-side. [PATCH 1/2] TTY: Rename N_AMSDELTA line discipline to N_V253 [PATCH 2/2] ASoC: AMS_DELTA: Use updated line discipline name Signed-off-by: Janusz Krzysztofik <jkrzyszt(a)tis.icnet.pl>

2 1

[alsa-devel] Audio support for Simtec Hermes
by Ben Dooks 07 Aug '09

07 Aug '09

Add support for the TLV320AIC33 codec on the Simtec Hermes board, using the core work done for the TLV320AIC23 codecs. Signed-off-by: Ben Dooks <ben(a)simtec.co.uk> --- sound/soc/s3c24xx/Kconfig | 7 + sound/soc/s3c24xx/Makefile | 3 sound/soc/s3c24xx/s3c24xx_simtec_hermes.c | 151 ++++++++++++++++++++++++++++++ 3 files changed, 161 insertions(+) Index: b/sound/soc/s3c24xx/Kconfig =================================================================== --- a/sound/soc/s3c24xx/Kconfig 2009-08-04 12:27:06.000000000 +0100 +++ b/sound/soc/s3c24xx/Kconfig 2009-08-04 12:29:22.000000000 +0100 @@ -127,3 +127,10 @@ config SND_S3C24XX_SOC_SIMTEC_TLV320AIC2 select SND_S3C24XX_SOC_I2S select SND_SOC_TLV320AIC23 select SND_S3C24XX_SOC_SIMTEC + +config SND_S3C24XX_SOC_SIMTEC_HERMES + tristate "SoC I2S Audio support for Simtec Hermes board" + depends on SND_S3C24XX_SOC + select SND_S3C24XX_SOC_I2S + select SND_SOC_TLV320AIC3X + select SND_S3C24XX_SOC_SIMTEC Index: b/sound/soc/s3c24xx/s3c24xx_simtec_hermes.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ b/sound/soc/s3c24xx/s3c24xx_simtec_hermes.c 2009-08-04 12:42:00.000000000 +0100 @@ -0,0 +1,151 @@ +/* sound/soc/s3c24xx/s3c24xx_simtec_hermes.c + * + * Copyright 2009 Simtec Electronics + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. +*/ + +#include <linux/module.h> +#include <linux/clk.h> +#include <linux/platform_device.h> + +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/soc.h> +#include <sound/soc-dapm.h> + +#include <plat/audio-simtec.h> + +#include "s3c24xx-pcm.h" +#include "s3c24xx-i2s.h" +#include "s3c24xx_simtec.h" + +#include "../codecs/tlv320aic3x.h" + +static const struct snd_soc_dapm_widget dapm_widgets[] = { + SND_SOC_DAPM_LINE("GSM Out", NULL), + SND_SOC_DAPM_LINE("GSM In", NULL), + SND_SOC_DAPM_LINE("Line In", NULL), + SND_SOC_DAPM_LINE("ZV", NULL), + SND_SOC_DAPM_MIC("Mic", NULL), +}; + +static const struct snd_soc_dapm_route base_map[] = { + /* Headphone connected to HP{L,R}OUT and HP{L,R}COM */ + + { "Headphone Jack", NULL, "HPLOUT" }, + { "Headphone Jack", NULL, "HPLCOM" }, + { "Headphone Jack", NULL, "HPROUT" }, + { "Headphone Jack", NULL, "HPRCOM" }, + + /* ZV connected to Line1 */ + + { "LINE1L", NULL, "ZV" }, + { "LINE1R", NULL, "ZV" }, + + /* Line In connected to Line2 */ + + { "LINE2L", NULL, "Line In" }, + { "LINE2R", NULL, "Line In" }, + + /* Microphone connected to MIC3R and MIC_BIAS */ + + { "MIC3L", NULL, "Mic" }, + + /* GSM connected to MONO_LOUT and MIC3L (in) */ + + { "GSM Out", NULL, "MONO_LOUT" }, + { "MIC3L", NULL, "GSM In" }, + + /* Speaker is connected to LINEOUT{LN,LP,RN,RP} */ +}; + +/** + * simtec_hermes_init - initialise and add controls + * @codec; The codec instance to attach to. + * + * Attach our controls and configure the necessary codec + * mappings for our sound card instance. +*/ +static int simtec_hermes_init(struct snd_soc_codec *codec) +{ + snd_soc_dapm_new_controls(codec, dapm_widgets, + ARRAY_SIZE(dapm_widgets)); + + snd_soc_dapm_add_routes(codec, base_map, ARRAY_SIZE(base_map)); + + snd_soc_dapm_enable_pin(codec, "Headphone Jack"); + snd_soc_dapm_enable_pin(codec, "Line In"); + snd_soc_dapm_enable_pin(codec, "Line Out"); + snd_soc_dapm_enable_pin(codec, "Mic Jack"); + + simtec_audio_init(codec); + snd_soc_dapm_sync(codec); + + return 0; +} + +static struct aic3x_setup_data codec_setup = { + .i2c_bus = 0, + .i2c_already = 1, +}; + +static struct snd_soc_dai_link simtec_dai_aic33 = { + .name = "tlv320aic33", + .stream_name = "TLV320AIC33", + .cpu_dai = &s3c24xx_i2s_dai, + .codec_dai = &aic3x_dai, + .init = simtec_hermes_init, +}; + +/* simtec audio machine driver */ +static struct snd_soc_card snd_soc_machine_simtec_aic33 = { + .name = "Simtec-Hermes", + .platform = &s3c24xx_soc_platform, + .dai_link = &simtec_dai_aic33, + .num_links = 1, +}; + +/* simtec audio subsystem */ +static struct snd_soc_device simtec_snd_devdata_aic33 = { + .card = &snd_soc_machine_simtec_aic33, + .codec_dev = &soc_codec_dev_aic3x, + .codec_data = &codec_setup, +}; + +static int __devinit simtec_audio_hermes_probe(struct platform_device *pd) +{ + dev_info(&pd->dev, "probing....\n"); + return simtec_audio_core_probe(pd, &simtec_snd_devdata_aic33); +} + +static struct platform_driver simtec_audio_hermes_platdrv = { + .driver = { + .owner = THIS_MODULE, + .name = "s3c24xx-simtec-hermes-snd", + .pm = simtec_audio_pm, + }, + .probe = simtec_audio_hermes_probe, + .remove = __devexit_p(simtec_audio_remove), +}; + +MODULE_ALIAS("platform:s3c24xx-simtec-hermes-snd"); + +static int __init simtec_hermes_modinit(void) +{ + return platform_driver_register(&simtec_audio_hermes_platdrv); +} + +static void __exit simtec_hermes_modexit(void) +{ + platform_driver_unregister(&simtec_audio_hermes_platdrv); +} + +module_init(simtec_hermes_modinit); +module_exit(simtec_hermes_modexit); + +MODULE_AUTHOR("Ben Dooks <ben(a)simtec.co.uk>"); +MODULE_DESCRIPTION("ALSA SoC Simtec Audio support"); +MODULE_LICENSE("GPL"); Index: b/sound/soc/s3c24xx/Makefile =================================================================== --- a/sound/soc/s3c24xx/Makefile 2009-08-04 12:27:06.000000000 +0100 +++ b/sound/soc/s3c24xx/Makefile 2009-08-04 12:29:22.000000000 +0100 @@ -24,6 +24,7 @@ snd-soc-ln2440sbc-alc650-objs := ln2440s snd-soc-neo1973-gta02-wm8753-objs := neo1973_gta02_wm8753.o snd-soc-s3c24xx-uda134x-objs := s3c24xx_uda134x.o snd-soc-s3c24xx-simtec-objs := s3c24xx_simtec.o +snd-soc-s3c24xx-simtec-hermes-objs := s3c24xx_simtec_hermes.o snd-soc-s3c24xx-simtec-tlv320aic23-objs := s3c24xx_simtec_tlv320aic23.o obj-$(CONFIG_SND_S3C24XX_SOC_JIVE_WM8750) += snd-soc-jive-wm8750.o @@ -36,4 +37,6 @@ obj-$(CONFIG_SND_S3C24XX_SOC_LN2440SBC_A obj-$(CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753) += snd-soc-neo1973-gta02-wm8753.o obj-$(CONFIG_SND_S3C24XX_SOC_S3C24XX_UDA134X) += snd-soc-s3c24xx-uda134x.o obj-$(CONFIG_SND_S3C24XX_SOC_SIMTEC) += snd-soc-s3c24xx-simtec.o +obj-$(CONFIG_SND_S3C24XX_SOC_SIMTEC_HERMES) += snd-soc-s3c24xx-simtec-hermes.o obj-$(CONFIG_SND_S3C24XX_SOC_SIMTEC_TLV320AIC23) += snd-soc-s3c24xx-simtec-tlv320aic23.o + -- Ben (ben(a)fluff.org, http://www.fluff.org/) 'a smiley only costs 4 bytes'

2 1

[alsa-devel] PROC_COEF/PROC_INDEX question
by Wu Fengguang 07 Aug '09

07 Aug '09

Hello, I'm not sure of the usage for GET_PROC_COEF/GET_COEF_INDEX, and found that their return value is unstable (changing all the time) for codec: Codec: Realtek ALC888 Address: 2 Function Id: 0x1 Vendor Id: 0x10ec0888 Subsystem Id: 0x80860023 Revision Id: 0x100202 For example: # hda-verb /dev/snd/hwC0D2 0x20 GET_PROC_COEF 0 nid = 0x20, verb = 0xc00, param = 0x0 value = 0x80 # hda-verb /dev/snd/hwC0D2 0x20 GET_COEF_INDEX 0 nid = 0x20, verb = 0xd00, param = 0x0 value = 0xe # hda-verb /dev/snd/hwC0D2 0x20 GET_PROC_COEF 0 nid = 0x20, verb = 0xc00, param = 0x0 value = 0x9c00 # hda-verb /dev/snd/hwC0D2 0x20 GET_COEF_INDEX 0 nid = 0x20, verb = 0xd00, param = 0x0 value = 0xf I wonder if this is the normal case? Thanks, Fengguang

2 4

[alsa-devel] Audio support for TLV320AIC23 on Simtec S3C24XX products
by Ben Dooks 07 Aug '09

07 Aug '09

Add support for the TLV320AIC23 on most of the current Simtec S3C24XX with an initial core set of routines for use with the other S3C24XX designs that do not use the TLV320AIC23. Signed-off-by: Ben Dooks <ben(a)simtec.co.uk> --- arch/arm/common/sbcd/s3c24xx/dev-audio.c | 146 ++++++--- arch/arm/plat-s3c/include/plat/audio-simtec.h | 37 ++ arch/arm/plat-s3c24xx/audio-simtec.c | 97 +----- sound/soc/s3c24xx/Kconfig | 12 sound/soc/s3c24xx/Makefile | 4 sound/soc/s3c24xx/s3c24xx_simtec.c | 391 +++++++++++++++++++++++++ sound/soc/s3c24xx/s3c24xx_simtec.h | 22 + sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c | 137 ++++++++ 8 files changed, 728 insertions(+), 118 deletions(-) Index: b/sound/soc/s3c24xx/Kconfig =================================================================== --- a/sound/soc/s3c24xx/Kconfig 2009-08-04 12:24:09.000000000 +0100 +++ b/sound/soc/s3c24xx/Kconfig 2009-08-06 11:53:38.000000000 +0100 @@ -115,3 +115,15 @@ config SND_S3C24XX_SOC_S3C24XX_UDA134X select SND_S3C24XX_SOC_I2S select SND_SOC_L3 select SND_SOC_UDA134X + +config SND_S3C24XX_SOC_SIMTEC + tristate + help + Internal node for common S3C24XX/Simtec suppor + +config SND_S3C24XX_SOC_SIMTEC_TLV320AIC23 + tristate "SoC I2S Audio support for TLV320AIC23 on Simtec boards" + depends on SND_S3C24XX_SOC + select SND_S3C24XX_SOC_I2S + select SND_SOC_TLV320AIC23 + select SND_S3C24XX_SOC_SIMTEC Index: b/sound/soc/s3c24xx/Makefile =================================================================== --- a/sound/soc/s3c24xx/Makefile 2009-08-04 12:24:09.000000000 +0100 +++ b/sound/soc/s3c24xx/Makefile 2009-08-06 11:53:38.000000000 +0100 @@ -23,6 +23,8 @@ snd-soc-smdk2440-wm8991-objs := smdk2440 snd-soc-ln2440sbc-alc650-objs := ln2440sbc_alc650.o snd-soc-neo1973-gta02-wm8753-objs := neo1973_gta02_wm8753.o snd-soc-s3c24xx-uda134x-objs := s3c24xx_uda134x.o +snd-soc-s3c24xx-simtec-objs := s3c24xx_simtec.o +snd-soc-s3c24xx-simtec-tlv320aic23-objs := s3c24xx_simtec_tlv320aic23.o obj-$(CONFIG_SND_S3C24XX_SOC_JIVE_WM8750) += snd-soc-jive-wm8750.o obj-$(CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753) += snd-soc-neo1973-wm8753.o @@ -33,3 +35,5 @@ obj-$(CONFIG_SND_S3C24XX_SOC_SMDK2443_WM obj-$(CONFIG_SND_S3C24XX_SOC_LN2440SBC_ALC650) += snd-soc-ln2440sbc-alc650.o obj-$(CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753) += snd-soc-neo1973-gta02-wm8753.o obj-$(CONFIG_SND_S3C24XX_SOC_S3C24XX_UDA134X) += snd-soc-s3c24xx-uda134x.o +obj-$(CONFIG_SND_S3C24XX_SOC_SIMTEC) += snd-soc-s3c24xx-simtec.o +obj-$(CONFIG_SND_S3C24XX_SOC_SIMTEC_TLV320AIC23) += snd-soc-s3c24xx-simtec-tlv320aic23.o Index: b/sound/soc/s3c24xx/s3c24xx_simtec.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ b/sound/soc/s3c24xx/s3c24xx_simtec.c 2009-08-04 12:29:02.000000000 +0100 @@ -0,0 +1,391 @@ +/* sound/soc/s3c24xx/s3c24xx_simtec.c + * + * Copyright 2009 Simtec Electronics + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. +*/ + +#define DEBUG + +#include <linux/module.h> +#include <linux/moduleparam.h> +#include <linux/platform_device.h> +#include <linux/gpio.h> +#include <linux/clk.h> +#include <linux/i2c.h> + +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/soc.h> +#include <sound/soc-dapm.h> + +#include <plat/audio-simtec.h> + +#include "s3c24xx-pcm.h" +#include "s3c24xx-i2s.h" +#include "s3c24xx_simtec.h" + +static struct s3c24xx_audio_simtec_pdata *pdata; +static struct clk *xtal_clk; + +static int spk_gain; +static int spk_unmute; + +/** + * speaker_gain_get - read the speaker gain setting. + * @kcontrol: The control for the speaker gain. + * @ucontrol: The value that needs to be updated. + * + * Read the value for the AMP gain control. + */ +static int speaker_gain_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + ucontrol->value.integer.value[0] = spk_gain; + return 0; +} + +/** + * speaker_gain_set - set the value of the speaker amp gain + * @value: The value to write. + */ +static void speaker_gain_set(int value) +{ + gpio_set_value_cansleep(pdata->amp_gain[0], value & 1); + gpio_set_value_cansleep(pdata->amp_gain[1], value >> 1); +} + +/** + * speaker_gain_put - set the speaker gain setting. + * @kcontrol: The control for the speaker gain. + * @ucontrol: The value that needs to be set. + * + * Set the value of the speaker gain from the specified + * @ucontrol setting. + * + * Note, if the speaker amp is muted, then we do not set a gain value + * as at-least one of the ICs that is fitted will try and power up even + * if the main control is set to off. + */ +static int speaker_gain_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + int value = ucontrol->value.integer.value[0]; + + spk_gain = value; + + if (!spk_unmute) + speaker_gain_set(value); + + return 0; +} + +static const struct snd_kcontrol_new amp_gain_controls[] = { + SOC_SINGLE_EXT("Speaker Gain", 0, 0, 3, 0, + speaker_gain_get, speaker_gain_put), +}; + +/** + * spk_unmute_state - set the unmute state of the speaker + * @to: zero to unmute, non-zero to ununmute. + */ +static void spk_unmute_state(int to) +{ + pr_debug("%s: to=%d\n", __func__, to); + + spk_unmute = to; + gpio_set_value(pdata->amp_gpio, to); + + /* if we're umuting, also re-set the gain */ + if (to && pdata->amp_gain[0] > 0) + speaker_gain_set(spk_gain); +} + +/** + * speaker_unmute_get - read the speaker unmute setting. + * @kcontrol: The control for the speaker gain. + * @ucontrol: The value that needs to be updated. + * + * Read the value for the AMP gain control. + */ +static int speaker_unmute_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + ucontrol->value.integer.value[0] = spk_unmute; + return 0; +} + +/** + * speaker_unmute_put - set the speaker unmute setting. + * @kcontrol: The control for the speaker gain. + * @ucontrol: The value that needs to be set. + * + * Set the value of the speaker gain from the specified + * @ucontrol setting. + */ +static int speaker_unmute_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + spk_unmute_state(ucontrol->value.integer.value[0]); + return 0; +} + +static const struct snd_kcontrol_new amp_unmute_controls[] = { + SOC_SINGLE_EXT("Speaker", 0, 0, 1, 0, + speaker_unmute_get, speaker_unmute_put), +}; + +void simtec_audio_init(struct snd_soc_codec *codec) +{ + if (pdata->amp_gpio > 0) { + pr_debug("%s: adding amp routes\n", __func__); + + snd_soc_add_controls(codec, amp_unmute_controls, + ARRAY_SIZE(amp_unmute_controls)); + } + + if (pdata->amp_gain[0] > 0) { + pr_debug("%s: adding amp controls\n", __func__); + snd_soc_add_controls(codec, amp_gain_controls, + ARRAY_SIZE(amp_gain_controls)); + } +} +EXPORT_SYMBOL_GPL(simtec_audio_init); + +#define CODEC_CLOCK 12000000 + +/** + * simtec_hw_params - update hardware parameters + * @substream: The audio substream instance. + * @params: The parameters requested. + * + * Update the codec data routing and configuration settings + * from the supplied data. + */ +static int simtec_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_dai *codec_dai = rtd->dai->codec_dai; + struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; + int ret; + + /* Set the CODEC as the bus clock master, I2S */ + ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S | + SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBM_CFM); + if (ret) { + pr_err("%s: failed set cpu dai format\n", __func__); + return ret; + } + + /* Set the CODEC as the bus clock master */ + ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S | + SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBM_CFM); + if (ret) { + pr_err("%s: failed set codec dai format\n", __func__); + return ret; + } + + ret = snd_soc_dai_set_sysclk(codec_dai, 0, + CODEC_CLOCK, SND_SOC_CLOCK_IN); + if (ret) { + pr_err( "%s: failed setting codec sysclk\n", __func__); + return ret; + } + + if (pdata->use_mpllin) { + ret = snd_soc_dai_set_sysclk(cpu_dai, S3C24XX_CLKSRC_MPLL, + 0, SND_SOC_CLOCK_OUT); + + if (ret) { + pr_err("%s: failed to set MPLLin as clksrc\n", + __func__); + return ret; + } + } + + if (pdata->output_cdclk) { + int cdclk_scale; + + cdclk_scale = clk_get_rate(xtal_clk) / CODEC_CLOCK; + cdclk_scale--; + + ret = snd_soc_dai_set_clkdiv(cpu_dai, S3C24XX_DIV_PRESCALER, + cdclk_scale); + } + + return 0; +} + +static int simtec_call_startup(struct s3c24xx_audio_simtec_pdata *pd) +{ + /* call any board supplied startup code, this currently only + * covers the bast/vr1000 which have a CPLD in the way of the + * LRCLK */ + if (pd->startup) + pd->startup(); + + return 0; +} + +static struct snd_soc_ops simtec_snd_ops = { + .hw_params = simtec_hw_params, +}; + +/** + * attach_gpio_amp - get and configure the necessary gpios + * @dev: The device we're probing. + * @pd: The platform data supplied by the board. + * + * If there is a GPIO based amplifier attached to the board, claim + * the necessary GPIO lines for it, and set default values. + */ +static int attach_gpio_amp(struct device *dev, + struct s3c24xx_audio_simtec_pdata *pd) +{ + int ret; + + /* attach gpio amp gain (if any) */ + if (pdata->amp_gain[0] > 0) { + ret = gpio_request(pd->amp_gain[0], "gpio-amp-gain0"); + if (ret) { + dev_err(dev, "cannot get amp gpio gain0\n"); + return ret; + } + + ret = gpio_request(pd->amp_gain[1], "gpio-amp-gain1"); + if (ret) { + dev_err(dev, "cannot get amp gpio gain1\n"); + gpio_free(pdata->amp_gain[0]); + return ret; + } + + gpio_direction_output(pd->amp_gain[0], 0); + gpio_direction_output(pd->amp_gain[1], 0); + } + + /* note, curently we assume GPA0 isn't valid amp */ + if (pdata->amp_gpio > 0) { + ret = gpio_request(pd->amp_gpio, "gpio-amp"); + if (ret) { + dev_err(dev, "cannot get amp gpio %d (%d)\n", + pd->amp_gpio, ret); + goto err_amp; + } + + /* set the amp off at startup */ + spk_unmute_state(0); + } + + return 0; + +err_amp: + if (pd->amp_gain[0] > 0) { + gpio_free(pd->amp_gain[0]); + gpio_free(pd->amp_gain[1]); + } + + return ret; +} + +static void detach_gpio_amp(struct s3c24xx_audio_simtec_pdata *pd) +{ + if (pd->amp_gain[0] > 0) { + gpio_free(pd->amp_gain[0]); + gpio_free(pd->amp_gain[1]); + } + + if (pd->amp_gpio > 0) + gpio_free(pd->amp_gpio); +} + +#ifdef CONFIG_PM +int simtec_audio_resume(struct device *dev) +{ + simtec_call_startup(pdata); + return 0; +} + +struct dev_pm_ops simtec_audio_pmops = { + .resume = simtec_audio_resume, +}; +EXPORT_SYMBOL_GPL(simtec_audio_pmops); +#endif + +int __devinit simtec_audio_core_probe(struct platform_device *pdev, + struct snd_soc_device *socdev) +{ + struct platform_device *snd_dev; + int ret; + + socdev->card->dai_link->ops = &simtec_snd_ops; + + pdata = pdev->dev.platform_data; + if (!pdata) { + dev_err(&pdev->dev, "no platform data supplied\n"); + return -EINVAL; + } + + simtec_call_startup(pdata); + + xtal_clk = clk_get(&pdev->dev, "xtal"); + if (IS_ERR(xtal_clk)) { + dev_err(&pdev->dev, "could not get clkout0\n"); + return -EINVAL; + } + + dev_info(&pdev->dev, "xtal rate is %ld\n", clk_get_rate(xtal_clk)); + + ret = attach_gpio_amp(&pdev->dev, pdata); + if (ret) + goto err_clk; + + snd_dev = platform_device_alloc("soc-audio", -1); + if (!snd_dev) { + dev_err(&pdev->dev, "failed to alloc soc-audio devicec\n"); + ret = -ENOMEM; + goto err_gpio; + } + + platform_set_drvdata(snd_dev, socdev); + socdev->dev = &snd_dev->dev; + + ret = platform_device_add(snd_dev); + if (ret) { + dev_err(&pdev->dev, "failed to add soc-audio dev\n"); + goto err_pdev; + } + + platform_set_drvdata(pdev, snd_dev); + return 0; + +err_pdev: + platform_device_put(snd_dev); + +err_gpio: + detach_gpio_amp(pdata); + +err_clk: + clk_put(xtal_clk); + return ret; +} + +int __devexit simtec_audio_remove(struct platform_device *pdev) +{ + struct platform_device *snd_dev = platform_get_drvdata(pdev); + + platform_device_unregister(snd_dev); + + detach_gpio_amp(pdata); + clk_put(xtal_clk); + return 0; +} +EXPORT_SYMBOL_GPL(simtec_audio_remove); + +MODULE_AUTHOR("Ben Dooks <ben(a)simtec.co.uk>"); +MODULE_DESCRIPTION("ALSA SoC Simtec Audio common support"); +MODULE_LICENSE("GPL"); Index: b/arch/arm/plat-s3c/include/plat/audio-simtec.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ b/arch/arm/plat-s3c/include/plat/audio-simtec.h 2009-08-04 12:24:11.000000000 +0100 @@ -0,0 +1,37 @@ +/* arch/arm/plat-s3c/include/plat/audio-simtec.h + * + * Copyright 2008 Simtec Electronics + * http://armlinux.simtec.co.uk/ + * Ben Dooks <ben(a)simtec.co.uk> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * Simtec Audio support. +*/ + +/** + * struct s3c24xx_audio_simtec_pdata - platform data for simtec audio + * @use_mpllin: Select codec clock from MPLLin + * @output_cdclk: Need to output CDCLK to the codec + * @have_mic: Set if we have a MIC socket + * @have_lout: Set if we have a LineOut socket + * @amp_gpio: GPIO pin to enable the AMP + * @amp_gain: Option GPIO to control AMP gain + */ +struct s3c24xx_audio_simtec_pdata { + unsigned int use_mpllin:1; + unsigned int output_cdclk:1; + + unsigned int have_mic:1; + unsigned int have_lout:1; + + int amp_gpio; + int amp_gain[2]; + + void (*startup)(void); +}; + +extern int simtec_audio_add(const char *codec_name, + struct s3c24xx_audio_simtec_pdata *pdata); Index: b/arch/arm/plat-s3c24xx/audio-simtec.c =================================================================== --- a/arch/arm/plat-s3c24xx/audio-simtec.c 2009-08-04 12:05:59.000000000 +0100 +++ b/arch/arm/plat-s3c24xx/audio-simtec.c 2009-08-04 12:24:11.000000000 +0100 @@ -45,7 +45,7 @@ #include <plat/audio.h> #include <plat/regs-iis.h> -#include <asm/plat-s3c24xx/audio-simtec.h> +#include <plat/audio-simtec.h> #include <plat/devs.h> #include <plat/pm.h> @@ -56,7 +56,7 @@ static inline int has_lr_routing(void) return machine_is_bast() || machine_is_vr1000(); } -static int simtec_audio_startup(void *pw) +static void simtec_audio_startup(void) { unsigned int tmp; unsigned long flags; @@ -71,94 +71,40 @@ static int simtec_audio_startup(void *pw } local_irq_restore(flags); - - return 0; -} - -static void simtec_audio_shutdown(void *pw) -{ - unsigned int tmp; - unsigned long flags; - - /* switch off LR clock routing */ - - local_irq_save(flags); - - if (has_lr_routing()) { - tmp = __raw_readb(BAST_VA_CTRL1); - tmp &= ~BAST_CPLD_CTRL1_LRMASK; - tmp |= BAST_CPLD_CTRL1_LRCOFF; - __raw_writeb(tmp, BAST_VA_CTRL1); - } - - local_irq_restore(flags); -} - -static int simtec_audio_matchdev(struct device *dev) -{ - printk(KERN_INFO "%s: dev = %p\n", __func__, dev); - - if (dev->parent == NULL || dev->parent->parent == NULL) - return 0; - - printk(KERN_INFO "%s: %s\n", __func__, dev_name(dev->parent)); - if (strncmp(dev_name(dev->parent), "i2c", strlen("i2c")) != 0) - return 0; - - printk(KERN_INFO "%s: %s\n", __func__, dev_name(dev->parent->parent)); - if (strncmp(dev_name(dev->parent->parent), "s3c24", - strlen("s3c24")) == 0) - return 1; - - return 0; } -/* device registration info */ - -static struct s3c24xx_iis_ops simtec_audio_ops = { - .startup = simtec_audio_startup, - .shutdown = simtec_audio_shutdown, +static struct s3c24xx_audio_simtec_pdata simtec_audio_platdata = { }; -static struct s3c24xx_platdata_iis simtec_audio_platdata = { - .ops = &simtec_audio_ops, - .codec_clk = "clkout0", - .match_dev = simtec_audio_matchdev, -}; +static char our_name[32]; static struct platform_device audio_dev = { - .name = "s3c24xx-tlv320aic23", + .name = our_name, + .id = -1, .dev = { .parent = &s3c_device_iis.dev, .platform_data = &simtec_audio_platdata, }, }; -static struct platform_device audio_dev2 = { - .name = "s3c24xx-tlv320aic33", - .dev = { - .parent = &s3c_device_iis.dev, - .platform_data = &simtec_audio_platdata, - }, -}; - -static void __init simtec_audio_cdclk_mpllin(void) +int __init simtec_audio_add(const char *name, + struct s3c24xx_audio_simtec_pdata *spd) { - simtec_audio_platdata.flags = AUDIO_CDCLK_MPLL | AUDIO_CDCLK_OUTPUT; -} + if (!name) + name = "tlv320aic23"; -int __init simtec_audio_add(unsigned int is_aic33, - unsigned int cdclk_master) -{ - if (cdclk_master) - simtec_audio_cdclk_mpllin(); + snprintf(our_name, sizeof(our_name)-1, "s3c24xx-simtec-%s", name); - platform_device_register(&s3c_device_iis); + if (!spd) { + printk(KERN_ERR "%s: no source platadata\n", __func__); + return -EINVAL; + } - if (is_aic33) - platform_device_register(&audio_dev2); - else - platform_device_register(&audio_dev); + /* copy platform data so the source can be __initdata */ + simtec_audio_platdata = *spd; + + platform_device_register(&s3c_device_iis); + platform_device_register(&audio_dev); return 0; } @@ -172,7 +118,8 @@ static int __init simtec_audio_init(void printk(KERN_INFO "Simtec TLV320AIC23 Audio platform driver\n"); - simtec_audio_shutdown(NULL); + if (has_lr_routing()) + simtec_audio_platdata.startup = simtec_audio_startup; platform_device_register(&s3c_device_iis); return platform_device_register(&audio_dev); Index: b/arch/arm/common/sbcd/s3c24xx/dev-audio.c =================================================================== --- a/arch/arm/common/sbcd/s3c24xx/dev-audio.c 2009-08-04 12:05:59.000000000 +0100 +++ b/arch/arm/common/sbcd/s3c24xx/dev-audio.c 2009-08-04 12:24:11.000000000 +0100 @@ -12,6 +12,9 @@ #include <linux/kernel.h> #include <linux/ioport.h> #include <linux/device.h> +#include <linux/ioport.h> +#include <linux/gpio.h> +#include <linux/io.h> #include "s3c24xx.h" #include <asm/mach/sbcd-utils.h> @@ -24,22 +27,69 @@ #include "../devices/platform.h" #include <plat/devs.h> -#include <asm/plat-s3c24xx/audio-simtec.h> +#include <plat/audio-simtec.h> + +enum amp_type { + AMP_VR2K, + AMP_HERMES, /* GAIN0 = GPD9, GAIN1 = GPD10 */ +}; + +static void __iomem *reg; +static enum amp_type type; + +static void amp_gpio_set(struct gpio_chip *chip, + unsigned offset, int value) +{ + u32 to_write; -static unsigned char is_cdclk_master; + if (type == AMP_VR2K) { + to_write = value ? 0x01 : 0x03; + } else { + to_write = value ? 0x03 : 0x02; + } + + writeb(to_write, reg); +} + +static int amp_gpio_output(struct gpio_chip *chip, + unsigned offset, int value) +{ + amp_gpio_set(chip, offset, value); + return 0; +} + +static struct gpio_chip amp_gpio = { + .label = "amp", + .direction_output = amp_gpio_output, + .set = amp_gpio_set, + .ngpio = 1, + .base = -1, +}; + +static struct s3c24xx_audio_simtec_pdata __initdata pdata = { +}; static __init int s3c24xx_drv_bast_audio_attach(struct sbcd_state *state, struct sbcd_item *parent, struct sbcd_item *drv_it) { - int is_tlv320aic33 = sbcd_board_has_driver("tlv320aic33"); + char *name = NULL; /* some vr2000s do not have the necessary setup in their - * configuration data, so force is_cdclk_master here. */ - if (sbcd_board_has_driver("vr2k-amp")) - is_cdclk_master = 1; + * configuration data, so force cdclk_master here. */ + + if (sbcd_board_has_driver("vr2k-amp") || + sbcd_board_has_driver("hermes-amp")) { + pdata.use_mpllin = 1; + pdata.output_cdclk = 1; + } - return simtec_audio_add(is_tlv320aic33, is_cdclk_master); + if (sbcd_board_has_driver("hermes-amp")) + name = "hermes-snd"; + + pdata.amp_gpio = amp_gpio.base; + + return simtec_audio_add(name, &pdata); } @@ -61,8 +111,10 @@ static __init int s3c24xx_drv_audio_atta sbcd_get_optvals(ptr, &optname, &optval); if (strcmp(optname, "cdclk") == 0 && - strcmp(optval, "master") == 0) - is_cdclk_master = 1; + strcmp(optval, "master") == 0) { + pdata.use_mpllin = 1; + pdata.output_cdclk = 1; + } break; } } @@ -76,49 +128,57 @@ static __init int s3c24xx_drv_audio_atta sbcd_drv_decl2(cpu_audio, "cpu-audio", s3c24xx_drv_audio_attach); sbcd_drv_decl2(bast_audio, "bast-audio", s3c24xx_drv_bast_audio_attach); -static struct resource vr2k_amp_resource[] = { - [0] = { - .start = S3C2410_CS1 + 0xc0, - .end = S3C2410_CS1 + 0xc1, - .flags = IORESOURCE_MEM, - }, -}; - -static struct resource hermes_amp_resource[] = { - [0] = { - .start = S3C2410_CS1 + 0x140, - .end = S3C2410_CS1 + 0x141, - .flags = IORESOURCE_MEM, - }, -}; static __init int s3c24xx_drv_amp_attach(struct sbcd_state *state, - struct sbcd_item *parent, - struct sbcd_item *drv_it) + enum amp_type amp_type) { - struct platform_device *pdev; + unsigned long base; int ret; - ret = sbcd_dev_platform_create(state, parent, drv_it, &pdev); - if (ret) { - printk(KERN_ERR "%s: no platform device\n", __func__); - return -ENODEV; + if (state->pass != SBCD_PASS_GPIO) + return 0; + + type = amp_type; + + if (amp_type == AMP_VR2K) { + base = S3C2410_CS1 + 0xc0; + } else { + base = S3C2410_CS1 + 0x140; + pdata.amp_gain[0] = S3C2410_GPD(9); + pdata.amp_gain[1] = S3C2410_GPD(10); } - if (pdev->num_resources == 0) { - if (strcmp(pdev->name, "vr2k-amp") == 0) { - pdev->resource = vr2k_amp_resource; - pdev->num_resources = ARRAY_SIZE(vr2k_amp_resource); - } else if (strcmp(pdev->name, "hermes-amp") == 0) { - pdev->resource = hermes_amp_resource; - pdev->num_resources = ARRAY_SIZE(hermes_amp_resource); - } + /* note, we don't request the region, other gpio blocks may + * be sharing it. */ + + reg = ioremap(base, 2); + if (!reg) { + printk(KERN_ERR "%s: failed to map regs\n", __func__); + return -ENXIO; + } + + ret = gpiochip_add(&amp_gpio); + if (!ret) { + printk(KERN_ERR "%s: failed to add gpio\n", __func__); + return ret; } - pdev->dev.parent = &s3c_device_iis.dev; - platform_device_register(pdev); return 0; } -sbcd_drv_decl2(vr2k_amp, "vr2k-amp", s3c24xx_drv_amp_attach); -sbcd_drv_decl2(hermes_amp, "hermes-amp", s3c24xx_drv_amp_attach); +static __init int s3c24xx_drv_vr2k_amp_attach(struct sbcd_state *state, + struct sbcd_item *parent, + struct sbcd_item *drv_it) +{ + return s3c24xx_drv_amp_attach(state, AMP_VR2K); +} + +static __init int s3c24xx_drv_hermes_amp_attach(struct sbcd_state *state, + struct sbcd_item *parent, + struct sbcd_item *drv_it) +{ + return s3c24xx_drv_amp_attach(state, AMP_HERMES); +} + +sbcd_drv_decl2_gpio(vr2k_amp, "vr2k-amp", s3c24xx_drv_vr2k_amp_attach); +sbcd_drv_decl2_gpio(hermes_amp, "hermes-amp", s3c24xx_drv_hermes_amp_attach); Index: b/sound/soc/s3c24xx/s3c24xx_simtec.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ b/sound/soc/s3c24xx/s3c24xx_simtec.h 2009-08-04 12:24:11.000000000 +0100 @@ -0,0 +1,22 @@ +/* sound/soc/s3c24xx/s3c24xx_simtec.h + * + * Copyright 2009 Simtec Electronics + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. +*/ + +extern void simtec_audio_init(struct snd_soc_codec *codec); + +extern int simtec_audio_core_probe(struct platform_device *pdev, + struct snd_soc_device *socdev); + +extern int simtec_audio_remove(struct platform_device *pdev); + +#ifdef CONFIG_PM +extern struct dev_pm_ops simtec_audio_pmops; +#define simtec_audio_pm &simtec_audio_pmops +#else +#define simtec_audio_pm NULL +#endif Index: b/sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ b/sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c 2009-08-04 12:24:11.000000000 +0100 @@ -0,0 +1,137 @@ +/* sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c + * + * Copyright 2009 Simtec Electronics + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. +*/ + +#include <linux/module.h> +#include <linux/clk.h> +#include <linux/platform_device.h> + +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/soc.h> +#include <sound/soc-dapm.h> + +#include <plat/audio-simtec.h> + +#include "s3c24xx-pcm.h" +#include "s3c24xx-i2s.h" +#include "s3c24xx_simtec.h" + +#include "../codecs/tlv320aic23.h" + +/* supported machines: + * + * Machine Connections AMP + * ------- ----------- --- + * BAST MIC, HPOUT, LOUT, LIN TPA2001D1 (HPOUTL,R) (gain hardwired) + * VR1000 HPOUT, LIN None + * VR2000 LIN, LOUT, MIC, HP LM4871 (HPOUTL,R) + * DePicture LIN, LOUT, MIC, HP LM4871 (HPOUTL,R) + * Anubis LIN, LOUT, MIC, HP TPA2001D1 (HPOUTL,R) + */ + +static const struct snd_soc_dapm_widget dapm_widgets[] = { + SND_SOC_DAPM_HP("Headphone Jack", NULL), + SND_SOC_DAPM_LINE("Line In", NULL), + SND_SOC_DAPM_LINE("Line Out", NULL), + SND_SOC_DAPM_MIC("Mic Jack", NULL), +}; + +static const struct snd_soc_dapm_route base_map[] = { + { "Headphone Jack", NULL, "LHPOUT"}, + { "Headphone Jack", NULL, "RHPOUT"}, + + { "Line Out", NULL, "LOUT" }, + { "Line Out", NULL, "ROUT" }, + + { "LLINEIN", NULL, "Line In"}, + { "RLINEIN", NULL, "Line In"}, + + { "MICIN", NULL, "Mic Jack"}, +}; + +/** + * simtec_tlv320aic23_init - initialise and add controls + * @codec; The codec instance to attach to. + * + * Attach our controls and configure the necessary codec + * mappings for our sound card instance. +*/ +static int simtec_tlv320aic23_init(struct snd_soc_codec *codec) +{ + snd_soc_dapm_new_controls(codec, dapm_widgets, + ARRAY_SIZE(dapm_widgets)); + + snd_soc_dapm_add_routes(codec, base_map, ARRAY_SIZE(base_map)); + + snd_soc_dapm_enable_pin(codec, "Headphone Jack"); + snd_soc_dapm_enable_pin(codec, "Line In"); + snd_soc_dapm_enable_pin(codec, "Line Out"); + snd_soc_dapm_enable_pin(codec, "Mic Jack"); + + simtec_audio_init(codec); + snd_soc_dapm_sync(codec); + + return 0; +} + +static struct snd_soc_dai_link simtec_dai_aic23 = { + .name = "tlv320aic23", + .stream_name = "TLV320AIC23", + .cpu_dai = &s3c24xx_i2s_dai, + .codec_dai = &tlv320aic23_dai, + .init = simtec_tlv320aic23_init, +}; + +/* simtec audio machine driver */ +static struct snd_soc_card snd_soc_machine_simtec_aic23 = { + .name = "Simtec", + .platform = &s3c24xx_soc_platform, + .dai_link = &simtec_dai_aic23, + .num_links = 1, +}; + +/* simtec audio subsystem */ +static struct snd_soc_device simtec_snd_devdata_aic23 = { + .card = &snd_soc_machine_simtec_aic23, + .codec_dev = &soc_codec_dev_tlv320aic23, +}; + +static int __devinit simtec_audio_tlv320aic23_probe(struct platform_device *pd) +{ + return simtec_audio_core_probe(pd, &simtec_snd_devdata_aic23); +} + +static struct platform_driver simtec_audio_tlv320aic23_platdrv = { + .driver = { + .owner = THIS_MODULE, + .name = "s3c24xx-simtec-tlv320aic23", + .pm = simtec_audio_pm, + }, + .probe = simtec_audio_tlv320aic23_probe, + .remove = __devexit_p(simtec_audio_remove), +}; + +MODULE_ALIAS("platform:s3c24xx-simtec-tlv320aic23"); + +static int __init simtec_tlv320aic23_modinit(void) +{ + return platform_driver_register(&simtec_audio_tlv320aic23_platdrv); +} + +static void __exit simtec_tlv320aic23_modexit(void) +{ + platform_driver_unregister(&simtec_audio_tlv320aic23_platdrv); +} + +module_init(simtec_tlv320aic23_modinit); +module_exit(simtec_tlv320aic23_modexit); + +MODULE_AUTHOR("Ben Dooks <ben(a)simtec.co.uk>"); +MODULE_DESCRIPTION("ALSA SoC Simtec Audio support"); +MODULE_LICENSE("GPL"); -- Ben (ben(a)fluff.org, http://www.fluff.org/) 'a smiley only costs 4 bytes'

2 1

[alsa-devel] [PATCH][2.6.31-rc5] ARM: OMAP: McBSP: Fix ASoC on OMAP1510 by fixing API of omap_mcbsp_start/stop
by Jarkko Nikula 07 Aug '09

07 Aug '09

Simultaneous audio playback and capture on OMAP1510 can cause that second stream is stalled if there is enough delay between startup of the audio streams. Current implementation of the omap_mcbsp_start is starting both transmitter and receiver at the same time and it is called only for firstly started audio stream from the OMAP McBSP based ASoC DAI driver. Since DMA request lines on OMAP1510 are edge sensitive, the DMA request is missed if there is no DMA transfer set up at that time when the first word after McBSP startup is transmitted. The problem hasn't noted before since later OMAPs are using level sensitive DMA request lines. Fix the problem by changing API of omap_mcbsp_start and omap_mcbsp_stop by allowing to start and stop individually McBSP transmitter and receiver logics. Then call those functions individually for both audio playback and capture streams. This ensures that DMA transfer is setup before transmitter or receiver is started. Thanks to Janusz Krzysztofik <jkrzyszt(a)tis.icnet.pl> for detailed problem analysis and Peter Ujfalusi <peter.ujfalusi(a)nokia.com> for info about DMA request line behavior differences between the OMAP generations. Reported-and-tested-by: Janusz Krzysztofik <jkrzyszt(a)tis.icnet.pl> Signed-off-by: Jarkko Nikula <jhnikula(a)gmail.com> Cc: Mark Brown <broonie(a)opensource.wolfsonmicro.com> Cc: Tony Lindgren <tony(a)atomide.com> --- arch/arm/plat-omap/include/mach/mcbsp.h | 4 +- arch/arm/plat-omap/mcbsp.c | 50 +++++++++++++++++++----------- sound/soc/omap/omap-mcbsp.c | 10 +++--- 3 files changed, 39 insertions(+), 25 deletions(-) diff --git a/arch/arm/plat-omap/include/mach/mcbsp.h b/arch/arm/plat-omap/include/mach/mcbsp.h index bb154ea..57249bb 100644 --- a/arch/arm/plat-omap/include/mach/mcbsp.h +++ b/arch/arm/plat-omap/include/mach/mcbsp.h @@ -387,8 +387,8 @@ void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config, void omap_mcbsp_config(unsigned int id, const struct omap_mcbsp_reg_cfg * config); int omap_mcbsp_request(unsigned int id); void omap_mcbsp_free(unsigned int id); -void omap_mcbsp_start(unsigned int id); -void omap_mcbsp_stop(unsigned int id); +void omap_mcbsp_start(unsigned int id, int tx, int rx); +void omap_mcbsp_stop(unsigned int id, int tx, int rx); void omap_mcbsp_xmit_word(unsigned int id, u32 word); u32 omap_mcbsp_recv_word(unsigned int id); diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c index efa0e01..a3d2313 100644 --- a/arch/arm/plat-omap/mcbsp.c +++ b/arch/arm/plat-omap/mcbsp.c @@ -328,14 +328,15 @@ void omap_mcbsp_free(unsigned int id) EXPORT_SYMBOL(omap_mcbsp_free); /* - * Here we start the McBSP, by enabling the sample - * generator, both transmitter and receivers, - * and the frame sync. + * Here we start the McBSP, by enabling transmitter, receiver or both. + * If no transmitter or receiver is active prior calling, then sample-rate + * generator and frame sync are started. */ -void omap_mcbsp_start(unsigned int id) +void omap_mcbsp_start(unsigned int id, int tx, int rx) { struct omap_mcbsp *mcbsp; void __iomem *io_base; + int idle; u16 w; if (!omap_mcbsp_check_valid_id(id)) { @@ -348,32 +349,40 @@ void omap_mcbsp_start(unsigned int id) mcbsp->rx_word_length = (OMAP_MCBSP_READ(io_base, RCR1) >> 5) & 0x7; mcbsp->tx_word_length = (OMAP_MCBSP_READ(io_base, XCR1) >> 5) & 0x7; - /* Start the sample generator */ - w = OMAP_MCBSP_READ(io_base, SPCR2); - OMAP_MCBSP_WRITE(io_base, SPCR2, w | (1 << 6)); + idle = !((OMAP_MCBSP_READ(io_base, SPCR2) | + OMAP_MCBSP_READ(io_base, SPCR1)) & 1); + + if (idle) { + /* Start the sample generator */ + w = OMAP_MCBSP_READ(io_base, SPCR2); + OMAP_MCBSP_WRITE(io_base, SPCR2, w | (1 << 6)); + } /* Enable transmitter and receiver */ w = OMAP_MCBSP_READ(io_base, SPCR2); - OMAP_MCBSP_WRITE(io_base, SPCR2, w | 1); + OMAP_MCBSP_WRITE(io_base, SPCR2, w | (tx & 1)); w = OMAP_MCBSP_READ(io_base, SPCR1); - OMAP_MCBSP_WRITE(io_base, SPCR1, w | 1); + OMAP_MCBSP_WRITE(io_base, SPCR1, w | (rx & 1)); udelay(100); - /* Start frame sync */ - w = OMAP_MCBSP_READ(io_base, SPCR2); - OMAP_MCBSP_WRITE(io_base, SPCR2, w | (1 << 7)); + if (idle) { + /* Start frame sync */ + w = OMAP_MCBSP_READ(io_base, SPCR2); + OMAP_MCBSP_WRITE(io_base, SPCR2, w | (1 << 7)); + } /* Dump McBSP Regs */ omap_mcbsp_dump_reg(id); } EXPORT_SYMBOL(omap_mcbsp_start); -void omap_mcbsp_stop(unsigned int id) +void omap_mcbsp_stop(unsigned int id, int tx, int rx) { struct omap_mcbsp *mcbsp; void __iomem *io_base; + int idle; u16 w; if (!omap_mcbsp_check_valid_id(id)) { @@ -386,15 +395,20 @@ void omap_mcbsp_stop(unsigned int id) /* Reset transmitter */ w = OMAP_MCBSP_READ(io_base, SPCR2); - OMAP_MCBSP_WRITE(io_base, SPCR2, w & ~(1)); + OMAP_MCBSP_WRITE(io_base, SPCR2, w & ~(tx & 1)); /* Reset receiver */ w = OMAP_MCBSP_READ(io_base, SPCR1); - OMAP_MCBSP_WRITE(io_base, SPCR1, w & ~(1)); + OMAP_MCBSP_WRITE(io_base, SPCR1, w & ~(rx & 1)); - /* Reset the sample rate generator */ - w = OMAP_MCBSP_READ(io_base, SPCR2); - OMAP_MCBSP_WRITE(io_base, SPCR2, w & ~(1 << 6)); + idle = !((OMAP_MCBSP_READ(io_base, SPCR2) | + OMAP_MCBSP_READ(io_base, SPCR1)) & 1); + + if (idle) { + /* Reset the sample rate generator */ + w = OMAP_MCBSP_READ(io_base, SPCR2); + OMAP_MCBSP_WRITE(io_base, SPCR2, w & ~(1 << 6)); + } } EXPORT_SYMBOL(omap_mcbsp_stop); diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index a5d46a7..6a837ff 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c @@ -183,21 +183,21 @@ static int omap_mcbsp_dai_trigger(struct snd_pcm_substream *substream, int cmd, struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; struct omap_mcbsp_data *mcbsp_data = to_mcbsp(cpu_dai->private_data); - int err = 0; + int err = 0, play = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK); switch (cmd) { case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_RESUME: case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: - if (!mcbsp_data->active++) - omap_mcbsp_start(mcbsp_data->bus_id); + mcbsp_data->active++; + omap_mcbsp_start(mcbsp_data->bus_id, play, !play); break; case SNDRV_PCM_TRIGGER_STOP: case SNDRV_PCM_TRIGGER_SUSPEND: case SNDRV_PCM_TRIGGER_PAUSE_PUSH: - if (!--mcbsp_data->active) - omap_mcbsp_stop(mcbsp_data->bus_id); + omap_mcbsp_stop(mcbsp_data->bus_id, play, !play); + mcbsp_data->active--; break; default: err = -EINVAL; -- 1.6.3.3

4 6

[alsa-devel] tlv320aic3x: Allow driver to use already registered i2c device
by Ben Dooks 07 Aug '09

07 Aug '09

Add the ability for the driver to use an already registered i2c device instead of creating one of them itself. Add the field i2c_already field to the setup data and not set the i2c bus address the driver will then use the device already setup. Signed-off-by: Ben Dooks <ben(a)simtec.co.uk> --- sound/soc/codecs/tlv320aic3x.c | 9 ++++++++- sound/soc/codecs/tlv320aic3x.h | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) Index: b/sound/soc/codecs/tlv320aic3x.c =================================================================== --- a/sound/soc/codecs/tlv320aic3x.c 2009-08-06 11:53:30.000000000 +0100 +++ b/sound/soc/codecs/tlv320aic3x.c 2009-08-06 15:29:45.000000000 +0100 @@ -1310,6 +1310,7 @@ static int aic3x_i2c_remove(struct i2c_c static const struct i2c_device_id aic3x_i2c_id[] = { { "tlv320aic3x", 0 }, + { "tlv320aic33", 0 }, { } }; MODULE_DEVICE_TABLE(i2c, aic3x_i2c_id); @@ -1405,6 +1406,10 @@ static int aic3x_probe(struct platform_d codec->hw_write = (hw_write_t) i2c_master_send; codec->hw_read = (hw_read_t) aic3x_i2c_read; ret = aic3x_add_i2c_device(pdev, setup); + } else if (setup->i2c_already) { + codec->hw_write = (hw_write_t) i2c_master_send; + codec->hw_read = (hw_read_t) aic3x_i2c_read; + i2c_add_driver(&aic3x_i2c_driver); } #else /* Add other interfaces here */ @@ -1421,6 +1426,7 @@ static int aic3x_remove(struct platform_ { struct snd_soc_device *socdev = platform_get_drvdata(pdev); struct snd_soc_codec *codec = socdev->card->codec; + struct aic3x_setup_data *setup = socdev->codec_data; /* power down chip */ if (codec->control_data) @@ -1429,7 +1435,8 @@ static int aic3x_remove(struct platform_ snd_soc_free_pcms(socdev); snd_soc_dapm_free(socdev); #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) - i2c_unregister_device(codec->control_data); + if (setup && !setup->i2c_already) + i2c_unregister_device(codec->control_data); i2c_del_driver(&aic3x_i2c_driver); #endif kfree(codec->private_data); Index: b/sound/soc/codecs/tlv320aic3x.h =================================================================== --- a/sound/soc/codecs/tlv320aic3x.h 2009-08-06 11:53:30.000000000 +0100 +++ b/sound/soc/codecs/tlv320aic3x.h 2009-08-06 12:11:03.000000000 +0100 @@ -283,6 +283,7 @@ int aic3x_button_pressed(struct snd_soc_ struct aic3x_setup_data { int i2c_bus; + unsigned char i2c_already; /* i2c device already registered */ unsigned short i2c_address; unsigned int gpio_func[2]; }; -- Ben (ben(a)fluff.org, http://www.fluff.org/) 'a smiley only costs 4 bytes'

2 1

[alsa-devel] usb audio
by bruce 07 Aug '09

07 Aug '09

Hi I have the TASCAM US-122L USB.I am using ubuntu studio 9.04.The usb audio inputs and outputs are no functional cant fined them anywhere I am using jack connection kit on my studio the midi are recognized but not the audio.I have submitted to launchpad this report.Here are my jack start up log this is with tascam us-122L set as input and output.It will start with just tascam input but there is no audio only midi with that start. jackd 0.116.1 Copyright 2001-2005 Paul Davis and others. jackd comes with ABSOLUTELY NO WARRANTY This is free software, and you are welcome to redistribute it under certain conditions; see the file COPYING for details JACK compiled with System V SHM support. server `default' registered 23:53:21.206 JACK was started with PID=8295. registered builtin port type 32 bit float mono audio registered builtin port type 8 bit raw midi clock source = system clock via clock_gettime start poll on 3 fd's loading driver .. new client: alsa_pcm, id = 1 type 1 @ 0x9821d48 fd = -1 apparent rate = 44100 creating alsa driver ... hw:1|hw:1|1024|3|44100|0|0|hwmon|hwmeter|-|32bit control device hw:1 23:53:21.383 ALSA active patchbay scan... 23:53:21.407 jack-imput-output003: 14:0 Midi Through -> 20:0 TASCAM US-122L checked. 23:53:21.416 ALSA connection change. 23:53:21.811 ALSA active patchbay scan... 23:53:21.813 jack-imput-output003: 14:0 Midi Through -> 20:0 TASCAM US-122L checked. ALSA: Cannot open PCM device alsa_pcm for playback. Falling back to capture-only mode cannot load driver module alsa starting server engine shutdown server thread back from poll freeing shared port segments stopping server thread last xrun delay: 0.000 usecs max delay reported by backend: 0.000 usecs freeing engine shared memory max usecs: 0.000, engine deleted cleaning up shared memory cleaning up files unregistering server `default' 23:53:22.586 JACK was stopped successfully. 23:53:22.588 Post-shutdown script... 23:53:22.590 killall jackd jackd: no process killed 23:53:23.015 Post-shutdown script terminated with exit status=256. 23:53:23.727 Could not connect to JACK server as client. - Overall operation failed. - Unable to connect to server. Please check the messages window for more info. thank you for any help you mite give :-) Bruce McCandless

1 0

[alsa-devel] [PATCH 1/3] ASoC: change set_tdm_slot api to allow slot_width override.
by Daniel Ribeiro 06 Aug '09

06 Aug '09

Extend set_tdm_slot to allow the user to arbitrarily set the frame width and active TX/RX slots. Updates magician.c and wm9081.c for the new set_tdm_slot(). wm9081.c still doesn't handle the slot_width override. While being there, correct an incorrect use of SlotsPerFrm(7) use in bitmask on pxa-ssp.c (SSCR0_SlotsPerFrm(x) is (((x) - 1) << 24)) ). (this series is meant for Mark's for-2.6.32 branch) Signed-off-by: Daniel Ribeiro <drwyrm(a)gmail.com> --- include/sound/soc-dai.h | 5 +++-- sound/soc/codecs/wm9081.c | 5 +++-- sound/soc/pxa/magician.c | 2 +- sound/soc/pxa/pxa-ssp.c | 27 ++++++++++++++++++++------- sound/soc/soc-core.c | 9 ++++++--- 5 files changed, 33 insertions(+), 15 deletions(-) diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index 352d7ee..6692410 100644 --- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h @@ -106,7 +106,7 @@ int snd_soc_dai_set_pll(struct snd_soc_dai *dai, int snd_soc_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt); int snd_soc_dai_set_tdm_slot(struct snd_soc_dai *dai, - unsigned int mask, int slots); + unsigned int tx_mask, unsigned int rx_mask, int slots, int slot_width); int snd_soc_dai_set_tristate(struct snd_soc_dai *dai, int tristate); @@ -140,7 +140,8 @@ struct snd_soc_dai_ops { */ int (*set_fmt)(struct snd_soc_dai *dai, unsigned int fmt); int (*set_tdm_slot)(struct snd_soc_dai *dai, - unsigned int mask, int slots); + unsigned int tx_mask, unsigned int rx_mask, + int slots, int slot_width); int (*set_tristate)(struct snd_soc_dai *dai, int tristate); /* diff --git a/sound/soc/codecs/wm9081.c b/sound/soc/codecs/wm9081.c index 86fc57e..c47d573 100644 --- a/sound/soc/codecs/wm9081.c +++ b/sound/soc/codecs/wm9081.c @@ -1206,8 +1206,9 @@ static int wm9081_set_sysclk(struct snd_soc_dai *codec_dai, return 0; } +/* FIXME: Needs to handle slot_width */ static int wm9081_set_tdm_slot(struct snd_soc_dai *dai, - unsigned int mask, int slots) + unsigned int tx_mask, unsigned int rx_mask, int slots, int slot_width) { struct snd_soc_codec *codec = dai->codec; unsigned int aif1 = wm9081_read(codec, WM9081_AUDIO_INTERFACE_1); @@ -1219,7 +1220,7 @@ static int wm9081_set_tdm_slot(struct snd_soc_dai *dai, aif1 |= (slots - 1) << WM9081_AIFDAC_TDM_MODE_SHIFT; - switch (mask) { + switch (rx_mask) { case 1: break; case 2: diff --git a/sound/soc/pxa/magician.c b/sound/soc/pxa/magician.c index c89a3cd..34437d8 100644 --- a/sound/soc/pxa/magician.c +++ b/sound/soc/pxa/magician.c @@ -188,7 +188,7 @@ static int magician_playback_hw_params(struct snd_pcm_substream *substream, if (ret < 0) return ret; - ret = snd_soc_dai_set_tdm_slot(cpu_dai, 1, 1); + ret = snd_soc_dai_set_tdm_slot(cpu_dai, 1, 0, 1, width); if (ret < 0) return ret; diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c index e22c5ce..5b9ed64 100644 --- a/sound/soc/pxa/pxa-ssp.c +++ b/sound/soc/pxa/pxa-ssp.c @@ -375,21 +375,34 @@ static int pxa_ssp_set_dai_pll(struct snd_soc_dai *cpu_dai, * Set the active slots in TDM/Network mode */ static int pxa_ssp_set_dai_tdm_slot(struct snd_soc_dai *cpu_dai, - unsigned int mask, int slots) + unsigned int tx_mask, unsigned int rx_mask, int slots, int slot_width) { struct ssp_priv *priv = cpu_dai->private_data; struct ssp_device *ssp = priv->dev.ssp; u32 sscr0; - sscr0 = ssp_read_reg(ssp, SSCR0) & ~SSCR0_SlotsPerFrm(7); + sscr0 = ssp_read_reg(ssp, SSCR0); + sscr0 &= ~(SSCR0_MOD | SSCR0_SlotsPerFrm(8) | SSCR0_EDSS | SSCR0_DSS); + + /* set slot width */ + if (slot_width > 16) + sscr0 |= SSCR0_EDSS | SSCR0_DataSize(slot_width - 16); + else + sscr0 |= SSCR0_DataSize(slot_width); - /* set number of active slots */ - sscr0 |= SSCR0_SlotsPerFrm(slots); + if (slots > 1) { + /* enable network mode */ + sscr0 |= SSCR0_MOD; + + /* set number of active slots */ + sscr0 |= SSCR0_SlotsPerFrm(slots); + + /* set active slot mask */ + ssp_write_reg(ssp, SSTSA, tx_mask); + ssp_write_reg(ssp, SSRSA, rx_mask); + } ssp_write_reg(ssp, SSCR0, sscr0); - /* set active slot mask */ - ssp_write_reg(ssp, SSTSA, mask); - ssp_write_reg(ssp, SSRSA, mask); return 0; } diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index e1a920c..c72a8e8 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -2133,17 +2133,20 @@ EXPORT_SYMBOL_GPL(snd_soc_dai_set_fmt); /** * snd_soc_dai_set_tdm_slot - configure DAI TDM. * @dai: DAI - * @mask: DAI specific mask representing used slots. + * @tx_mask: bitmask representing active TX slots. + * @rx_mask: bitmask representing active RX slots. * @slots: Number of slots in use. + * @slot_width: Width in bits for each slot. * * Configures a DAI for TDM operation. Both mask and slots are codec and DAI * specific. */ int snd_soc_dai_set_tdm_slot(struct snd_soc_dai *dai, - unsigned int mask, int slots) + unsigned int tx_mask, unsigned int rx_mask, int slots, int slot_width) { if (dai->ops && dai->ops->set_tdm_slot) - return dai->ops->set_tdm_slot(dai, mask, slots); + return dai->ops->set_tdm_slot(dai, tx_mask, rx_mask, + slots, slot_width); else return -EINVAL; } -- tg: (c787980..) asoc/set_tdm_slot (depends on: asoc/remove-code-duplication) -- Daniel Ribeiro

6 6

[alsa-devel] [PATCH 2/2] ASoC: AMS_DELTA: Use updated line discipline name
by Janusz Krzysztofik 06 Aug '09

06 Aug '09

This patch updates the tty line discipline name used in the Amstrad Delta machine driver. Signed-off-by: Janusz Krzysztofik <jkrzyszt(a)tis.icnet.pl> --- --- linux-2.6.31-rc5/sound/soc/omap/ams-delta.c.orig 2009-08-05 21:44:35.000000000 +0200 +++ linux-2.6.31-rc5/sound/soc/omap/ams-delta.c 2009-08-05 23:30:53.000000000 +0200 @@ -519,7 +519,7 @@ static int ams_delta_cx20442_init(struct } /* Register optional line discipline for over the modem control */ - ret = tty_register_ldisc(N_AMSDELTA, &cx81801_ops); + ret = tty_register_ldisc(N_V253, &cx81801_ops); if (ret) { dev_warn(card->dev, "Failed to register line discipline, " @@ -644,9 +644,9 @@ static void __exit ams_delta_module_exit } } - if (tty_unregister_ldisc(N_AMSDELTA) != 0) + if (tty_unregister_ldisc(N_V253) != 0) dev_warn(&ams_delta_audio_platform_device->dev, - "failed to unregister AMSDELTA line discipline\n"); + "failed to unregister V253 line discipline\n"); snd_soc_jack_free_gpios(&ams_delta_hook_switch, ARRAY_SIZE(ams_delta_hook_switch_gpios),

1 0

[alsa-devel] [PATCH 1/2] TTY: Rename N_AMSDELTA line discipline to N_V253
by Janusz Krzysztofik 06 Aug '09

06 Aug '09

The patch changes the line discipline name registered in include/linux/tty.h Signed-off-by: Janusz Krzysztofik --- --- linux-2.6.31-rc5/include/linux/tty.h.orig 2009-08-05 21:44:33.000000000 +0200 +++ linux-2.6.31-rc5/include/linux/tty.h 2009-08-05 22:54:12.000000000 +0200 @@ -47,7 +47,7 @@ #define N_SLCAN 17 /* Serial / USB serial CAN Adaptors */ #define N_PPS 18 /* Pulse per Second */ -#define N_AMSDELTA 19 /* codec control over modem, board specific */ +#define N_V253 19 /* Codec control over voice modem */ /* * This character is the same as _POSIX_VDISABLE: it cannot be used as

1 0