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

Re: [alsa-devel] [PATCH (for-next 2)] ASoC: Add support for IGEP v2
by Mike Rapoport 18 Nov '09

18 Nov '09

(adding ALSA mailing list to CC again :) ) Enric Balletbo i Serra wrote: > From: Enric Balletbo i Serra <eballetbo(a)iseebcn.com> > > > Signed-off-by: Enric Balletbo i Serra <eballetbo(a)iseebcn.com> > --- > sound/soc/omap/Kconfig | 7 ++ > sound/soc/omap/Makefile | 2 + > sound/soc/omap/igep0020.c | 148 +++++++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 157 insertions(+), 0 deletions(-) > create mode 100644 sound/soc/omap/igep0020.c > > diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig > index 653a362..5cc8a63 100644 > --- a/sound/soc/omap/Kconfig > +++ b/sound/soc/omap/Kconfig > @@ -99,3 +99,10 @@ config SND_OMAP_SOC_ZOOM2 > help > Say Y if you want to add support for Soc audio on Zoom2 board. > > +config SND_OMAP_SOC_IGEP0020 > + tristate "SoC Audio support for IGEP v2" > + depends on TWL4030_CORE && SND_OMAP_SOC && MACH_IGEP0020 > + select SND_OMAP_SOC_MCBSP > + select SND_SOC_TWL4030 > + help > + Say Y if you want to add support for Soc audio on IGEP v2 board. > diff --git a/sound/soc/omap/Makefile b/sound/soc/omap/Makefile > index 02d6947..d4ed23a 100644 > --- a/sound/soc/omap/Makefile > +++ b/sound/soc/omap/Makefile > @@ -16,6 +16,7 @@ snd-soc-sdp3430-objs := sdp3430.o > snd-soc-omap3pandora-objs := omap3pandora.o > snd-soc-omap3beagle-objs := omap3beagle.o > snd-soc-zoom2-objs := zoom2.o > +snd-soc-igep0020-objs := igep0020.o > > obj-$(CONFIG_SND_OMAP_SOC_N810) += snd-soc-n810.o > obj-$(CONFIG_SND_OMAP_SOC_AMS_DELTA) += snd-soc-ams-delta.o > @@ -27,3 +28,4 @@ obj-$(CONFIG_SND_OMAP_SOC_SDP3430) += snd-soc-sdp3430.o > obj-$(CONFIG_SND_OMAP_SOC_OMAP3_PANDORA) += snd-soc-omap3pandora.o > obj-$(CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE) += snd-soc-omap3beagle.o > obj-$(CONFIG_SND_OMAP_SOC_ZOOM2) += snd-soc-zoom2.o > +obj-$(CONFIG_SND_OMAP_SOC_IGEP0020) += snd-soc-igep0020.o > diff --git a/sound/soc/omap/igep0020.c b/sound/soc/omap/igep0020.c > new file mode 100644 > index 0000000..3583c42 > --- /dev/null > +++ b/sound/soc/omap/igep0020.c > @@ -0,0 +1,148 @@ > +/* > + * igep0020.c -- SoC audio for IGEP v2 > + * > + * Based on sound/soc/omap/overo.c by Steve Sakoman > + * > + * 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. > + * > + * This program is distributed in the hope that 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. > + * > + * You should have received a copy of the GNU General Public License > + * along with this program; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA > + * 02110-1301 USA > + * > + */ > + > +#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 <asm/mach-types.h> > +#include <mach/hardware.h> > +#include <mach/gpio.h> > +#include <plat/mcbsp.h> > + > +#include "omap-mcbsp.h" > +#include "omap-pcm.h" > +#include "../codecs/twl4030.h" > + > +static int igep2_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 codec DAI configuration */ > + ret = snd_soc_dai_set_fmt(codec_dai, > + SND_SOC_DAIFMT_I2S | > + SND_SOC_DAIFMT_NB_NF | > + SND_SOC_DAIFMT_CBM_CFM); > + if (ret < 0) { > + printk(KERN_ERR "can't set codec DAI configuration\n"); > + return ret; > + } > + > + /* Set cpu DAI configuration */ > + ret = snd_soc_dai_set_fmt(cpu_dai, > + SND_SOC_DAIFMT_I2S | > + SND_SOC_DAIFMT_NB_NF | > + SND_SOC_DAIFMT_CBM_CFM); > + if (ret < 0) { > + printk(KERN_ERR "can't set cpu DAI configuration\n"); > + return ret; > + } > + > + /* Set the codec system clock for DAC and ADC */ > + ret = snd_soc_dai_set_sysclk(codec_dai, 0, 26000000, > + SND_SOC_CLOCK_IN); > + if (ret < 0) { > + printk(KERN_ERR "can't set codec system clock\n"); > + return ret; > + } > + > + return 0; > +} > + > +static struct snd_soc_ops igep2_ops = { > + .hw_params = igep2_hw_params, > +}; > + > +/* Digital audio interface glue - connects codec <--> CPU */ > +static struct snd_soc_dai_link igep2_dai = { > + .name = "TWL4030", > + .stream_name = "TWL4030", > + .cpu_dai = &omap_mcbsp_dai[0], > + .codec_dai = &twl4030_dai[TWL4030_DAI_HIFI], > + .ops = &igep2_ops, > +}; > + > +/* Audio machine driver */ > +static struct snd_soc_card snd_soc_card_igep2 = { > + .name = "igep2", > + .platform = &omap_soc_platform, > + .dai_link = &igep2_dai, > + .num_links = 1, > +}; > + > +/* Audio subsystem */ > +static struct snd_soc_device igep2_snd_devdata = { > + .card = &snd_soc_card_igep2, > + .codec_dev = &soc_codec_dev_twl4030, > +}; > + > +static struct platform_device *igep2_snd_device; > + > +static int __init igep2_soc_init(void) > +{ > + int ret; > + > + if (!machine_is_igep0020()) { > + pr_debug("Not IGEP v2!\n"); > + return -ENODEV; > + } > + printk(KERN_INFO "IGEP v2 SoC init\n"); > + > + igep2_snd_device = platform_device_alloc("soc-audio", -1); > + if (!igep2_snd_device) { > + printk(KERN_ERR "Platform device allocation failed\n"); > + return -ENOMEM; > + } > + > + platform_set_drvdata(igep2_snd_device, &igep2_snd_devdata); > + igep2_snd_devdata.dev = &igep2_snd_device->dev; > + *(unsigned int *)igep2_dai.cpu_dai->private_data = 1; /* McBSP2 */ > + > + ret = platform_device_add(igep2_snd_device); > + if (ret) > + goto err1; > + > + return 0; > + > +err1: > + printk(KERN_ERR "Unable to add platform device\n"); > + platform_device_put(igep2_snd_device); > + > + return ret; > +} > +module_init(igep2_soc_init); > + > +static void __exit igep2_soc_exit(void) > +{ > + platform_device_unregister(igep2_snd_device); > +} > +module_exit(igep2_soc_exit); > + > +MODULE_AUTHOR("Enric Balletbo i Serra <eballetbo(a)iseebcn.com>"); > +MODULE_DESCRIPTION("ALSA SoC IGEP v2"); > +MODULE_LICENSE("GPL"); -- Sincerely yours, Mike.

2 1

[alsa-devel] [PATCH] ASoC: OMAP3 Pandora: update for TWL4030 codec changes
by Grazvydas Ignotas 18 Nov '09

18 Nov '09

A while ago TWL4030 had it's playback stream name changed, but pandora needs it for it's playback path. Update to correct stream name so that playback works again. Also mark VIBRA output as not connected. Signed-off-by: Grazvydas Ignotas <notasas(a)gmail.com> --- sound/soc/omap/omap3pandora.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/sound/soc/omap/omap3pandora.c b/sound/soc/omap/omap3pandora.c index ad219aa..0cd06f5 100644 --- a/sound/soc/omap/omap3pandora.c +++ b/sound/soc/omap/omap3pandora.c @@ -134,7 +134,7 @@ static int omap3pandora_hp_event(struct snd_soc_dapm_widget *w, * |P| <--- TWL4030 <--------- Line In and MICs */ static const struct snd_soc_dapm_widget omap3pandora_out_dapm_widgets[] = { - SND_SOC_DAPM_DAC("PCM DAC", "Playback", SND_SOC_NOPM, 0, 0), + SND_SOC_DAPM_DAC("PCM DAC", "HiFi Playback", SND_SOC_NOPM, 0, 0), SND_SOC_DAPM_PGA_E("Headphone Amplifier", SND_SOC_NOPM, 0, 0, NULL, 0, omap3pandora_hp_event, SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD), @@ -181,6 +181,7 @@ static int omap3pandora_out_init(struct snd_soc_codec *codec) snd_soc_dapm_nc_pin(codec, "CARKITR"); snd_soc_dapm_nc_pin(codec, "HFL"); snd_soc_dapm_nc_pin(codec, "HFR"); + snd_soc_dapm_nc_pin(codec, "VIBRA"); ret = snd_soc_dapm_new_controls(codec, omap3pandora_out_dapm_widgets, ARRAY_SIZE(omap3pandora_out_dapm_widgets)); -- 1.5.6.3

3 4

[alsa-devel] [PATCH 2/2] ASoC: Modifying the license string GPLv2 for OMAP3 EVM
by Anuj Aggarwal 18 Nov '09

18 Nov '09

Correcting the license string from GPLv2 -> GPL v2. Found the problem while building OMAP3 ASoC driver as module. Signed-off-by: Anuj Aggarwal <anuj.aggarwal(a)ti.com> --- sound/soc/omap/omap3evm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/omap/omap3evm.c b/sound/soc/omap/omap3evm.c index 41a91b5..627fadb 100644 --- a/sound/soc/omap/omap3evm.c +++ b/sound/soc/omap/omap3evm.c @@ -144,4 +144,4 @@ module_exit(omap3evm_soc_exit); MODULE_AUTHOR("Anuj Aggarwal <anuj.aggarwal(a)ti.com>"); MODULE_DESCRIPTION("ALSA SoC OMAP3 EVM"); -MODULE_LICENSE("GPLv2"); +MODULE_LICENSE("GPL v2"); -- 1.6.2.4

1 0

[alsa-devel] Status of ALSA support for MacBook Pro 5, 2 in kernel 2.6.32
by Adolf Winterer 18 Nov '09

18 Nov '09

Hello, there had been a lot of messages here on the list and in other internet sources about patches to snd-hda-intel regarding the sound support for MacBook Pro 5,1 and MacBook Pro 5,2. But the situation is far from being clear. Some sources stated that the patches for the MacBook Pro 5,1 would support the MacBook Pro 5,2 as well, others disagreed. Recently on this list I've seen efforts to integrate the current ALSA 1.0.21+x into kernel 2.6.32. Fact is that with kernel 2.6.30-2, which has ALSA 1.0.20, from Debian testing my MacBook Pro 5,2 is not working. There is no sound at all. Compilation of ALSA sources 1.0.21 using the module assistant fails with an error message regarding a missing curly bracket. There is a bug report in the Debian bug tracker regarding this, but no progress is visible. Compiling the sources directly using the 1.0.21 sources from the ALSA project page goes through, but the resulting modules do not load, give an error message about an unknown symbol. Therefore I was not able to find out if ALSA 1.0.21 supports the MacBook Pro 5,2. Please, can anyone of the development team help with a statement clearing up things by answering the following questions? * Will the support for the MacBook Pro 5,2 be part of the soon to be released kernel 2.6.32? * Or is it already present in kernel 2.6.31? * What is the correct parameter for the loading of the module? Is it just "auto" or "mb5"? Or anything else? Your help is greatly appreciated. Best regards, Adolf

2 1

[alsa-devel] [PATCH 00/10] Intel HDMI fixes v2
by Wu Fengguang 18 Nov '09

18 Nov '09

Takashi, Here are the updated Intel HDMI fixes. Thanks, Fengguang

2 14

Re: [alsa-devel] [PATCH (for-next)] ASoC: Add support for IGEP v2
by Mike Rapoport 18 Nov '09

18 Nov '09

(adding ALSA list to CC) Enric Balletbo i Serra wrote: > From: Enric Balletbo i Serra <eballetbo(a)iseebcn.com> > > > Signed-off-by: Enric Balletbo i Serra <eballetbo(a)iseebcn.com> > --- > arch/arm/mach-omap2/Kconfig | 2 +- > sound/soc/omap/Kconfig | 7 ++ > sound/soc/omap/Makefile | 2 + > sound/soc/omap/igep0020.c | 148 +++++++++++++++++++++++++++++++++++++++++++ > 4 files changed, 158 insertions(+), 1 deletions(-) > create mode 100644 sound/soc/omap/igep0020.c > > diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig > index 68866f3..6922198 100644 > --- a/arch/arm/mach-omap2/Kconfig > +++ b/arch/arm/mach-omap2/Kconfig > @@ -114,7 +114,7 @@ config MACH_OMAP_3630SDP > depends on ARCH_OMAP3 && ARCH_OMAP34XX > > config MACH_IGEP0020 > - bool "IGEP0020" > + bool "IGEP v2 board" > depends on ARCH_OMAP3 && ARCH_OMAP34XX > > config MACH_OMAP_4430SDP > diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig > index 653a362..5cc8a63 100644 > --- a/sound/soc/omap/Kconfig > +++ b/sound/soc/omap/Kconfig > @@ -99,3 +99,10 @@ config SND_OMAP_SOC_ZOOM2 > help > Say Y if you want to add support for Soc audio on Zoom2 board. > > +config SND_OMAP_SOC_IGEP0020 > + tristate "SoC Audio support for IGEP v2" > + depends on TWL4030_CORE && SND_OMAP_SOC && MACH_IGEP0020 > + select SND_OMAP_SOC_MCBSP > + select SND_SOC_TWL4030 > + help > + Say Y if you want to add support for Soc audio on IGEP v2 board. > diff --git a/sound/soc/omap/Makefile b/sound/soc/omap/Makefile > index 02d6947..d4ed23a 100644 > --- a/sound/soc/omap/Makefile > +++ b/sound/soc/omap/Makefile > @@ -16,6 +16,7 @@ snd-soc-sdp3430-objs := sdp3430.o > snd-soc-omap3pandora-objs := omap3pandora.o > snd-soc-omap3beagle-objs := omap3beagle.o > snd-soc-zoom2-objs := zoom2.o > +snd-soc-igep0020-objs := igep0020.o > > obj-$(CONFIG_SND_OMAP_SOC_N810) += snd-soc-n810.o > obj-$(CONFIG_SND_OMAP_SOC_AMS_DELTA) += snd-soc-ams-delta.o > @@ -27,3 +28,4 @@ obj-$(CONFIG_SND_OMAP_SOC_SDP3430) += snd-soc-sdp3430.o > obj-$(CONFIG_SND_OMAP_SOC_OMAP3_PANDORA) += snd-soc-omap3pandora.o > obj-$(CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE) += snd-soc-omap3beagle.o > obj-$(CONFIG_SND_OMAP_SOC_ZOOM2) += snd-soc-zoom2.o > +obj-$(CONFIG_SND_OMAP_SOC_IGEP0020) += snd-soc-igep0020.o > diff --git a/sound/soc/omap/igep0020.c b/sound/soc/omap/igep0020.c > new file mode 100644 > index 0000000..3583c42 > --- /dev/null > +++ b/sound/soc/omap/igep0020.c > @@ -0,0 +1,148 @@ > +/* > + * igep0020.c -- SoC audio for IGEP v2 > + * > + * Based on sound/soc/omap/overo.c by Steve Sakoman > + * > + * 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. > + * > + * This program is distributed in the hope that 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. > + * > + * You should have received a copy of the GNU General Public License > + * along with this program; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA > + * 02110-1301 USA > + * > + */ > + > +#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 <asm/mach-types.h> > +#include <mach/hardware.h> > +#include <mach/gpio.h> > +#include <plat/mcbsp.h> > + > +#include "omap-mcbsp.h" > +#include "omap-pcm.h" > +#include "../codecs/twl4030.h" > + > +static int igep2_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 codec DAI configuration */ > + ret = snd_soc_dai_set_fmt(codec_dai, > + SND_SOC_DAIFMT_I2S | > + SND_SOC_DAIFMT_NB_NF | > + SND_SOC_DAIFMT_CBM_CFM); > + if (ret < 0) { > + printk(KERN_ERR "can't set codec DAI configuration\n"); > + return ret; > + } > + > + /* Set cpu DAI configuration */ > + ret = snd_soc_dai_set_fmt(cpu_dai, > + SND_SOC_DAIFMT_I2S | > + SND_SOC_DAIFMT_NB_NF | > + SND_SOC_DAIFMT_CBM_CFM); > + if (ret < 0) { > + printk(KERN_ERR "can't set cpu DAI configuration\n"); > + return ret; > + } > + > + /* Set the codec system clock for DAC and ADC */ > + ret = snd_soc_dai_set_sysclk(codec_dai, 0, 26000000, > + SND_SOC_CLOCK_IN); > + if (ret < 0) { > + printk(KERN_ERR "can't set codec system clock\n"); > + return ret; > + } > + > + return 0; > +} > + > +static struct snd_soc_ops igep2_ops = { > + .hw_params = igep2_hw_params, > +}; > + > +/* Digital audio interface glue - connects codec <--> CPU */ > +static struct snd_soc_dai_link igep2_dai = { > + .name = "TWL4030", > + .stream_name = "TWL4030", > + .cpu_dai = &omap_mcbsp_dai[0], > + .codec_dai = &twl4030_dai[TWL4030_DAI_HIFI], > + .ops = &igep2_ops, > +}; > + > +/* Audio machine driver */ > +static struct snd_soc_card snd_soc_card_igep2 = { > + .name = "igep2", > + .platform = &omap_soc_platform, > + .dai_link = &igep2_dai, > + .num_links = 1, > +}; > + > +/* Audio subsystem */ > +static struct snd_soc_device igep2_snd_devdata = { > + .card = &snd_soc_card_igep2, > + .codec_dev = &soc_codec_dev_twl4030, > +}; > + > +static struct platform_device *igep2_snd_device; > + > +static int __init igep2_soc_init(void) > +{ > + int ret; > + > + if (!machine_is_igep0020()) { > + pr_debug("Not IGEP v2!\n"); > + return -ENODEV; > + } > + printk(KERN_INFO "IGEP v2 SoC init\n"); > + > + igep2_snd_device = platform_device_alloc("soc-audio", -1); > + if (!igep2_snd_device) { > + printk(KERN_ERR "Platform device allocation failed\n"); > + return -ENOMEM; > + } > + > + platform_set_drvdata(igep2_snd_device, &igep2_snd_devdata); > + igep2_snd_devdata.dev = &igep2_snd_device->dev; > + *(unsigned int *)igep2_dai.cpu_dai->private_data = 1; /* McBSP2 */ > + > + ret = platform_device_add(igep2_snd_device); > + if (ret) > + goto err1; > + > + return 0; > + > +err1: > + printk(KERN_ERR "Unable to add platform device\n"); > + platform_device_put(igep2_snd_device); > + > + return ret; > +} > +module_init(igep2_soc_init); > + > +static void __exit igep2_soc_exit(void) > +{ > + platform_device_unregister(igep2_snd_device); > +} > +module_exit(igep2_soc_exit); > + > +MODULE_AUTHOR("Enric Balletbo i Serra <eballetbo(a)iseebcn.com>"); > +MODULE_DESCRIPTION("ALSA SoC IGEP v2"); > +MODULE_LICENSE("GPL"); -- Sincerely yours, Mike.

3 2

[alsa-devel] [patch] remove unnecessary null check
by Dan Carpenter 18 Nov '09

18 Nov '09

This function is only called from snd_ctl_ioctl() and the file parameter can never be null so there is no need to check it here. We dereference file at the start of the function: struct snd_card *card = file->card; and it confuses static checkers to dereference a pointer before checking it. regards, dan carpenter Signed-off-by: Dan Carpenter <error27(a)gmail.com> --- orig/sound/core/control.c 2009-11-17 07:15:04.000000000 +0200 +++ devel/sound/core/control.c 2009-11-17 07:40:30.000000000 +0200 @@ -1120,7 +1120,7 @@ goto __kctl_end; } if (vd->access & SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK) { - if (file && vd->owner != NULL && vd->owner != file) { + if (vd->owner != NULL && vd->owner != file) { err = -EPERM; goto __kctl_end; }

2 1

[alsa-devel] [patch] move dereference after null check
by Dan Carpenter 18 Nov '09

18 Nov '09

The 'jack' variable was dereference before the NULL check so this patch moves the dereference later. regards, dan carpenter Signed-off-by: Dan Carpenter <error27(a)gmail.com> --- orig/sound/soc/soc-jack.c 2009-11-14 11:04:04.000000000 +0200 +++ devel/sound/soc/soc-jack.c 2009-11-14 11:05:01.000000000 +0200 @@ -58,7 +58,7 @@ */ void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask) { - struct snd_soc_codec *codec = jack->card->codec; + struct snd_soc_codec *codec; struct snd_soc_jack_pin *pin; int enable; int oldstatus; @@ -67,6 +67,7 @@ WARN_ON_ONCE(!jack); return; } + codec = jack->card->codec; mutex_lock(&codec->mutex);

4 4

[alsa-devel] [PATCH] opti-miro: use variables directly in the probe function
by Krzysztof Helt 18 Nov '09

18 Nov '09

From: Krzysztof Helt <krzysztof.h1(a)wp.pl> Use the fm_port and mpu_port variables directly in a probe function. This completely eliminates a need to copy the fm_port value to the snd_miro structure. Signed-off-by: Krzysztof Helt <krzysztof.h1(a)wp.pl> --- sound/isa/opti9xx/miro.c | 33 +++++++++++++++++---------------- 1 files changed, 17 insertions(+), 16 deletions(-) diff --git a/sound/isa/opti9xx/miro.c b/sound/isa/opti9xx/miro.c index 02e30d7..b8170ad 100644 --- a/sound/isa/opti9xx/miro.c +++ b/sound/isa/opti9xx/miro.c @@ -118,8 +118,6 @@ struct snd_miro { int dma1; int dma2; - long fm_port; - long mpu_port; int mpu_irq; @@ -757,7 +755,6 @@ static int __devinit snd_miro_init(struct snd_miro *chip, chip->irq = -1; chip->dma1 = -1; chip->dma2 = -1; - chip->fm_port = -1; chip->mpu_port = -1; chip->mpu_irq = -1; @@ -1261,7 +1258,6 @@ static int __devinit snd_miro_probe(struct device *devptr, unsigned int n) } miro->wss_base = port; - miro->fm_port = fm_port; miro->mpu_port = mpu_port; miro->irq = irq; miro->mpu_irq = mpu_irq; @@ -1276,11 +1272,12 @@ static int __devinit snd_miro_probe(struct device *devptr, unsigned int n) } } - if (miro->mpu_port == SNDRV_AUTO_PORT) { - if ((miro->mpu_port = snd_legacy_find_free_ioport(possible_mpu_ports, 2)) < 0) { + if (mpu_port == SNDRV_AUTO_PORT) { + mpu_port = snd_legacy_find_free_ioport(possible_mpu_ports, 2); + if (mpu_port < 0) { snd_card_free(card); snd_printk(KERN_ERR "unable to find a free MPU401 port\n"); - return -EBUSY; + return -EBUSY } } if (miro->irq == SNDRV_AUTO_IRQ) { @@ -1380,20 +1377,24 @@ static int __devinit snd_miro_probe(struct device *devptr, unsigned int n) card->shortname, miro->name, pcm->name, miro->wss_base + 4, miro->irq, miro->dma1, miro->dma2); - if (miro->mpu_port <= 0 || miro->mpu_port == SNDRV_AUTO_PORT) + if (mpu_port <= 0 || mpu_port == SNDRV_AUTO_PORT) rmidi = NULL; - else - if ((error = snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401, - miro->mpu_port, 0, miro->mpu_irq, IRQF_DISABLED, - &rmidi))) - snd_printk(KERN_WARNING "no MPU-401 device at 0x%lx?\n", miro->mpu_port); + else { + error = snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401, + mpu_port, 0, miro->mpu_irq, IRQF_DISABLED, + &rmidi); + if (error < 0) + snd_printk(KERN_WARNING "no MPU-401 device at 0x%lx?\n", + mpu_port); + } - if (miro->fm_port > 0 && miro->fm_port != SNDRV_AUTO_PORT) { + if (fm_port > 0 && fm_port != SNDRV_AUTO_PORT) { struct snd_opl3 *opl3 = NULL; struct snd_opl4 *opl4; - if (snd_opl4_create(card, miro->fm_port, miro->fm_port - 8, + if (snd_opl4_create(card, fm_port, fm_port - 8, 2, &opl3, &opl4) < 0) - snd_printk(KERN_WARNING "no OPL4 device at 0x%lx\n", miro->fm_port); + snd_printk(KERN_WARNING "no OPL4 device at 0x%lx\n", + fm_port); } if ((error = snd_set_aci_init_values(miro)) < 0) { -- 1.6.4 ---------------------------------------------------------------------- Internetowi nie placa! Otworz Konto Direct. Kliknij >> http://link.interia.pl/f2448

2 1

[alsa-devel] [PATCH] cs4236: update control names
by Krzysztof Helt 18 Nov '09

18 Nov '09

From: Krzysztof Helt <krzysztof.h1(a)wp.pl> Update control names to be more closer to their meaning. Change the "Mono" name to the "Beep" as this line is usually used to forward the PC beeper signal to sound card's output. Update names for both cs423x and wss. Clean up cs4235 controls according to the cs4235 doc. Rename some of the cs4235 controls to be consistent with the cs4236's ones. Also, delete one misnamed cs4231 register define. Signed-off-by: Krzysztof Helt <krzysztof.h1(a)wp.pl> --- This is the second version of the patch. The Master Digital Playback is not renamed to the Master DAC Playback. include/sound/cs4231-regs.h | 1 - sound/isa/cs423x/cs4236_lib.c | 49 +++++++++++++++++----------------------- sound/isa/wss/wss_lib.c | 8 +++--- 3 files changed, 25 insertions(+), 33 deletions(-) diff --git a/include/sound/cs4231-regs.h b/include/sound/cs4231-regs.h index 9264753..66d28c2 100644 --- a/include/sound/cs4231-regs.h +++ b/include/sound/cs4231-regs.h @@ -70,7 +70,6 @@ #define AD1845_PWR_DOWN 0x1b /* power down control */ #define CS4235_LEFT_MASTER 0x1b /* left master output control */ #define CS4231_REC_FORMAT 0x1c /* clock and data format - record - bits 7-0 MCE */ -#define CS4231_PLY_VAR_FREQ 0x1d /* playback variable frequency */ #define AD1845_CLOCK 0x1d /* crystal clock select and total power down */ #define CS4235_RIGHT_MASTER 0x1d /* right master output control */ #define CS4231_REC_UPR_CNT 0x1e /* record upper count */ diff --git a/sound/isa/cs423x/cs4236_lib.c b/sound/isa/cs423x/cs4236_lib.c index 1b1ad1c..4c4024a 100644 --- a/sound/isa/cs423x/cs4236_lib.c +++ b/sound/isa/cs423x/cs4236_lib.c @@ -777,7 +777,7 @@ CS4236_DOUBLE("Mic Playback Switch", 0, CS4236_DOUBLE("Mic Capture Switch", 0, CS4236_LEFT_MIC, CS4236_RIGHT_MIC, 7, 7, 1, 1), CS4236_DOUBLE("Mic Volume", 0, CS4236_LEFT_MIC, CS4236_RIGHT_MIC, 0, 0, 31, 1), -CS4236_DOUBLE("Mic Playback Boost", 0, +CS4236_DOUBLE("Mic Playback Boost (+20dB)", 0, CS4236_LEFT_MIC, CS4236_RIGHT_MIC, 5, 5, 1, 0), WSS_DOUBLE("Line Playback Switch", 0, @@ -798,10 +798,10 @@ WSS_DOUBLE("CD Capture Switch", 0, CS4236_DOUBLE1("Mono Output Playback Switch", 0, CS4231_MONO_CTRL, CS4236_RIGHT_MIX_CTRL, 6, 7, 1, 1), -CS4236_DOUBLE1("Mono Playback Switch", 0, +CS4236_DOUBLE1("Beep Playback Switch", 0, CS4231_MONO_CTRL, CS4236_LEFT_MIX_CTRL, 7, 7, 1, 1), -WSS_SINGLE("Mono Playback Volume", 0, CS4231_MONO_CTRL, 0, 15, 1), -WSS_SINGLE("Mono Playback Bypass", 0, CS4231_MONO_CTRL, 5, 1, 0), +WSS_SINGLE("Beep Playback Volume", 0, CS4231_MONO_CTRL, 0, 15, 1), +WSS_SINGLE("Beep Bypass Playback Switch", 0, CS4231_MONO_CTRL, 5, 1, 0), WSS_DOUBLE("Capture Volume", 0, CS4231_LEFT_INPUT, CS4231_RIGHT_INPUT, 0, 0, 15, 0), @@ -815,31 +815,27 @@ CS4236_DOUBLE1("Digital Loopback Playback Volume", 0, static struct snd_kcontrol_new snd_cs4235_controls[] = { -WSS_DOUBLE("Master Switch", 0, +WSS_DOUBLE("Master Playback Switch", 0, CS4235_LEFT_MASTER, CS4235_RIGHT_MASTER, 7, 7, 1, 1), -WSS_DOUBLE("Master Volume", 0, +WSS_DOUBLE("Master Playback Volume", 0, CS4235_LEFT_MASTER, CS4235_RIGHT_MASTER, 0, 0, 31, 1), CS4235_OUTPUT_ACCU("Playback Volume", 0), -CS4236_DOUBLE("Master Digital Playback Switch", 0, - CS4236_LEFT_MASTER, CS4236_RIGHT_MASTER, 7, 7, 1, 1), -CS4236_DOUBLE("Master Digital Capture Switch", 0, - CS4236_DAC_MUTE, CS4236_DAC_MUTE, 7, 6, 1, 1), -CS4236_MASTER_DIGITAL("Master Digital Volume", 0), - -WSS_DOUBLE("Master Digital Playback Switch", 1, +WSS_DOUBLE("Synth Playback Switch", 1, CS4231_LEFT_LINE_IN, CS4231_RIGHT_LINE_IN, 7, 7, 1, 1), -WSS_DOUBLE("Master Digital Capture Switch", 1, +WSS_DOUBLE("Synth Capture Switch", 1, CS4231_LEFT_LINE_IN, CS4231_RIGHT_LINE_IN, 6, 6, 1, 1), -WSS_DOUBLE("Master Digital Volume", 1, +WSS_DOUBLE("Synth Volume", 1, CS4231_LEFT_LINE_IN, CS4231_RIGHT_LINE_IN, 0, 0, 31, 1), CS4236_DOUBLE("Capture Volume", 0, CS4236_LEFT_MIX_CTRL, CS4236_RIGHT_MIX_CTRL, 5, 5, 3, 1), -WSS_DOUBLE("PCM Switch", 0, +WSS_DOUBLE("PCM Playback Switch", 0, CS4231_LEFT_OUTPUT, CS4231_RIGHT_OUTPUT, 7, 7, 1, 1), +WSS_DOUBLE("PCM Capture Switch", 0, + CS4236_DAC_MUTE, CS4236_DAC_MUTE, 7, 6, 1, 1), WSS_DOUBLE("PCM Volume", 0, CS4231_LEFT_OUTPUT, CS4231_RIGHT_OUTPUT, 0, 0, 63, 1), @@ -855,28 +851,25 @@ CS4236_DOUBLE("Mic Capture Switch", 0, CS4236_DOUBLE("Mic Playback Switch", 0, CS4236_LEFT_MIC, CS4236_RIGHT_MIC, 6, 6, 1, 1), CS4236_SINGLE("Mic Volume", 0, CS4236_LEFT_MIC, 0, 31, 1), -CS4236_SINGLE("Mic Playback Boost", 0, CS4236_LEFT_MIC, 5, 1, 0), +CS4236_SINGLE("Mic Boost (+20dB)", 0, CS4236_LEFT_MIC, 5, 1, 0), -WSS_DOUBLE("Aux Playback Switch", 0, +WSS_DOUBLE("Line Playback Switch", 0, CS4231_AUX1_LEFT_INPUT, CS4231_AUX1_RIGHT_INPUT, 7, 7, 1, 1), -WSS_DOUBLE("Aux Capture Switch", 0, +WSS_DOUBLE("Line Capture Switch", 0, CS4231_AUX1_LEFT_INPUT, CS4231_AUX1_RIGHT_INPUT, 6, 6, 1, 1), -WSS_DOUBLE("Aux Volume", 0, +WSS_DOUBLE("Line Volume", 0, CS4231_AUX1_LEFT_INPUT, CS4231_AUX1_RIGHT_INPUT, 0, 0, 31, 1), -WSS_DOUBLE("Aux Playback Switch", 1, +WSS_DOUBLE("CD Playback Switch", 1, CS4231_AUX2_LEFT_INPUT, CS4231_AUX2_RIGHT_INPUT, 7, 7, 1, 1), -WSS_DOUBLE("Aux Capture Switch", 1, +WSS_DOUBLE("CD Capture Switch", 1, CS4231_AUX2_LEFT_INPUT, CS4231_AUX2_RIGHT_INPUT, 6, 6, 1, 1), -WSS_DOUBLE("Aux Volume", 1, +WSS_DOUBLE("CD Volume", 1, CS4231_AUX2_LEFT_INPUT, CS4231_AUX2_RIGHT_INPUT, 0, 0, 31, 1), -CS4236_DOUBLE1("Master Mono Switch", 0, - CS4231_MONO_CTRL, CS4236_RIGHT_MIX_CTRL, 6, 7, 1, 1), - -CS4236_DOUBLE1("Mono Switch", 0, +CS4236_DOUBLE1("Beep Playback Switch", 0, CS4231_MONO_CTRL, CS4236_LEFT_MIX_CTRL, 7, 7, 1, 1), -WSS_SINGLE("Mono Volume", 0, CS4231_MONO_CTRL, 0, 15, 1), +WSS_SINGLE("Beep Playback Volume", 0, CS4231_MONO_CTRL, 0, 15, 1), WSS_DOUBLE("Analog Loopback Switch", 0, CS4231_LEFT_INPUT, CS4231_RIGHT_INPUT, 7, 7, 1, 0), diff --git a/sound/isa/wss/wss_lib.c b/sound/isa/wss/wss_lib.c index 705db09..5b9d6c1 100644 --- a/sound/isa/wss/wss_lib.c +++ b/sound/isa/wss/wss_lib.c @@ -2224,7 +2224,7 @@ WSS_DOUBLE_TLV("Capture Volume", 0, CS4231_LEFT_INPUT, CS4231_RIGHT_INPUT, .get = snd_wss_get_mux, .put = snd_wss_put_mux, }, -WSS_DOUBLE("Mic Boost", 0, +WSS_DOUBLE("Mic Boost (+20dB)", 0, CS4231_LEFT_INPUT, CS4231_RIGHT_INPUT, 5, 5, 1, 0), WSS_SINGLE("Loopback Capture Switch", 0, CS4231_LOOPBACK, 0, 1, 0), @@ -2235,14 +2235,14 @@ WSS_DOUBLE("Line Playback Switch", 0, WSS_DOUBLE_TLV("Line Playback Volume", 0, CS4231_LEFT_LINE_IN, CS4231_RIGHT_LINE_IN, 0, 0, 31, 1, db_scale_5bit_12db_max), -WSS_SINGLE("Mono Playback Switch", 0, +WSS_SINGLE("Beep Playback Switch", 0, CS4231_MONO_CTRL, 7, 1, 1), -WSS_SINGLE_TLV("Mono Playback Volume", 0, +WSS_SINGLE_TLV("Beep Playback Volume", 0, CS4231_MONO_CTRL, 0, 15, 1, db_scale_4bit), WSS_SINGLE("Mono Output Playback Switch", 0, CS4231_MONO_CTRL, 6, 1, 1), -WSS_SINGLE("Mono Output Playback Bypass", 0, +WSS_SINGLE("Beep Bypass Playback Switch", 0, CS4231_MONO_CTRL, 5, 1, 0), }; -- 1.6.4 ---------------------------------------------------------------------- Kawalerka za 79 000 zl! Sprawdz >>> http://link.interia.pl/f2425

2 1