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

[alsa-devel] [PATCH v2 0/5] snd-usb-6fire: volume control updates
by Torsten Schenk 22 Feb '12

22 Feb '12

Changes in v2: - removal of log-conversion now in separate patch - tlv added - invalid channels in put and get routines now return -EINVAL - index numbers used for controls instead of stating the index in the .name-string - list terminator now added when list is added, not later in patchset - input volume info now doesn't use negative values any longer; shifts the value to start at zero and adds tlv to indicate the negative value - removed index of single input volume element Thanks, Torsten

2 1

[alsa-devel] [PATCH v2 3/5] snd-usb-6fire: add individual volume control for analog channels
by Torsten Schenk 22 Feb '12

22 Feb '12

Add a stereo volume control for every analog output pair 1/2, 3/4, 5/6. Signed-off-by: Torsten Schenk <torsten.schenk(a)zoho.com> diff -Nur a/sound/usb/6fire/control.c b/sound/usb/6fire/control.c --- a/sound/usb/6fire/control.c 2012-01-17 18:36:14.480508754 +0100 +++ b/sound/usb/6fire/control.c 2012-01-17 19:46:16.278171321 +0100 @@ -7,6 +7,10 @@ * Created: Jan 01, 2011 * Copyright: (C) Torsten Schenk * + * Thanks to: + * - Holger Ruckdeschel: he found out how to control individual channel + * volumes and introduced mute switch + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -39,7 +43,7 @@ { 0x22, 0x03, 0x00 }, { 0x20, 0x03, 0x08 }, { 0x22, 0x04, 0x00 }, { 0x20, 0x04, 0x08 }, { 0x22, 0x05, 0x01 }, { 0x20, 0x05, 0x08 }, { 0x22, 0x04, 0x01 }, { 0x12, 0x04, 0x00 }, { 0x12, 0x05, 0x00 }, - { 0x12, 0x0d, 0x78 }, { 0x12, 0x21, 0x82 }, { 0x12, 0x22, 0x80 }, + { 0x12, 0x0d, 0x38 }, { 0x12, 0x21, 0x82 }, { 0x12, 0x22, 0x80 }, { 0x12, 0x23, 0x00 }, { 0x12, 0x06, 0x02 }, { 0x12, 0x03, 0x00 }, { 0x12, 0x02, 0x00 }, { 0x22, 0x03, 0x01 }, { 0 } /* TERMINATING ENTRY */ @@ -56,15 +60,15 @@ DIGITAL_THRU_ONLY_SAMPLERATE = 3 }; -static void usb6fire_control_master_vol_update(struct control_runtime *rt) +static void usb6fire_control_output_vol_update(struct control_runtime *rt) { struct comm_runtime *comm_rt = rt->chip->comm; - if (comm_rt) { - /* set volume */ - comm_rt->write8(comm_rt, 0x12, 0x0f, 180 - rt->master_vol); - /* unmute */ - comm_rt->write8(comm_rt, 0x12, 0x0e, 0x00); - } + int i; + + if (comm_rt) + for (i = 0; i < 6; i++) + comm_rt->write8(comm_rt, 0x12, 0x0f + i, + 180 - rt->output_vol[i]); } static void usb6fire_control_line_phono_update(struct control_runtime *rt) @@ -146,34 +150,56 @@ return -EINVAL; } -static int usb6fire_control_master_vol_info(struct snd_kcontrol *kcontrol, +static int usb6fire_control_output_vol_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) { uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; - uinfo->count = 1; + uinfo->count = 2; uinfo->value.integer.min = 0; uinfo->value.integer.max = 180; return 0; } -static int usb6fire_control_master_vol_put(struct snd_kcontrol *kcontrol, +static int usb6fire_control_output_vol_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { struct control_runtime *rt = snd_kcontrol_chip(kcontrol); + unsigned int ch = kcontrol->private_value; int changed = 0; - if (rt->master_vol != ucontrol->value.integer.value[0]) { - rt->master_vol = ucontrol->value.integer.value[0]; - usb6fire_control_master_vol_update(rt); + + if (ch > 4) { + snd_printk(KERN_ERR PREFIX "Invalid channel in volume control."); + return -EINVAL; + } + + if (rt->output_vol[ch] != ucontrol->value.integer.value[0]) { + rt->output_vol[ch] = ucontrol->value.integer.value[0]; changed = 1; } + if (rt->output_vol[ch + 1] != ucontrol->value.integer.value[1]) { + rt->output_vol[ch + 1] = ucontrol->value.integer.value[1]; + changed = 1; + } + + if (changed) + usb6fire_control_output_vol_update(rt); + return changed; } -static int usb6fire_control_master_vol_get(struct snd_kcontrol *kcontrol, +static int usb6fire_control_output_vol_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { struct control_runtime *rt = snd_kcontrol_chip(kcontrol); - ucontrol->value.integer.value[0] = rt->master_vol; + unsigned int ch = kcontrol->private_value; + + if (ch > 4) { + snd_printk(KERN_ERR PREFIX "Invalid channel in volume control."); + return -EINVAL; + } + + ucontrol->value.integer.value[0] = rt->output_vol[ch]; + ucontrol->value.integer.value[1] = rt->output_vol[ch + 1]; return 0; } @@ -268,20 +294,49 @@ return 0; } -static struct __devinitdata snd_kcontrol_new elements[] = { +static struct __devinitdata snd_kcontrol_new vol_elements[] = { { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, - .name = "Master Playback Volume", - .index = 0, + .name = "Analog Playback Volume", + .index = 1, + .private_value = 0, .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_TLV_READ, - .info = usb6fire_control_master_vol_info, - .get = usb6fire_control_master_vol_get, - .put = usb6fire_control_master_vol_put, + .info = usb6fire_control_output_vol_info, + .get = usb6fire_control_output_vol_get, + .put = usb6fire_control_output_vol_put, .tlv = { .p = tlv_output } }, { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Analog Playback Volume", + .index = 2, + .private_value = 2, + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | + SNDRV_CTL_ELEM_ACCESS_TLV_READ, + .info = usb6fire_control_output_vol_info, + .get = usb6fire_control_output_vol_get, + .put = usb6fire_control_output_vol_put, + .tlv = { .p = tlv_output } + }, + { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Analog Playback Volume", + .index = 3, + .private_value = 4, + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | + SNDRV_CTL_ELEM_ACCESS_TLV_READ, + .info = usb6fire_control_output_vol_info, + .get = usb6fire_control_output_vol_get, + .put = usb6fire_control_output_vol_put, + .tlv = { .p = tlv_output } + }, + {} +}; + +static struct __devinitdata snd_kcontrol_new elements[] = { + { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = "Line/Phono Capture Route", .index = 0, .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, @@ -310,6 +365,39 @@ {} }; +static int usb6fire_control_add_virtual( + struct control_runtime *rt, + struct snd_card *card, + char *name, + struct snd_kcontrol_new *elems) +{ + int ret; + int i; + struct snd_kcontrol *vmaster = snd_ctl_make_virtual_master(name, NULL); + struct snd_kcontrol *control; + + if (!vmaster) + return -ENOMEM; + ret = snd_ctl_add(card, vmaster); + if (ret < 0) + return ret; + + i = 0; + while (elems[i].name) { + control = snd_ctl_new1(&elems[i], rt); + if (!control) + return -ENOMEM; + ret = snd_ctl_add(card, control); + if (ret < 0) + return ret; + ret = snd_ctl_add_slave(vmaster, control); + if (ret < 0) + return ret; + i++; + } + return 0; +} + int __devinit usb6fire_control_init(struct sfire_chip *chip) { int i; @@ -335,9 +423,17 @@ usb6fire_control_opt_coax_update(rt); usb6fire_control_line_phono_update(rt); - usb6fire_control_master_vol_update(rt); + usb6fire_control_output_vol_update(rt); usb6fire_control_streaming_update(rt); + ret = usb6fire_control_add_virtual(rt, chip->card, + "Master Playback Volume", vol_elements); + if (ret) { + kfree(rt); + snd_printk(KERN_ERR PREFIX "cannot add control.\n"); + return ret; + } + i = 0; while (elements[i].name) { ret = snd_ctl_add(chip->card, snd_ctl_new1(&elements[i], rt)); diff -Nur a/sound/usb/6fire/control.h b/sound/usb/6fire/control.h --- a/sound/usb/6fire/control.h 2012-01-09 22:32:56.088002206 +0100 +++ b/sound/usb/6fire/control.h 2012-01-09 22:36:07.698544501 +0100 @@ -43,7 +43,7 @@ bool line_phono_switch; bool digital_thru_switch; bool usb_streaming; - u8 master_vol; + u8 output_vol[6]; }; int __devinit usb6fire_control_init(struct sfire_chip *chip);

2 1

[alsa-devel] [PATCH] ASoC: imx: move SND_SOC_AC97_BUS selection down to machine driver
by Shawn Guo 22 Feb '12

22 Feb '12

SND_SOC_AC97_BUS is selected to enable the AC97 support in soc-core. Rather than selecting the option under SND_IMX_SOC, it's better to leave the selection to individual machine driver which knows if AC97 support is needed or not. Signed-off-by: Shawn Guo <shawn.guo(a)linaro.org> --- sound/soc/imx/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/imx/Kconfig b/sound/soc/imx/Kconfig index e89139f..7c4aa42 100644 --- a/sound/soc/imx/Kconfig +++ b/sound/soc/imx/Kconfig @@ -1,7 +1,6 @@ menuconfig SND_IMX_SOC tristate "SoC Audio for Freescale i.MX CPUs" depends on ARCH_MXC - select SND_SOC_AC97_BUS help Say Y or M if you want to add support for codecs attached to the i.MX SSI interface. @@ -37,6 +36,7 @@ config SND_SOC_MX27VIS_AIC32X4 config SND_SOC_PHYCORE_AC97 tristate "SoC Audio support for Phytec phyCORE (and phyCARD) boards" depends on MACH_PCM043 || MACH_PCA100 + select SND_SOC_AC97_BUS select SND_SOC_WM9712 select SND_MXC_SOC_FIQ help -- 1.7.5.4

2 1

[alsa-devel] [PATCH v2 5/5] snd-usb-6fire: add analog input volume control
by Torsten Schenk 22 Feb '12

22 Feb '12

Add a stereo volume control for analog input channel pair 1/2. Signed-off-by: Torsten Schenk <torsten.schenk(a)zoho.com> diff -Nur a/sound/usb/6fire/control.c b/sound/usb/6fire/control.c --- a/sound/usb/6fire/control.c 2012-01-30 11:57:10.557379497 +0100 +++ b/sound/usb/6fire/control.c 2012-01-30 11:56:47.260578549 +0100 @@ -55,6 +55,7 @@ static const u16 rates_6fire_vh[] = {0x11, 0x11, 0x10, 0x10, 0x00, 0x00}; static DECLARE_TLV_DB_MINMAX(tlv_output, -9000, 0); +static DECLARE_TLV_DB_MINMAX(tlv_input, -1500, 1500); enum { DIGITAL_THRU_ONLY_SAMPLERATE = 3 @@ -79,6 +80,17 @@ comm_rt->write8(comm_rt, 0x12, 0x0e, ~rt->output_mute); } +static void usb6fire_control_input_vol_update(struct control_runtime *rt) +{ + struct comm_runtime *comm_rt = rt->chip->comm; + int i; + + if (comm_rt) + for (i = 0; i < 2; i++) + comm_rt->write8(comm_rt, 0x12, 0x1c + i, + rt->input_vol[i] & 0x3f); +} + static void usb6fire_control_line_phono_update(struct control_runtime *rt) { struct comm_runtime *comm_rt = rt->chip->comm; @@ -256,6 +268,48 @@ return 0; } +static int usb6fire_control_input_vol_info(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; + uinfo->count = 2; + uinfo->value.integer.min = 0; + uinfo->value.integer.max = 30; + return 0; +} + +static int usb6fire_control_input_vol_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct control_runtime *rt = snd_kcontrol_chip(kcontrol); + int changed = 0; + + if (rt->input_vol[0] != ucontrol->value.integer.value[0]) { + rt->input_vol[0] = ucontrol->value.integer.value[0] - 15; + changed = 1; + } + if (rt->input_vol[1] != ucontrol->value.integer.value[1]) { + rt->input_vol[1] = ucontrol->value.integer.value[1] - 15; + changed = 1; + } + + if (changed) + usb6fire_control_input_vol_update(rt); + + return changed; +} + +static int usb6fire_control_input_vol_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct control_runtime *rt = snd_kcontrol_chip(kcontrol); + + ucontrol->value.integer.value[0] = rt->input_vol[0] + 15; + ucontrol->value.integer.value[1] = rt->input_vol[1] + 15; + + return 0; +} + static int usb6fire_control_line_phono_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) { @@ -449,6 +503,17 @@ .get = usb6fire_control_digital_thru_get, .put = usb6fire_control_digital_thru_put }, + { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Analog Capture Volume", + .index = 0, + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | + SNDRV_CTL_ELEM_ACCESS_TLV_READ, + .info = usb6fire_control_input_vol_info, + .get = usb6fire_control_input_vol_get, + .put = usb6fire_control_input_vol_put, + .tlv = { .p = tlv_input } + }, {} }; @@ -512,6 +577,7 @@ usb6fire_control_line_phono_update(rt); usb6fire_control_output_vol_update(rt); usb6fire_control_output_mute_update(rt); + usb6fire_control_input_vol_update(rt); usb6fire_control_streaming_update(rt); ret = usb6fire_control_add_virtual(rt, chip->card, diff -Nur a/sound/usb/6fire/control.h b/sound/usb/6fire/control.h --- a/sound/usb/6fire/control.h 2012-01-11 19:54:50.651190007 +0100 +++ b/sound/usb/6fire/control.h 2012-02-05 12:28:10.314770911 +0100 @@ -45,6 +45,7 @@ bool usb_streaming; u8 output_vol[6]; u8 output_mute; + s8 input_vol[2]; }; int __devinit usb6fire_control_init(struct sfire_chip *chip);

1 0

[alsa-devel] [PATCH v2 4/5] snd-usb-6fire: add mute control for analog outputs
by Torsten Schenk 22 Feb '12

22 Feb '12

Add a mute control for every analog output channel. Signed-off-by: Torsten Schenk <torsten.schenk(a)zoho.com> diff -Nur a/sound/usb/6fire/control.c b/sound/usb/6fire/control.c --- a/sound/usb/6fire/control.c 2012-01-17 19:46:16.278171321 +0100 +++ b/sound/usb/6fire/control.c 2012-01-30 11:57:10.557379497 +0100 @@ -71,6 +71,14 @@ 180 - rt->output_vol[i]); } +static void usb6fire_control_output_mute_update(struct control_runtime *rt) +{ + struct comm_runtime *comm_rt = rt->chip->comm; + + if (comm_rt) + comm_rt->write8(comm_rt, 0x12, 0x0e, ~rt->output_mute); +} + static void usb6fire_control_line_phono_update(struct control_runtime *rt) { struct comm_runtime *comm_rt = rt->chip->comm; @@ -203,6 +211,51 @@ return 0; } +static int usb6fire_control_output_mute_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct control_runtime *rt = snd_kcontrol_chip(kcontrol); + unsigned int ch = kcontrol->private_value; + u8 old = rt->output_mute; + u8 value = 0; + + if (ch > 4) { + snd_printk(KERN_ERR PREFIX "Invalid channel in volume control."); + return -EINVAL; + } + + rt->output_mute &= ~(3 << ch); + if (ucontrol->value.integer.value[0]) + value |= 1; + if (ucontrol->value.integer.value[1]) + value |= 2; + rt->output_mute |= value << ch; + + if (rt->output_mute != old) + usb6fire_control_output_mute_update(rt); + + return rt->output_mute != old; +} + +static int usb6fire_control_output_mute_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct control_runtime *rt = snd_kcontrol_chip(kcontrol); + unsigned int ch = kcontrol->private_value; + u8 value = rt->output_mute >> ch; + + if (ch > 4) { + snd_printk(KERN_ERR PREFIX "Invalid channel in volume control."); + return -EINVAL; + } + + ucontrol->value.integer.value[0] = 1 & value; + value >>= 1; + ucontrol->value.integer.value[1] = 1 & value; + + return 0; +} + static int usb6fire_control_line_phono_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) { @@ -334,6 +387,40 @@ {} }; +static struct __devinitdata snd_kcontrol_new mute_elements[] = { + { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Analog Playback Switch", + .index = 1, + .private_value = 0, + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, + .info = snd_ctl_boolean_stereo_info, + .get = usb6fire_control_output_mute_get, + .put = usb6fire_control_output_mute_put, + }, + { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Analog Playback Switch", + .index = 2, + .private_value = 2, + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, + .info = snd_ctl_boolean_stereo_info, + .get = usb6fire_control_output_mute_get, + .put = usb6fire_control_output_mute_put, + }, + { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Analog Playback Switch", + .index = 3, + .private_value = 4, + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, + .info = snd_ctl_boolean_stereo_info, + .get = usb6fire_control_output_mute_get, + .put = usb6fire_control_output_mute_put, + }, + {} +}; + static struct __devinitdata snd_kcontrol_new elements[] = { { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, @@ -424,13 +511,21 @@ usb6fire_control_opt_coax_update(rt); usb6fire_control_line_phono_update(rt); usb6fire_control_output_vol_update(rt); + usb6fire_control_output_mute_update(rt); usb6fire_control_streaming_update(rt); ret = usb6fire_control_add_virtual(rt, chip->card, "Master Playback Volume", vol_elements); if (ret) { + snd_printk(KERN_ERR PREFIX "cannot add control.\n"); kfree(rt); + return ret; + } + ret = usb6fire_control_add_virtual(rt, chip->card, + "Master Playback Switch", mute_elements); + if (ret) { snd_printk(KERN_ERR PREFIX "cannot add control.\n"); + kfree(rt); return ret; } diff -Nur a/sound/usb/6fire/control.h b/sound/usb/6fire/control.h --- a/sound/usb/6fire/control.h 2012-01-09 22:36:07.698544501 +0100 +++ b/sound/usb/6fire/control.h 2012-01-11 19:54:50.651190007 +0100 @@ -44,6 +44,7 @@ bool digital_thru_switch; bool usb_streaming; u8 output_vol[6]; + u8 output_mute; }; int __devinit usb6fire_control_init(struct sfire_chip *chip);

1 0

[alsa-devel] [PATCH v2 2/5] snd-usb-6fire: add tlv to controls
by Torsten Schenk 22 Feb '12

22 Feb '12

Remove the soft log-conversion and add a dB scale according to the DAC documentation instead. Signed-off-by: Torsten Schenk <torsten.schenk(a)zoho.com> diff -Nur a/sound/usb/6fire/control.c b/sound/usb/6fire/control.c --- a/sound/usb/6fire/control.c 2012-01-09 22:33:01.512182294 +0100 +++ b/sound/usb/6fire/control.c 2012-01-17 18:36:14.480508754 +0100 @@ -15,6 +15,7 @@ #include <linux/interrupt.h> #include <sound/control.h> +#include <sound/tlv.h> #include "control.h" #include "comm.h" @@ -24,26 +25,6 @@ static char *line_phono_texts[2] = { "Line", "Phono" }; /* - * calculated with $value\[i\] = 128 \cdot sqrt[3]{\frac{i}{128}}$ - * this is done because the linear values cause rapid degredation - * of volume in the uppermost region. - */ -static const u8 log_volume_table[128] = { - 0x00, 0x19, 0x20, 0x24, 0x28, 0x2b, 0x2e, 0x30, 0x32, 0x34, - 0x36, 0x38, 0x3a, 0x3b, 0x3d, 0x3e, 0x40, 0x41, 0x42, 0x43, - 0x44, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, - 0x4e, 0x4f, 0x50, 0x51, 0x52, 0x53, 0x53, 0x54, 0x55, 0x56, - 0x56, 0x57, 0x58, 0x58, 0x59, 0x5a, 0x5b, 0x5b, 0x5c, 0x5c, - 0x5d, 0x5e, 0x5e, 0x5f, 0x60, 0x60, 0x61, 0x61, 0x62, 0x62, - 0x63, 0x63, 0x64, 0x65, 0x65, 0x66, 0x66, 0x67, 0x67, 0x68, - 0x68, 0x69, 0x69, 0x6a, 0x6a, 0x6b, 0x6b, 0x6c, 0x6c, 0x6c, - 0x6d, 0x6d, 0x6e, 0x6e, 0x6f, 0x6f, 0x70, 0x70, 0x70, 0x71, - 0x71, 0x72, 0x72, 0x73, 0x73, 0x73, 0x74, 0x74, 0x75, 0x75, - 0x75, 0x76, 0x76, 0x77, 0x77, 0x77, 0x78, 0x78, 0x78, 0x79, - 0x79, 0x7a, 0x7a, 0x7a, 0x7b, 0x7b, 0x7b, 0x7c, 0x7c, 0x7c, - 0x7d, 0x7d, 0x7d, 0x7e, 0x7e, 0x7e, 0x7f, 0x7f }; - -/* * data that needs to be sent to device. sets up card internal stuff. * values dumped from windows driver and filtered by trial'n'error. */ @@ -69,6 +50,8 @@ static const u16 rates_6fire_vl[] = {0x00, 0x01, 0x00, 0x01, 0x00, 0x01}; static const u16 rates_6fire_vh[] = {0x11, 0x11, 0x10, 0x10, 0x00, 0x00}; +static DECLARE_TLV_DB_MINMAX(tlv_output, -9000, 0); + enum { DIGITAL_THRU_ONLY_SAMPLERATE = 3 }; @@ -78,8 +61,7 @@ struct comm_runtime *comm_rt = rt->chip->comm; if (comm_rt) { /* set volume */ - comm_rt->write8(comm_rt, 0x12, 0x0f, 0x7f - - log_volume_table[rt->master_vol]); + comm_rt->write8(comm_rt, 0x12, 0x0f, 180 - rt->master_vol); /* unmute */ comm_rt->write8(comm_rt, 0x12, 0x0e, 0x00); } @@ -170,7 +152,7 @@ uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; uinfo->count = 1; uinfo->value.integer.min = 0; - uinfo->value.integer.max = 127; + uinfo->value.integer.max = 180; return 0; } @@ -291,10 +273,12 @@ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = "Master Playback Volume", .index = 0, - .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, + .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | + SNDRV_CTL_ELEM_ACCESS_TLV_READ, .info = usb6fire_control_master_vol_info, .get = usb6fire_control_master_vol_get, - .put = usb6fire_control_master_vol_put + .put = usb6fire_control_master_vol_put, + .tlv = { .p = tlv_output } }, { .iface = SNDRV_CTL_ELEM_IFACE_MIXER,

1 0

[alsa-devel] [PATCH v2 1/5] snd-usb-6fire: remove driver version information
by Torsten Schenk 22 Feb '12

22 Feb '12

Remove unused driver version information from the individual files. Signed-off-by: Torsten Schenk <torsten.schenk(a)zoho.com> diff -Nur a/sound/usb/6fire/chip.c b/sound/usb/6fire/chip.c --- a/sound/usb/6fire/chip.c 2012-01-09 21:55:55.863579333 +0100 +++ b/sound/usb/6fire/chip.c 2012-01-09 22:33:49.857786986 +0100 @@ -5,7 +5,6 @@ * * Author: Torsten Schenk <torsten.schenk(a)zoho.com> * Created: Jan 01, 2011 - * Version: 0.3.0 * Copyright: (C) Torsten Schenk * * This program is free software; you can redistribute it and/or modify @@ -29,7 +28,7 @@ #include <sound/initval.h> MODULE_AUTHOR("Torsten Schenk <torsten.schenk(a)zoho.com>"); -MODULE_DESCRIPTION("TerraTec DMX 6Fire USB audio driver, version 0.3.0"); +MODULE_DESCRIPTION("TerraTec DMX 6Fire USB audio driver"); MODULE_LICENSE("GPL v2"); MODULE_SUPPORTED_DEVICE("{{TerraTec, DMX 6Fire USB}}"); diff -Nur a/sound/usb/6fire/chip.h b/sound/usb/6fire/chip.h --- a/sound/usb/6fire/chip.h 2012-01-09 21:55:55.000000000 +0100 +++ b/sound/usb/6fire/chip.h 2012-01-09 22:33:38.469409108 +0100 @@ -3,7 +3,6 @@ * * Author: Torsten Schenk <torsten.schenk(a)zoho.com> * Created: Jan 01, 2011 - * Version: 0.3.0 * Copyright: (C) Torsten Schenk * * This program is free software; you can redistribute it and/or modify diff -Nur a/sound/usb/6fire/comm.c b/sound/usb/6fire/comm.c --- a/sound/usb/6fire/comm.c 2012-01-09 21:55:55.000000000 +0100 +++ b/sound/usb/6fire/comm.c 2012-01-09 22:33:11.620517902 +0100 @@ -5,7 +5,6 @@ * * Author: Torsten Schenk <torsten.schenk(a)zoho.com> * Created: Jan 01, 2011 - * Version: 0.3.0 * Copyright: (C) Torsten Schenk * * This program is free software; you can redistribute it and/or modify diff -Nur a/sound/usb/6fire/comm.h b/sound/usb/6fire/comm.h --- a/sound/usb/6fire/comm.h 2012-01-09 21:55:55.000000000 +0100 +++ b/sound/usb/6fire/comm.h 2012-01-09 22:33:16.900693132 +0100 @@ -3,7 +3,6 @@ * * Author: Torsten Schenk <torsten.schenk(a)zoho.com> * Created: Jan 01, 2011 - * Version: 0.3.0 * Copyright: (C) Torsten Schenk * * This program is free software; you can redistribute it and/or modify diff -Nur a/sound/usb/6fire/common.h b/sound/usb/6fire/common.h --- a/sound/usb/6fire/common.h 2012-01-09 21:55:55.000000000 +0100 +++ b/sound/usb/6fire/common.h 2012-01-09 22:33:24.636949983 +0100 @@ -3,7 +3,6 @@ * * Author: Torsten Schenk <torsten.schenk(a)zoho.com> * Created: Jan 01, 2011 - * Version: 0.3.0 * Copyright: (C) Torsten Schenk * * This program is free software; you can redistribute it and/or modify diff -Nur a/sound/usb/6fire/control.c b/sound/usb/6fire/control.c --- a/sound/usb/6fire/control.c 2012-01-09 21:55:55.000000000 +0100 +++ b/sound/usb/6fire/control.c 2012-01-09 22:33:01.512182294 +0100 @@ -5,7 +5,6 @@ * * Author: Torsten Schenk <torsten.schenk(a)zoho.com> * Created: Jan 01, 2011 - * Version: 0.3.0 * Copyright: (C) Torsten Schenk * * This program is free software; you can redistribute it and/or modify diff -Nur a/sound/usb/6fire/control.h b/sound/usb/6fire/control.h --- a/sound/usb/6fire/control.h 2012-01-09 21:55:55.000000000 +0100 +++ b/sound/usb/6fire/control.h 2012-01-09 22:32:56.088002206 +0100 @@ -3,7 +3,6 @@ * * Author: Torsten Schenk <torsten.schenk(a)zoho.com> * Created: Jan 01, 2011 - * Version: 0.3.0 * Copyright: (C) Torsten Schenk * * This program is free software; you can redistribute it and/or modify diff -Nur a/sound/usb/6fire/firmware.c b/sound/usb/6fire/firmware.c --- a/sound/usb/6fire/firmware.c 2012-01-09 21:55:55.000000000 +0100 +++ b/sound/usb/6fire/firmware.c 2012-01-09 22:33:30.933158868 +0100 @@ -5,7 +5,6 @@ * * Author: Torsten Schenk <torsten.schenk(a)zoho.com> * Created: Jan 01, 2011 - * Version: 0.3.0 * Copyright: (C) Torsten Schenk * * This program is free software; you can redistribute it and/or modify diff -Nur a/sound/usb/6fire/midi.c b/sound/usb/6fire/midi.c --- a/sound/usb/6fire/midi.c 2012-01-09 21:55:55.000000000 +0100 +++ b/sound/usb/6fire/midi.c 2012-01-09 22:35:07.356357430 +0100 @@ -5,7 +5,6 @@ * * Author: Torsten Schenk <torsten.schenk(a)zoho.com> * Created: Jan 01, 2011 - * Version: 0.3.0 * Copyright: (C) Torsten Schenk * * This program is free software; you can redistribute it and/or modify diff -Nur a/sound/usb/6fire/midi.h b/sound/usb/6fire/midi.h --- a/sound/usb/6fire/midi.h 2012-01-09 21:55:55.000000000 +0100 +++ b/sound/usb/6fire/midi.h 2012-01-09 22:33:58.866085888 +0100 @@ -3,7 +3,6 @@ * * Author: Torsten Schenk <torsten.schenk(a)zoho.com> * Created: Jan 01, 2011 - * Version: 0.3.0 * Copyright: (C) Torsten Schenk * * This program is free software; you can redistribute it and/or modify diff -Nur a/sound/usb/6fire/pcm.c b/sound/usb/6fire/pcm.c --- a/sound/usb/6fire/pcm.c 2012-01-09 21:55:55.000000000 +0100 +++ b/sound/usb/6fire/pcm.c 2012-01-09 22:34:04.546274285 +0100 @@ -5,7 +5,6 @@ * * Author: Torsten Schenk <torsten.schenk(a)zoho.com> * Created: Jan 01, 2011 - * Version: 0.3.0 * Copyright: (C) Torsten Schenk * * This program is free software; you can redistribute it and/or modify diff -Nur a/sound/usb/6fire/pcm.h b/sound/usb/6fire/pcm.h --- a/sound/usb/6fire/pcm.h 2012-01-09 21:55:55.000000000 +0100 +++ b/sound/usb/6fire/pcm.h 2012-01-09 22:34:07.798382278 +0100 @@ -3,7 +3,6 @@ * * Author: Torsten Schenk <torsten.schenk(a)zoho.com> * Created: Jan 01, 2011 - * Version: 0.3.0 * Copyright: (C) Torsten Schenk * * This program is free software; you can redistribute it and/or modify

1 0

Re: [alsa-devel] [RFC 00/10] ASoC: Introduce dmaengine pcm helper functions
by Shawn Guo 22 Feb '12

22 Feb '12

Nice consolidation ... On Tue, Feb 21, 2012 at 05:47:54PM +0100, Lars-Peter Clausen wrote: > This patch series introduces a new set of helper functions for dmaengine based > PCM drivers. Currently we have 6 different dmaengine based PCM drivers which are > all more or less similar in structure, but all have also individual requirements > which can't easily be generalized. So that's why this series does not introduce > a generic dmaengine PCM driver but rather a set of helper functions which can be > used to implement the common bits between such dmaengine based PCM drivers. > > The helper functions only provide infrastructure code for dmaengines which > provide thed evice_prep_dma_cyclic. While it is possible to add support for > dmaengine, which only provide device_prep_slave_sg, it is in my opinion a better > idea to either implement the missing functionality in the dmaengine driver or > provide a emulation layer for cyclic transfer within the dmaengine framework > itself. This has the advantage that it is also available outside of ALSA. > > This series converts the three PCM drivers which already use the circular > dmaengine prepare function. Since I don't have access to hardware using the > converted drivers the patches have only been compile tested. But the helper > functions introduced in this series have been runtime tested with a platform > which is not upstream yet. > > The first three patches are just cleanup patches which remove unused functions > and struct fields and can probably applied without waiting for the rest of the > series. The next two patches restructure the iMX and MXS drivers to request > their DMA channel in the PCM open callback instead of the hwparams callback. > This is done to make their structure more similar to what it will be when using > the helper functions and make the actual patch converting them to the new > dmaengine PCM helper functions less intrusive. The next patch introduces the > helper functions and the last three patches respectively convert the imx, mxs > and ep39xx dmaengine based PCM drivers to use the new set of helper functions. > > The set of helper functions consists of a open, a close, a trigger and a pointer > callback and also a function to convert hwparams to a dma_slave_config. The > trigger and pointer callbacks can usually be used directly for the pcm_ops > callbacks. The open callback wants to be called from a driver specific open > function which may do some driver specific setup tasks and provide the helper > open callback with a dma filter function. If the driver specific open functions > allocates resources they need to be freed in a driver specific close function > which has to call the helper close callback. If not the helper close callback > can be assigned directly to the pcm_ops struct. > > If a driver needs to keep additional driver specific data around it can be done > by using snd_dmaengine_pcm_{get,set}_data. Normally a driver should not require > to keep additional data around, but all of the converted drivers need this, > because of this horrible abusive pattern where the dma channels private field > gets assigned configuration data in the filter callback. We should hopefully be > able to get rid of this pattern with Guennadi Liakhovetski's patches[1], which > add a slave configuration parameter to dma_request_channel, and with it the need > for storing extra private data. > > While the DMA helper functions only use generic ALSA functions and nothing ASoC > specific I've placed the, under ASoC for now since the only users are ASoC > driver. > > - Lars > > [1] https://lkml.org/lkml/2012/2/1/227 > > Lars-Peter Clausen (10): > ASoC: imx-pcm: Remove empty prepare callback > ASoC: imx-pcm: Remove unused fields from imx_pcm_runtime_data struct > ASoC: mxs-pcm: Remove unused fields from struct mxs_pcm_runtime_data > ASoC: imx-ssi: Set dma data early > ASoC: imx-pcm: Request DMA channel early > ASoC: mxs-pxm: Request DMA channel early s/mxs-pxm/mxs-pcm > ASoC: Add dmaengine PCM helper functions > ASoC: imx-dma: Use dmaengine PCM helper functions s/imx-dma/imx-pcm > ASoC: mxs-pcm: Use dmaengine PCM helper functions > ASoC: ep93xx-pcm: Use dmaengine PCM helper functions > > include/sound/dmaengine_pcm.h | 49 +++++++ > sound/soc/Kconfig | 3 + > sound/soc/Makefile | 3 + > sound/soc/ep93xx/Kconfig | 1 + > sound/soc/ep93xx/ep93xx-pcm.c | 148 +++----------------- > sound/soc/imx/Kconfig | 1 + > sound/soc/imx/imx-pcm-dma-mx2.c | 216 ++++------------------------- > sound/soc/imx/imx-ssi.c | 28 +++- > sound/soc/mxs/Kconfig | 1 + > sound/soc/mxs/mxs-pcm.c | 157 ++++------------------ > sound/soc/mxs/mxs-pcm.h | 16 -- > sound/soc/soc-dmaengine-pcm.c | 287 +++++++++++++++++++++++++++++++++++++++ > 12 files changed, 443 insertions(+), 467 deletions(-) > create mode 100644 include/sound/dmaengine_pcm.h > create mode 100644 sound/soc/soc-dmaengine-pcm.c > I tested it on both MXS (i.MX28) and IMX (i.MX51), it works fine, so Tested-by: Shawn Guo <shawn.guo(a)linaro.org> However, when I play the series on today's linux-next, I found a patch from Russell (Cc-ed) below doing something overlapping with the work here. commit 4c815a835e9b0231028e9cc303406b381bfff7a2 Author: Russell King <rmk+kernel(a)arm.linux.org.uk> Date: Wed Jan 18 13:01:26 2012 +0000 ALSA: ASoC: add generic slave-only DMA engine support Add a generic DMA engine platform driver to ASoC. This allows a range of DMA engines to be used to transfer data to a CPUs audio interface without having to rewrite this code many times. This driver only supports DMA_SLAVE channels, not DMA_CYCLIC channels. DMA_CYCLIC channels could be added at a later date. Signed-off-by: Russell King <rmk+kernel(a)arm.linux.org.uk> I did not notice this patch on any list yet, so am not sure about Russell's plan about it. But it seems this series does not reach alsa-devel list either. (forgot?) -- Regards, Shawn

4 4

[alsa-devel] [PATCH] ASoC: pandora: switch clock back to internal on stop
by Grazvydas Ignotas 22 Feb '12

22 Feb '12

For some reason, OMAP doesn't enter lower power states with functional clock (CLKS) source set to external, so switch it back to internal when done playing. Signed-off-by: Grazvydas Ignotas <notasas(a)gmail.com> --- sound/soc/omap/omap3pandora.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/sound/soc/omap/omap3pandora.c b/sound/soc/omap/omap3pandora.c index 07794bd..1be26df 100644 --- a/sound/soc/omap/omap3pandora.c +++ b/sound/soc/omap/omap3pandora.c @@ -77,6 +77,27 @@ static int omap3pandora_hw_params(struct snd_pcm_substream *substream, return 0; } +static int omap3pandora_hw_free(struct snd_pcm_substream *substream) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_dai *cpu_dai = rtd->cpu_dai; + int ret; + + /* + * For some reason, if we don't set clock back to internal, OMAP power + * saving features don't work properly (per power domain doesn't enter + * lower power states). Switch it back until better solution is found. + */ + ret = snd_soc_dai_set_sysclk(cpu_dai, OMAP_MCBSP_SYSCLK_CLKS_FCLK, + 0, SND_SOC_CLOCK_IN); + if (ret < 0) { + pr_err(PREFIX "can't set cpu system clock\n"); + return ret; + } + + return 0; +} + static int omap3pandora_dac_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *k, int event) { @@ -201,6 +222,7 @@ static int omap3pandora_in_init(struct snd_soc_pcm_runtime *rtd) static struct snd_soc_ops omap3pandora_ops = { .hw_params = omap3pandora_hw_params, + .hw_free = omap3pandora_hw_free, }; /* Digital audio interface glue - connects codec <--> CPU */ -- 1.7.0.4

4 7

Re: [alsa-devel] [PATCH v3 0/3] MFD: twl6040: Conversion to i2c driver
by Liam Girdwood 22 Feb '12

22 Feb '12

On Tue, 2012-02-21 at 12:05 +0100, Samuel Ortiz wrote: > Hi Peter, > > On Tue, Feb 21, 2012 at 12:33:07PM +0200, Peter Ujfalusi wrote: > > > I'm not sure hwo we could handle that properly. Either by letting Tony > > > carrying this patchset, or by sending me the panda patch that adds those > > > structures. As you prefer. > > > > If Liam would take this series that would be probably the way forward. > > If he does not have objections. > > Liam: I can create a branch for you to pull from as soon as all other > > patch receives the needed acks... > > > > Samuel: if Liam agrees is it possible for you to drop the twl6040 > > related patches from your for-next branch? > That would make sense to me, yes. > Liam, if you're ok with taking it, please add my: > > Acked-by: Samuel Ortiz <sameo(a)linux.intel.com> > Ok, sounds fine by me. Tony is this fine wrt the OMAP board file updates ? Thanks Liam

3 2