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

[alsa-devel] [PATCH 1/2] swarm_cs4297: Provide definitions for AC97 registers
by Ezequiel Garcia 20 Jun '12

20 Jun '12

This patch removes the last usage of linux/ac97_codec.h by re-defining used AC97 registers. We can't use sound/ac97_codec.h here, since it is an OSS driver. Not even compilation tested. Cc: Ralf Baechle <ralf(a)linux-mips.org> Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.de> Cc: Clemens Ladisch <clemens(a)ladisch.de> Signed-off-by: Ezequiel Garcia <elezegarcia(a)gmail.com> --- sound/oss/swarm_cs4297a.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/sound/oss/swarm_cs4297a.c b/sound/oss/swarm_cs4297a.c index 09d4648..bd75f54 100644 --- a/sound/oss/swarm_cs4297a.c +++ b/sound/oss/swarm_cs4297a.c @@ -69,7 +69,6 @@ #include <linux/sound.h> #include <linux/slab.h> #include <linux/soundcard.h> -#include <linux/ac97_codec.h> #include <linux/pci.h> #include <linux/bitops.h> #include <linux/interrupt.h> @@ -199,6 +198,22 @@ static const char invalid_magic[] = } \ }) +/* AC97 registers */ +#define AC97_MASTER_VOL_STEREO 0x0002 /* Line Out */ +#define AC97_PCBEEP_VOL 0x000a /* none */ +#define AC97_PHONE_VOL 0x000c /* TAD Input (mono) */ +#define AC97_MIC_VOL 0x000e /* MIC Input (mono) */ +#define AC97_LINEIN_VOL 0x0010 /* Line Input (stereo) */ +#define AC97_CD_VOL 0x0012 /* CD Input (stereo) */ +#define AC97_AUX_VOL 0x0016 /* Aux Input (stereo) */ +#define AC97_PCMOUT_VOL 0x0018 /* Wave Output (stereo) */ +#define AC97_RECORD_SELECT 0x001a /* */ +#define AC97_RECORD_GAIN 0x001c +#define AC97_GENERAL_PURPOSE 0x0020 +#define AC97_3D_CONTROL 0x0022 +#define AC97_POWER_CONTROL 0x0026 +#define AC97_VENDOR_ID1 0x007c + struct list_head cs4297a_devs = { &cs4297a_devs, &cs4297a_devs }; typedef struct serdma_descr_s { -- 1.7.4.4

2 2

Re: [alsa-devel] [PATCH 1/1] ASoC: lm49453: Fix compilation warning
by Reddy, M.R. Swami 20 Jun '12

20 Jun '12

This compilation warning issue was fixed. Patch submitted by Mark. http://mailman.alsa-project.org/pipermail/alsa-devel/2012-June/052425.html Please use the latest source repo. Thanks Swami -----Original Message----- From: Sachin Kamat [mailto:sachin.kamat@linaro.org] Sent: Wednesday, June 20, 2012 11:38 AM To: alsa-devel(a)alsa-project.org Cc: broonie(a)opensource.wolfsonmicro.com; Reddy, M.R. Swami; sachin.kamat(a)linaro.org; patches(a)linaro.org Subject: [PATCH 1/1] ASoC: lm49453: Fix compilation warning Fixes the following build warning: sound/soc/codecs/lm49453.c: In function ‘lm49453_i2c_probe’: sound/soc/codecs/lm49453.c:1510:24: warning: passing argument 3 of ‘snd_soc_register_codec’ discards ‘const’ qualifier from pointer target type [enabled by default] include/sound/soc.h:333:5: note: expected ‘struct snd_soc_dai_driver *’ but argument is of type ‘const struct snd_soc_dai_driver *’ The struct snd_soc_dai_driver lm49453_dai[] has been made non-const, in line with other snd_soc_dai_driver structure variables in other codec files. Signed-off-by: Sachin Kamat <sachin.kamat(a)linaro.org> --- sound/soc/codecs/lm49453.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/codecs/lm49453.c b/sound/soc/codecs/lm49453.c index c1bc945..99b0a9d 100644 --- a/sound/soc/codecs/lm49453.c +++ b/sound/soc/codecs/lm49453.c @@ -1357,7 +1357,7 @@ static struct snd_soc_dai_ops lm49453_lineout_dai_ops = { }; /* LM49453 dai structure. */ -static const struct snd_soc_dai_driver lm49453_dai[] = { +static struct snd_soc_dai_driver lm49453_dai[] = { { .name = "LM49453 Headset", .playback = { -- 1.7.4.1

1 0

Re: [alsa-devel] [PATCH 0/2] snd_usb_audio: ignore ctrl errors on *
by Takashi Iwai 20 Jun '12

20 Jun '12

At Tue, 19 Jun 2012 22:21:17 +0200, Oleksij Rempel wrote: > > This two patches fix stability issues for two logitech cams. > I assume there is more of them, there are some bug reports on > different trackers which describe same symptoms. > > In my case i was able to reproduce this bug mostly with skype > capturing video and audio over usb on webcam. > E3500 can't work at all with pulseaudio without this patch. > The Notebook Pro cam can work but some times it get unstable. > > Ignoring ctrl errors seems to fix both cases. Thanks. Maybe digging deeper to look for the real culprit would be better, but your bandaid looks simple enough, so I applied the patches now. Takashi

1 0

[alsa-devel] alsamixer - Mute AC97 "PCM Playback Switch" also mute "Master Playback Switch" and "Surround Playback Switch"
by Raymond Yau 20 Jun '12

20 Jun '12

Tested on Ubuntu 12.04 and Fedora 17 Live CD When PA server is running , using alsamixer -c0 to mute AC97 's "PCM Playback Switch" also mute "Master Playback Switch" and "Surround Playback Switch" but unmute "PCM Playback Switch" does not unmute "Master Playback Switch" and "Surround Playback Switch" of stac9708 alsamixer behave normally when shutdown PA server by echo "autospwan=off" > .pulse/client.conf and pulseaudio -k Why pulseaudio server behave in this way ?

1 0

[alsa-devel] [PATCH 1/3] maestro3: Remove unused AC97 register definitions
by Ezequiel Garcia 19 Jun '12

19 Jun '12

Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.de> Cc: Clemens Ladisch <clemens(a)ladisch.de> Signed-off-by: Ezequiel Garcia <elezegarcia(a)gmail.com> --- sound/pci/maestro3.c | 68 -------------------------------------------------- 1 files changed, 0 insertions(+), 68 deletions(-) diff --git a/sound/pci/maestro3.c b/sound/pci/maestro3.c index deef213..adb3b4c 100644 --- a/sound/pci/maestro3.c +++ b/sound/pci/maestro3.c @@ -361,74 +361,6 @@ MODULE_PARM_DESC(amp_gpio, "GPIO pin number for external amp. (default = -1)"); #define DSP2HOST_REQ_I2SRATE 0x02 #define DSP2HOST_REQ_TIMER 0x04 -/* AC97 registers */ -/* XXX fix this crap up */ -/*#define AC97_RESET 0x00*/ - -#define AC97_VOL_MUTE_B 0x8000 -#define AC97_VOL_M 0x1F -#define AC97_LEFT_VOL_S 8 - -#define AC97_MASTER_VOL 0x02 -#define AC97_LINE_LEVEL_VOL 0x04 -#define AC97_MASTER_MONO_VOL 0x06 -#define AC97_PC_BEEP_VOL 0x0A -#define AC97_PC_BEEP_VOL_M 0x0F -#define AC97_SROUND_MASTER_VOL 0x38 -#define AC97_PC_BEEP_VOL_S 1 - -/*#define AC97_PHONE_VOL 0x0C -#define AC97_MIC_VOL 0x0E*/ -#define AC97_MIC_20DB_ENABLE 0x40 - -/*#define AC97_LINEIN_VOL 0x10 -#define AC97_CD_VOL 0x12 -#define AC97_VIDEO_VOL 0x14 -#define AC97_AUX_VOL 0x16*/ -#define AC97_PCM_OUT_VOL 0x18 -/*#define AC97_RECORD_SELECT 0x1A*/ -#define AC97_RECORD_MIC 0x00 -#define AC97_RECORD_CD 0x01 -#define AC97_RECORD_VIDEO 0x02 -#define AC97_RECORD_AUX 0x03 -#define AC97_RECORD_MONO_MUX 0x02 -#define AC97_RECORD_DIGITAL 0x03 -#define AC97_RECORD_LINE 0x04 -#define AC97_RECORD_STEREO 0x05 -#define AC97_RECORD_MONO 0x06 -#define AC97_RECORD_PHONE 0x07 - -/*#define AC97_RECORD_GAIN 0x1C*/ -#define AC97_RECORD_VOL_M 0x0F - -/*#define AC97_GENERAL_PURPOSE 0x20*/ -#define AC97_POWER_DOWN_CTRL 0x26 -#define AC97_ADC_READY 0x0001 -#define AC97_DAC_READY 0x0002 -#define AC97_ANALOG_READY 0x0004 -#define AC97_VREF_ON 0x0008 -#define AC97_PR0 0x0100 -#define AC97_PR1 0x0200 -#define AC97_PR2 0x0400 -#define AC97_PR3 0x0800 -#define AC97_PR4 0x1000 - -#define AC97_RESERVED1 0x28 - -#define AC97_VENDOR_TEST 0x5A - -#define AC97_CLOCK_DELAY 0x5C -#define AC97_LINEOUT_MUX_SEL 0x0001 -#define AC97_MONO_MUX_SEL 0x0002 -#define AC97_CLOCK_DELAY_SEL 0x1F -#define AC97_DAC_CDS_SHIFT 6 -#define AC97_ADC_CDS_SHIFT 11 - -#define AC97_MULTI_CHANNEL_SEL 0x74 - -/*#define AC97_VENDOR_ID1 0x7C -#define AC97_VENDOR_ID2 0x7E*/ - /* * ASSP control regs */ -- 1.7.4.4

2 9

[alsa-devel] [PATCH] ASoC: wm8904: Remove unused variable in probe()
by Mark Brown 19 Jun '12

19 Jun '12

Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8904.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c index cc5fb43..0013afe 100644 --- a/sound/soc/codecs/wm8904.c +++ b/sound/soc/codecs/wm8904.c @@ -2054,7 +2054,6 @@ static void wm8904_handle_pdata(struct snd_soc_codec *codec) static int wm8904_probe(struct snd_soc_codec *codec) { struct wm8904_priv *wm8904 = snd_soc_codec_get_drvdata(codec); - struct wm8904_pdata *pdata = wm8904->pdata; int ret; codec->control_data = wm8904->regmap; -- 1.7.10

1 0

Re: [alsa-devel] [PATCH v2 1/5] dmaengine: mmp_tdma: add mmp tdma support
by Vinod Koul 19 Jun '12

19 Jun '12

On Mon, 2012-06-11 at 18:04 +0800, Zhangfei Gao wrote: > +static int mmp_tdma_clear_chan_irq(struct mmp_tdma_chan *tdmac) > +{ > + u32 reg = readl(tdmac->reg_base + TDISR); > + > + if (reg & TDISR_COMP) { > + /* clear irq */ > + reg &= ~TDISR_COMP; > + writel(reg, tdmac->reg_base + TDISR); > + > + return 0; > + } > + return -1; > +} -1? Please return a proper linux error code. -- ~Vinod -- To unsubscribe from this list: send the line "unsubscribe alsa-devel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

2 2

[alsa-devel] [PATCH] ASoC: wm5100: Remove stubs of ASoC-level register map code
by Mark Brown 19 Jun '12

19 Jun '12

Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm5100.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c index ba52534..33aa363 100644 --- a/sound/soc/codecs/wm5100.c +++ b/sound/soc/codecs/wm5100.c @@ -2517,13 +2517,6 @@ static int wm5100_remove(struct snd_soc_codec *codec) return 0; } -static int wm5100_soc_volatile(struct snd_soc_codec *codec, - unsigned int reg) -{ - return true; -} - - static struct snd_soc_codec_driver soc_codec_dev_wm5100 = { .probe = wm5100_probe, .remove = wm5100_remove, @@ -2531,8 +2524,6 @@ static struct snd_soc_codec_driver soc_codec_dev_wm5100 = { .set_sysclk = wm5100_set_sysclk, .set_pll = wm5100_set_fll, .idle_bias_off = 1, - .reg_cache_size = WM5100_MAX_REGISTER, - .volatile_register = wm5100_soc_volatile, .seq_notifier = wm5100_seq_notifier, .controls = wm5100_snd_controls, -- 1.7.10

1 0

[alsa-devel] [PATCH V2 13/16] ALSA: HDA: Make hda sound card usable for Loongson.
by Huacai Chen 19 Jun '12

19 Jun '12

Lemote A1004(Laptop) and A1205(All-In-One) use Conexant's hda codec, this patch make it usable: 1, Use 32-bit DMA as a workaround (Loongson has a hardware bug that it doesn't support DMA address above 4GB). 2, Modify patch_conexant.c to add Lemote specific code. Signed-off-by: Huacai Chen <chenhc(a)lemote.com> Signed-off-by: Hongliang Tao <taohl(a)lemote.com> Signed-off-by: Hua Yan <yanh(a)lemote.com> Cc: alsa-devel(a)alsa-project.org --- include/linux/pci_ids.h | 2 + sound/pci/hda/hda_intel.c | 5 ++++ sound/pci/hda/patch_conexant.c | 52 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 57 insertions(+), 2 deletions(-) diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index ab741b0..d8b0a52 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -2906,3 +2906,5 @@ #define PCI_DEVICE_ID_XEN_PLATFORM 0x0001 #define PCI_VENDOR_ID_OCZ 0x1b85 + +#define PCI_VENDOR_ID_LEMOTE 0x1c06 diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 2b6392b..2b73ed4 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -3013,6 +3013,11 @@ static int DELAYED_INIT_MARK azx_first_init(struct azx *chip) gcap &= ~ICH6_GCAP_64OK; } +#ifdef CONFIG_CPU_LOONGSON3 + /* Workaround: Loongson 3 doesn't support 64-bit DMA */ + gcap &= ~ICH6_GCAP_64OK; +#endif + /* disable buffer size rounding to 128-byte multiples if supported */ if (align_buffer_size >= 0) chip->align_buffer_size = !!align_buffer_size; diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index 3acb582..1c8dfb9 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -142,6 +142,7 @@ struct conexant_spec { unsigned int thinkpad:1; unsigned int hp_laptop:1; unsigned int asus:1; + unsigned int lemote:1; unsigned int pin_eapd_ctrls:1; unsigned int fixup_stereo_dmic:1; @@ -2278,7 +2279,7 @@ static void cxt5066_automic(struct hda_codec *codec) cxt5066_thinkpad_automic(codec); else if (spec->hp_laptop) cxt5066_hp_laptop_automic(codec); - else if (spec->asus) + else if (spec->asus || spec->lemote) cxt5066_asus_automic(codec); } @@ -2911,6 +2912,32 @@ static const struct hda_verb cxt5066_init_verbs_hp_laptop[] = { { } /* end */ }; +static struct hda_verb cxt5066_init_verbs_lemote[] = { + {0x14, AC_VERB_SET_CONNECT_SEL, 0x0}, /* ADC1: Connection index: 0 */ + {0x19, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_HP_EVENT}, + {0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_MIC_EVENT}, + + /* DAC2: unused */ + {0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, + + /* ADC2, ADC3: unused */ + {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, + {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, + {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)}, + {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)}, + {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, + {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, + {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)}, + {0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)}, + + /* Disable digital microphone port */ + {0x23, AC_VERB_SET_PIN_WIDGET_CONTROL, 0}, + + /* Disable SPDIF */ + {0x20, AC_VERB_SET_PIN_WIDGET_CONTROL, 0}, + { } /* end */ +}; + /* initialize jack-sensing, too */ static int cxt5066_init(struct hda_codec *codec) { @@ -2948,6 +2975,8 @@ enum { CXT5066_THINKPAD, /* Lenovo ThinkPad T410s, others? */ CXT5066_ASUS, /* Asus K52JU, Lenovo G560 - Int mic at 0x1a and Ext mic at 0x1b */ CXT5066_HP_LAPTOP, /* HP Laptop */ + CXT5066_LEMOTE_A1004, /* Lemote Laptop A1004 */ + CXT5066_LEMOTE_A1205, /* Lemote All-In-One A1205 */ CXT5066_AUTO, /* BIOS auto-parser */ CXT5066_MODELS }; @@ -2961,6 +2990,8 @@ static const char * const cxt5066_models[CXT5066_MODELS] = { [CXT5066_THINKPAD] = "thinkpad", [CXT5066_ASUS] = "asus", [CXT5066_HP_LAPTOP] = "hp-laptop", + [CXT5066_LEMOTE_A1004] = "lemote-laptop-a1004", + [CXT5066_LEMOTE_A1205] = "lemote-aio-a1205", [CXT5066_AUTO] = "auto", }; @@ -2993,6 +3024,8 @@ static const struct snd_pci_quirk cxt5066_cfg_tbl[] = { SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo U350", CXT5066_ASUS), SND_PCI_QUIRK(0x17aa, 0x38af, "Lenovo G560", CXT5066_ASUS), SND_PCI_QUIRK(0x17aa, 0x3938, "Lenovo G565", CXT5066_AUTO), + SND_PCI_QUIRK(0x1c06, 0x2011, "Lemote A1004", CXT5066_LEMOTE_A1004), + SND_PCI_QUIRK(0x1c06, 0x2012, "Lemote A1205", CXT5066_LEMOTE_A1205), SND_PCI_QUIRK(0x1b0a, 0x2092, "CyberpowerPC Gamer Xplorer N57001", CXT5066_AUTO), {} }; @@ -3073,7 +3106,22 @@ static int patch_cxt5066(struct hda_codec *codec) spec->port_d_mode = 0; spec->mic_boost = 3; /* default 30dB gain */ break; - + case CXT5066_LEMOTE_A1004: + case CXT5066_LEMOTE_A1205: + codec->patch_ops.init = cxt5066_init; + codec->patch_ops.unsol_event = cxt5066_unsol_event; + spec->init_verbs[spec->num_init_verbs] = + cxt5066_init_verbs_lemote; + spec->num_init_verbs++; + spec->lemote = 1; + spec->mixers[spec->num_mixers++] = cxt5066_mixer_master; + spec->mixers[spec->num_mixers++] = cxt5066_mixers; + /* no S/PDIF out */ + /* input source automatically selected */ + spec->input_mux = NULL; + spec->port_d_mode = 0; + spec->mic_boost = 3; /* default 30dB gain */ + break; case CXT5066_OLPC_XO_1_5: codec->patch_ops.init = cxt5066_olpc_init; codec->patch_ops.unsol_event = cxt5066_olpc_unsol_event; -- 1.7.7.3

3 3

Re: [alsa-devel] ASoC: codecs: Add AB8500 codec-driver
by Dan Carpenter 19 Jun '12

19 Jun '12

Hello Ola Lilja, The patch 679d7abdc754: "ASoC: codecs: Add AB8500 codec-driver" from Jun 7, 2012, leads to the following Sparse warnings: sound/soc/codecs/ab8500-codec.c:1960:53: warning: cast truncates bits from constant value (1013 becomes 13) sound/soc/codecs/ab8500-codec.c:1968:53: warning: cast truncates bits from constant value (1013 becomes 13) sound/soc/codecs/ab8500-codec.c 1958 /* Set DMic-clocks to outputs */ 1959 status = abx500_get_register_interruptible(codec->dev, (u8)AB8500_MISC, 1960 (u8)AB8500_GPIO_DIR4_REG, ^^^^^^^^^^^^^^^^^^^^ 1961 &value8); 1962 if (status < 0) 1963 return status; 1964 value = value8 | GPIO27_DIR_OUTPUT | GPIO29_DIR_OUTPUT | 1965 GPIO31_DIR_OUTPUT; 1966 status = abx500_set_register_interruptible(codec->dev, 1967 (u8)AB8500_MISC, 1968 (u8)AB8500_GPIO_DIR4_REG, ^^^^^^^^^^^^^^^^^^^^^^^^ 1969 value); In my quick check we only seem to use the truncated values of these defines so I'm not sure this was intended. regards, dan carpenter

2 1