* [GIT PULL] sound updates for 3.2-rc1
@ 2011-11-04 9:46 Takashi Iwai
0 siblings, 0 replies; 2+ messages in thread
From: Takashi Iwai @ 2011-11-04 9:46 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Mark Brown, Liam Girdwood, linux-kernel
Linus,
please pull sound updates for v3.2-rc1 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git for-linus
The topmost commit is 6bcbf64ace40d6833622d85701218a8bb7a4f207
All small commits and no big dangerous thing is found.
Thanks!
Takashi
===
Adrian Knoth (3):
ALSA: hdspm - Fix MADI channel format in the status ioctl
ALSA: hdsp - Correct HDSP_VERSION_BIT constant, thus partly fixing RPM detection
ALSA: hdspm - Enable all firmware ranges for PCI MADI/AES cards
Alexander Stein (1):
ALSA: hda_hwdep: Fix possible buffer overflow
Axel Lin (5):
ASoC: wm8940: Fix mask for setting BCLKDIV
ASoC: tlv320aic23: Clear TLV320AIC23_MS_MASTER bit for slave mode
ASoC: tlv320aic3x: Clear BIT_CLK_MASTER and WORD_CLK_MASTER bits for for slave mode
ASoC: wm8711: Fix wrong mask for setting input audio data bit length select
ASoC: Leave input audio data bit length settings untouched in wm8711_set_dai_fmt
Charles Chin (3):
ALSA: hda - Disable power-widget control for IDT 92HD83/93 as default
ALSA: hda - Add support for 92HD65 / 92HD66 family of codecs
ALSA: hda/sigmatel - Automatically retrieve digital I/O widgets
Dan Carpenter (1):
ALSA: hwdep: silence integer overflow warning
Hong Xu (1):
ASoC: WM8904: Set `invert' bit for Capture Switch
Konstantin Ozerkov (1):
ALSA: intel8x0: Improve performance in virtual environment
Mark Brown (4):
ASoC: Fix return value of wm5100_gpio_direction_out()
ASoC: Ensure WM8962 PLL registers are reset
ASoC: Ensure the WM8962 oscillator and PLLs start up disabled
ASoC: Ensure we always delay for WM8962 FLL when starting from SYSCLK
Takashi Iwai (5):
ALSA: intel8x0 - Fix inclusion of kvm_para.h
ALSA: hda - Check NO_PRESENCE pincfg default bit
ALSA: hda/realtek - Don't create alt-stream for capture when unnecessary
ALSA: hda - Remove unused variables
ALSA: hda/realtek - Skip invalid digital out pins
---
sound/core/hwdep.c | 9 +++++-
sound/pci/hda/hda_hwdep.c | 2 -
sound/pci/hda/hda_local.h | 4 ++
sound/pci/hda/patch_hdmi.c | 5 +--
sound/pci/hda/patch_realtek.c | 23 ++++++++------
sound/pci/hda/patch_sigmatel.c | 67 +++++++++++++++++++++++----------------
sound/pci/hda/patch_via.c | 5 ---
sound/pci/intel8x0.c | 29 ++++++++++++++++-
sound/pci/rme9652/hdsp.c | 2 +-
sound/pci/rme9652/hdspm.c | 42 +++++++++++--------------
sound/soc/codecs/tlv320aic23.c | 1 +
sound/soc/codecs/tlv320aic3x.c | 1 +
sound/soc/codecs/wm5100.c | 12 +++++--
sound/soc/codecs/wm8711.c | 4 +-
sound/soc/codecs/wm8904.c | 2 +-
sound/soc/codecs/wm8940.c | 2 +-
sound/soc/codecs/wm8962.c | 28 +++++++++++-----
17 files changed, 144 insertions(+), 94 deletions(-)
diff --git a/sound/core/hwdep.c b/sound/core/hwdep.c
index a70ee7f..031e215 100644
--- a/sound/core/hwdep.c
+++ b/sound/core/hwdep.c
@@ -272,7 +272,14 @@ static int snd_hwdep_control_ioctl(struct snd_card *card,
if (get_user(device, (int __user *)arg))
return -EFAULT;
mutex_lock(®ister_mutex);
- device = device < 0 ? 0 : device + 1;
+
+ if (device < 0)
+ device = 0;
+ else if (device < SNDRV_MINOR_HWDEPS)
+ device++;
+ else
+ device = SNDRV_MINOR_HWDEPS;
+
while (device < SNDRV_MINOR_HWDEPS) {
if (snd_hwdep_search(card, device))
break;
diff --git a/sound/pci/hda/hda_hwdep.c b/sound/pci/hda/hda_hwdep.c
index 72e5885..7e7d078 100644
--- a/sound/pci/hda/hda_hwdep.c
+++ b/sound/pci/hda/hda_hwdep.c
@@ -756,8 +756,6 @@ static int get_line_from_fw(char *buf, int size, struct firmware *fw)
}
if (!fw->size)
return 0;
- if (size < fw->size)
- size = fw->size;
for (len = 0; len < fw->size; len++) {
if (!*p)
diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h
index 81e12c0..79f49e2 100644
--- a/sound/pci/hda/hda_local.h
+++ b/sound/pci/hda/hda_local.h
@@ -442,6 +442,8 @@ struct auto_pin_cfg {
(cfg & AC_DEFCFG_SEQUENCE)
#define get_defcfg_device(cfg) \
((cfg & AC_DEFCFG_DEVICE) >> AC_DEFCFG_DEVICE_SHIFT)
+#define get_defcfg_misc(cfg) \
+ ((cfg & AC_DEFCFG_MISC) >> AC_DEFCFG_MISC_SHIFT)
/* bit-flags for snd_hda_parse_pin_def_config() behavior */
#define HDA_PINCFG_NO_HP_FIXUP (1 << 0) /* no HP-split */
@@ -509,6 +511,8 @@ int snd_hda_jack_detect(struct hda_codec *codec, hda_nid_t nid);
static inline bool is_jack_detectable(struct hda_codec *codec, hda_nid_t nid)
{
return (snd_hda_query_pin_caps(codec, nid) & AC_PINCAP_PRES_DETECT) &&
+ !(get_defcfg_misc(snd_hda_codec_get_pincfg(codec, nid) &
+ AC_DEFCFG_MISC_NO_PRESENCE)) &&
(get_wcaps(codec, nid) & AC_WCAP_UNSOL_CAP);
}
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index 3425401..aac3bfa 100644
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -1006,7 +1006,6 @@ static int hdmi_add_pin(struct hda_codec *codec, hda_nid_t pin_nid)
unsigned int caps, config;
int pin_idx;
struct hdmi_spec_per_pin *per_pin;
- struct hdmi_eld *eld;
int err;
caps = snd_hda_param_read(codec, pin_nid, AC_PAR_PIN_CAP);
@@ -1023,7 +1022,6 @@ static int hdmi_add_pin(struct hda_codec *codec, hda_nid_t pin_nid)
pin_idx = spec->num_pins;
per_pin = &spec->pins[pin_idx];
- eld = &per_pin->sink_eld;
per_pin->pin_nid = pin_nid;
@@ -1576,7 +1574,7 @@ static int nvhdmi_8ch_7x_pcm_prepare(struct hda_pcm_stream *hinfo,
struct snd_pcm_substream *substream)
{
int chs;
- unsigned int dataDCC1, dataDCC2, channel_id;
+ unsigned int dataDCC2, channel_id;
int i;
struct hdmi_spec *spec = codec->spec;
struct hda_spdif_out *spdif =
@@ -1586,7 +1584,6 @@ static int nvhdmi_8ch_7x_pcm_prepare(struct hda_pcm_stream *hinfo,
chs = substream->runtime->channels;
- dataDCC1 = AC_DIG1_ENABLE | AC_DIG1_COPYRIGHT;
dataDCC2 = 0x2;
/* turn off SPDIF once; otherwise the IEC958 bits won't be updated */
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 8f93b97..80d6add 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -1604,27 +1604,29 @@ static void alc_auto_init_digital(struct hda_codec *codec)
static void alc_auto_parse_digital(struct hda_codec *codec)
{
struct alc_spec *spec = codec->spec;
- int i, err;
+ int i, err, nums;
hda_nid_t dig_nid;
/* support multiple SPDIFs; the secondary is set up as a slave */
+ nums = 0;
for (i = 0; i < spec->autocfg.dig_outs; i++) {
hda_nid_t conn[4];
err = snd_hda_get_connections(codec,
spec->autocfg.dig_out_pins[i],
conn, ARRAY_SIZE(conn));
- if (err < 0)
+ if (err <= 0)
continue;
dig_nid = conn[0]; /* assume the first element is audio-out */
- if (!i) {
+ if (!nums) {
spec->multiout.dig_out_nid = dig_nid;
spec->dig_out_type = spec->autocfg.dig_out_type[0];
} else {
spec->multiout.slave_dig_outs = spec->slave_dig_outs;
- if (i >= ARRAY_SIZE(spec->slave_dig_outs) - 1)
+ if (nums >= ARRAY_SIZE(spec->slave_dig_outs) - 1)
break;
- spec->slave_dig_outs[i - 1] = dig_nid;
+ spec->slave_dig_outs[nums - 1] = dig_nid;
}
+ nums++;
}
if (spec->autocfg.dig_in_pin) {
@@ -2270,6 +2272,7 @@ static int alc_build_pcms(struct hda_codec *codec)
struct alc_spec *spec = codec->spec;
struct hda_pcm *info = spec->pcm_rec;
const struct hda_pcm_stream *p;
+ bool have_multi_adcs;
int i;
codec->num_pcms = 1;
@@ -2348,8 +2351,11 @@ static int alc_build_pcms(struct hda_codec *codec)
/* If the use of more than one ADC is requested for the current
* model, configure a second analog capture-only PCM.
*/
+ have_multi_adcs = (spec->num_adc_nids > 1) &&
+ !spec->dyn_adc_switch && !spec->auto_mic &&
+ (!spec->input_mux || spec->input_mux->num_items > 1);
/* Additional Analaog capture for index #2 */
- if (spec->alt_dac_nid || spec->num_adc_nids > 1) {
+ if (spec->alt_dac_nid || have_multi_adcs) {
codec->num_pcms = 3;
info = spec->pcm_rec + 2;
info->name = spec->stream_name_analog;
@@ -2365,7 +2371,7 @@ static int alc_build_pcms(struct hda_codec *codec)
alc_pcm_null_stream;
info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = 0;
}
- if (spec->num_adc_nids > 1) {
+ if (have_multi_adcs) {
p = spec->stream_analog_alt_capture;
if (!p)
p = &alc_pcm_analog_alt_capture;
@@ -2657,7 +2663,6 @@ static int alc_auto_fill_adc_caps(struct hda_codec *codec)
hda_nid_t *adc_nids = spec->private_adc_nids;
hda_nid_t *cap_nids = spec->private_capsrc_nids;
int max_nums = ARRAY_SIZE(spec->private_adc_nids);
- bool indep_capsrc = false;
int i, nums = 0;
nid = codec->start_nid;
@@ -2679,13 +2684,11 @@ static int alc_auto_fill_adc_caps(struct hda_codec *codec)
break;
if (type == AC_WID_AUD_SEL) {
cap_nids[nums] = src;
- indep_capsrc = true;
break;
}
n = snd_hda_get_conn_list(codec, src, &list);
if (n > 1) {
cap_nids[nums] = src;
- indep_capsrc = true;
break;
} else if (n != 1)
break;
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 59a52a4..de4c360 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -3791,9 +3791,10 @@ static int is_dual_headphones(struct hda_codec *codec)
}
-static int stac92xx_parse_auto_config(struct hda_codec *codec, hda_nid_t dig_out, hda_nid_t dig_in)
+static int stac92xx_parse_auto_config(struct hda_codec *codec)
{
struct sigmatel_spec *spec = codec->spec;
+ hda_nid_t dig_out = 0, dig_in = 0;
int hp_swap = 0;
int i, err;
@@ -3976,6 +3977,22 @@ static int stac92xx_parse_auto_config(struct hda_codec *codec, hda_nid_t dig_out
if (spec->multiout.max_channels > 2)
spec->surr_switch = 1;
+ /* find digital out and in converters */
+ for (i = codec->start_nid; i < codec->start_nid + codec->num_nodes; i++) {
+ unsigned int wid_caps = get_wcaps(codec, i);
+ if (wid_caps & AC_WCAP_DIGITAL) {
+ switch (get_wcaps_type(wid_caps)) {
+ case AC_WID_AUD_OUT:
+ if (!dig_out)
+ dig_out = i;
+ break;
+ case AC_WID_AUD_IN:
+ if (!dig_in)
+ dig_in = i;
+ break;
+ }
+ }
+ }
if (spec->autocfg.dig_outs)
spec->multiout.dig_out_nid = dig_out;
if (dig_in && spec->autocfg.dig_in_pin)
@@ -5279,7 +5296,7 @@ static int patch_stac925x(struct hda_codec *codec)
spec->capvols = stac925x_capvols;
spec->capsws = stac925x_capsws;
- err = stac92xx_parse_auto_config(codec, 0x8, 0x7);
+ err = stac92xx_parse_auto_config(codec);
if (!err) {
if (spec->board_config < 0) {
printk(KERN_WARNING "hda_codec: No auto-config is "
@@ -5420,7 +5437,7 @@ again:
spec->num_pwrs = ARRAY_SIZE(stac92hd73xx_pwr_nids);
spec->pwr_nids = stac92hd73xx_pwr_nids;
- err = stac92xx_parse_auto_config(codec, 0x25, 0x27);
+ err = stac92xx_parse_auto_config(codec);
if (!err) {
if (spec->board_config < 0) {
@@ -5629,26 +5646,8 @@ again:
stac92xx_set_config_regs(codec,
stac92hd83xxx_brd_tbl[spec->board_config]);
- switch (codec->vendor_id) {
- case 0x111d76d1:
- case 0x111d76d9:
- case 0x111d76df:
- case 0x111d76e5:
- case 0x111d7666:
- case 0x111d7667:
- case 0x111d7668:
- case 0x111d7669:
- case 0x111d76e3:
- case 0x111d7604:
- case 0x111d76d4:
- case 0x111d7605:
- case 0x111d76d5:
- case 0x111d76e7:
- if (spec->board_config == STAC_92HD83XXX_PWR_REF)
- break;
+ if (spec->board_config != STAC_92HD83XXX_PWR_REF)
spec->num_pwrs = 0;
- break;
- }
codec->patch_ops = stac92xx_patch_ops;
@@ -5675,7 +5674,7 @@ again:
}
#endif
- err = stac92xx_parse_auto_config(codec, 0x1d, 0);
+ err = stac92xx_parse_auto_config(codec);
if (!err) {
if (spec->board_config < 0) {
printk(KERN_WARNING "hda_codec: No auto-config is "
@@ -5996,7 +5995,7 @@ again:
spec->multiout.dac_nids = spec->dac_nids;
- err = stac92xx_parse_auto_config(codec, 0x21, 0);
+ err = stac92xx_parse_auto_config(codec);
if (!err) {
if (spec->board_config < 0) {
printk(KERN_WARNING "hda_codec: No auto-config is "
@@ -6105,7 +6104,7 @@ static int patch_stac922x(struct hda_codec *codec)
spec->multiout.dac_nids = spec->dac_nids;
- err = stac92xx_parse_auto_config(codec, 0x08, 0x09);
+ err = stac92xx_parse_auto_config(codec);
if (!err) {
if (spec->board_config < 0) {
printk(KERN_WARNING "hda_codec: No auto-config is "
@@ -6230,7 +6229,7 @@ static int patch_stac927x(struct hda_codec *codec)
spec->aloopback_shift = 0;
spec->eapd_switch = 1;
- err = stac92xx_parse_auto_config(codec, 0x1e, 0x20);
+ err = stac92xx_parse_auto_config(codec);
if (!err) {
if (spec->board_config < 0) {
printk(KERN_WARNING "hda_codec: No auto-config is "
@@ -6355,7 +6354,7 @@ static int patch_stac9205(struct hda_codec *codec)
break;
}
- err = stac92xx_parse_auto_config(codec, 0x1f, 0x20);
+ err = stac92xx_parse_auto_config(codec);
if (!err) {
if (spec->board_config < 0) {
printk(KERN_WARNING "hda_codec: No auto-config is "
@@ -6460,7 +6459,7 @@ static int patch_stac9872(struct hda_codec *codec)
spec->capvols = stac9872_capvols;
spec->capsws = stac9872_capsws;
- err = stac92xx_parse_auto_config(codec, 0x10, 0x12);
+ err = stac92xx_parse_auto_config(codec);
if (err < 0) {
stac92xx_free(codec);
return -EINVAL;
@@ -6565,6 +6564,18 @@ static const struct hda_codec_preset snd_hda_preset_sigmatel[] = {
{ .id = 0x111d76e3, .name = "92HD98BXX", .patch = patch_stac92hd83xxx},
{ .id = 0x111d76e5, .name = "92HD99BXX", .patch = patch_stac92hd83xxx},
{ .id = 0x111d76e7, .name = "92HD90BXX", .patch = patch_stac92hd83xxx},
+ { .id = 0x111d76e8, .name = "92HD66B1X5", .patch = patch_stac92hd83xxx},
+ { .id = 0x111d76e9, .name = "92HD66B2X5", .patch = patch_stac92hd83xxx},
+ { .id = 0x111d76ea, .name = "92HD66B3X5", .patch = patch_stac92hd83xxx},
+ { .id = 0x111d76eb, .name = "92HD66C1X5", .patch = patch_stac92hd83xxx},
+ { .id = 0x111d76ec, .name = "92HD66C2X5", .patch = patch_stac92hd83xxx},
+ { .id = 0x111d76ed, .name = "92HD66C3X5", .patch = patch_stac92hd83xxx},
+ { .id = 0x111d76ee, .name = "92HD66B1X3", .patch = patch_stac92hd83xxx},
+ { .id = 0x111d76ef, .name = "92HD66B2X3", .patch = patch_stac92hd83xxx},
+ { .id = 0x111d76f0, .name = "92HD66B3X3", .patch = patch_stac92hd83xxx},
+ { .id = 0x111d76f1, .name = "92HD66C1X3", .patch = patch_stac92hd83xxx},
+ { .id = 0x111d76f2, .name = "92HD66C2X3", .patch = patch_stac92hd83xxx},
+ { .id = 0x111d76f3, .name = "92HD66C3/65", .patch = patch_stac92hd83xxx},
{} /* terminator */
};
diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c
index 417d62a..0b020a9 100644
--- a/sound/pci/hda/patch_via.c
+++ b/sound/pci/hda/patch_via.c
@@ -3700,13 +3700,8 @@ static const struct hda_verb vt1812_init_verbs[] = {
static void set_widgets_power_state_vt1812(struct hda_codec *codec)
{
struct via_spec *spec = codec->spec;
- int imux_is_smixer =
- snd_hda_codec_read(codec, 0x13, 0, AC_VERB_GET_CONNECT_SEL, 0x00) == 3;
unsigned int parm;
unsigned int present;
- /* MUX10 (1eh) = stereo mixer */
- imux_is_smixer =
- snd_hda_codec_read(codec, 0x1e, 0, AC_VERB_GET_CONNECT_SEL, 0x00) == 5;
/* inputs */
/* PW 5/6/7 (29h/2ah/2bh) */
parm = AC_PWRST_D3;
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index 6a5b387..45b2055 100644
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -42,6 +42,12 @@
#include <asm/pgtable.h>
#include <asm/cacheflush.h>
+#ifdef CONFIG_KVM_GUEST
+#include <linux/kvm_para.h>
+#else
+#define kvm_para_available() (0)
+#endif
+
MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
MODULE_DESCRIPTION("Intel 82801AA,82901AB,i810,i820,i830,i840,i845,MX440; SiS 7012; Ali 5455");
MODULE_LICENSE("GPL");
@@ -77,6 +83,7 @@ static int buggy_semaphore;
static int buggy_irq = -1; /* auto-check */
static int xbox;
static int spdif_aclink = -1;
+static int inside_vm = -1;
module_param(index, int, 0444);
MODULE_PARM_DESC(index, "Index value for Intel i8x0 soundcard.");
@@ -94,6 +101,8 @@ module_param(xbox, bool, 0444);
MODULE_PARM_DESC(xbox, "Set to 1 for Xbox, if you have problems with the AC'97 codec detection.");
module_param(spdif_aclink, int, 0444);
MODULE_PARM_DESC(spdif_aclink, "S/PDIF over AC-link.");
+module_param(inside_vm, bool, 0444);
+MODULE_PARM_DESC(inside_vm, "KVM/Parallels optimization.");
/* just for backward compatibility */
static int enable;
@@ -400,6 +409,7 @@ struct intel8x0 {
unsigned buggy_irq: 1; /* workaround for buggy mobos */
unsigned xbox: 1; /* workaround for Xbox AC'97 detection */
unsigned buggy_semaphore: 1; /* workaround for buggy codec semaphore */
+ unsigned inside_vm: 1; /* enable VM optimization */
int spdif_idx; /* SPDIF BAR index; *_SPBAR or -1 if use PCMOUT */
unsigned int sdm_saved; /* SDM reg value */
@@ -1065,8 +1075,11 @@ static snd_pcm_uframes_t snd_intel8x0_pcm_pointer(struct snd_pcm_substream *subs
udelay(10);
continue;
}
- if (civ == igetbyte(chip, ichdev->reg_offset + ICH_REG_OFF_CIV) &&
- ptr1 == igetword(chip, ichdev->reg_offset + ichdev->roff_picb))
+ if (civ != igetbyte(chip, ichdev->reg_offset + ICH_REG_OFF_CIV))
+ continue;
+ if (chip->inside_vm)
+ break;
+ if (ptr1 == igetword(chip, ichdev->reg_offset + ichdev->roff_picb))
break;
} while (timeout--);
ptr = ichdev->last_pos;
@@ -2984,6 +2997,10 @@ static int __devinit snd_intel8x0_create(struct snd_card *card,
if (xbox)
chip->xbox = 1;
+ chip->inside_vm = inside_vm;
+ if (inside_vm)
+ printk(KERN_INFO "intel8x0: enable KVM optimization\n");
+
if (pci->vendor == PCI_VENDOR_ID_INTEL &&
pci->device == PCI_DEVICE_ID_INTEL_440MX)
chip->fix_nocache = 1; /* enable workaround */
@@ -3226,6 +3243,14 @@ static int __devinit snd_intel8x0_probe(struct pci_dev *pci,
buggy_irq = 0;
}
+ if (inside_vm < 0) {
+ /* detect KVM and Parallels virtual environments */
+ inside_vm = kvm_para_available();
+#if defined(__i386__) || defined(__x86_64__)
+ inside_vm = inside_vm || boot_cpu_has(X86_FEATURE_HYPERVISOR);
+#endif
+ }
+
if ((err = snd_intel8x0_create(card, pci, pci_id->driver_data,
&chip)) < 0) {
snd_card_free(card);
diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c
index 1c6d1e1..f742202 100644
--- a/sound/pci/rme9652/hdsp.c
+++ b/sound/pci/rme9652/hdsp.c
@@ -151,7 +151,7 @@ MODULE_FIRMWARE("digiface_firmware_rev11.bin");
#define HDSP_PROGRAM 0x020
#define HDSP_CONFIG_MODE_0 0x040
#define HDSP_CONFIG_MODE_1 0x080
-#define HDSP_VERSION_BIT 0x100
+#define HDSP_VERSION_BIT (0x100 | HDSP_S_LOAD)
#define HDSP_BIGENDIAN_MODE 0x200
#define HDSP_RD_MULTIPLE 0x400
#define HDSP_9652_ENABLE_MIXER 0x800
diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c
index 6e2f7ef..15a6c3b 100644
--- a/sound/pci/rme9652/hdspm.c
+++ b/sound/pci/rme9652/hdspm.c
@@ -520,16 +520,9 @@ MODULE_SUPPORTED_DEVICE("{{RME HDSPM-MADI}}");
#define HDSPM_DMA_AREA_BYTES (HDSPM_MAX_CHANNELS * HDSPM_CHANNEL_BUFFER_BYTES)
#define HDSPM_DMA_AREA_KILOBYTES (HDSPM_DMA_AREA_BYTES/1024)
-/* revisions >= 230 indicate AES32 card */
-#define HDSPM_MADI_ANCIENT_REV 204
-#define HDSPM_MADI_OLD_REV 207
-#define HDSPM_MADI_REV 210
#define HDSPM_RAYDAT_REV 211
#define HDSPM_AIO_REV 212
#define HDSPM_MADIFACE_REV 213
-#define HDSPM_AES_REV 240
-#define HDSPM_AES32_REV 234
-#define HDSPM_AES32_OLD_REV 233
/* speed factor modes */
#define HDSPM_SPEED_SINGLE 0
@@ -6253,7 +6246,7 @@ static int snd_hdspm_hwdep_ioctl(struct snd_hwdep *hw, struct file *file,
status.card_specific.madi.madi_input =
(statusregister & HDSPM_AB_int) ? 1 : 0;
status.card_specific.madi.channel_format =
- (statusregister & HDSPM_TX_64ch) ? 1 : 0;
+ (statusregister & HDSPM_RX_64ch) ? 1 : 0;
/* TODO: Mac driver sets it when f_s>48kHz */
status.card_specific.madi.frame_format = 0;
@@ -6503,13 +6496,6 @@ static int __devinit snd_hdspm_create(struct snd_card *card,
strcpy(card->driver, "HDSPM");
switch (hdspm->firmware_rev) {
- case HDSPM_MADI_REV:
- case HDSPM_MADI_OLD_REV:
- case HDSPM_MADI_ANCIENT_REV:
- hdspm->io_type = MADI;
- hdspm->card_name = "RME MADI";
- hdspm->midiPorts = 3;
- break;
case HDSPM_RAYDAT_REV:
hdspm->io_type = RayDAT;
hdspm->card_name = "RME RayDAT";
@@ -6525,17 +6511,25 @@ static int __devinit snd_hdspm_create(struct snd_card *card,
hdspm->card_name = "RME MADIface";
hdspm->midiPorts = 1;
break;
- case HDSPM_AES_REV:
- case HDSPM_AES32_REV:
- case HDSPM_AES32_OLD_REV:
- hdspm->io_type = AES32;
- hdspm->card_name = "RME AES32";
- hdspm->midiPorts = 2;
- break;
default:
- snd_printk(KERN_ERR "HDSPM: unknown firmware revision %x\n",
+ if ((hdspm->firmware_rev == 0xf0) ||
+ ((hdspm->firmware_rev >= 0xe6) &&
+ (hdspm->firmware_rev <= 0xea))) {
+ hdspm->io_type = AES32;
+ hdspm->card_name = "RME AES32";
+ hdspm->midiPorts = 2;
+ } else if ((hdspm->firmware_rev == 0xd5) ||
+ ((hdspm->firmware_rev >= 0xc8) &&
+ (hdspm->firmware_rev <= 0xcf))) {
+ hdspm->io_type = MADI;
+ hdspm->card_name = "RME MADI";
+ hdspm->midiPorts = 3;
+ } else {
+ snd_printk(KERN_ERR
+ "HDSPM: unknown firmware revision %x\n",
hdspm->firmware_rev);
- return -ENODEV;
+ return -ENODEV;
+ }
}
err = pci_enable_device(pci);
diff --git a/sound/soc/codecs/tlv320aic23.c b/sound/soc/codecs/tlv320aic23.c
index ab27dbc..336de8f 100644
--- a/sound/soc/codecs/tlv320aic23.c
+++ b/sound/soc/codecs/tlv320aic23.c
@@ -430,6 +430,7 @@ static int tlv320aic23_set_dai_fmt(struct snd_soc_dai *codec_dai,
iface_reg |= TLV320AIC23_MS_MASTER;
break;
case SND_SOC_DAIFMT_CBS_CFS:
+ iface_reg &= ~TLV320AIC23_MS_MASTER;
break;
default:
return -EINVAL;
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index 7a49390..87d5ef1 100644
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -1023,6 +1023,7 @@ static int aic3x_set_dai_fmt(struct snd_soc_dai *codec_dai,
break;
case SND_SOC_DAIFMT_CBS_CFS:
aic3x->master = 0;
+ iface_areg &= ~(BIT_CLK_MASTER | WORD_CLK_MASTER);
break;
default:
return -EINVAL;
diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c
index 5d88c99..42d9039 100644
--- a/sound/soc/codecs/wm5100.c
+++ b/sound/soc/codecs/wm5100.c
@@ -2361,13 +2361,17 @@ static int wm5100_gpio_direction_out(struct gpio_chip *chip,
{
struct wm5100_priv *wm5100 = gpio_to_wm5100(chip);
struct snd_soc_codec *codec = wm5100->codec;
- int val;
+ int val, ret;
val = (1 << WM5100_GP1_FN_SHIFT) | (!!value << WM5100_GP1_LVL_SHIFT);
- return snd_soc_update_bits(codec, WM5100_GPIO_CTRL_1 + offset,
- WM5100_GP1_FN_MASK | WM5100_GP1_DIR |
- WM5100_GP1_LVL, val);
+ ret = snd_soc_update_bits(codec, WM5100_GPIO_CTRL_1 + offset,
+ WM5100_GP1_FN_MASK | WM5100_GP1_DIR |
+ WM5100_GP1_LVL, val);
+ if (ret < 0)
+ return ret;
+ else
+ return 0;
}
static int wm5100_gpio_get(struct gpio_chip *chip, unsigned offset)
diff --git a/sound/soc/codecs/wm8711.c b/sound/soc/codecs/wm8711.c
index 8d0347c..076bdb9 100644
--- a/sound/soc/codecs/wm8711.c
+++ b/sound/soc/codecs/wm8711.c
@@ -151,7 +151,7 @@ static int wm8711_hw_params(struct snd_pcm_substream *substream,
{
struct snd_soc_codec *codec = dai->codec;
struct wm8711_priv *wm8711 = snd_soc_codec_get_drvdata(codec);
- u16 iface = snd_soc_read(codec, WM8711_IFACE) & 0xfffc;
+ u16 iface = snd_soc_read(codec, WM8711_IFACE) & 0xfff3;
int i = get_coeff(wm8711->sysclk, params_rate(params));
u16 srate = (coeff_div[i].sr << 2) |
(coeff_div[i].bosr << 1) | coeff_div[i].usb;
@@ -232,7 +232,7 @@ static int wm8711_set_dai_fmt(struct snd_soc_dai *codec_dai,
unsigned int fmt)
{
struct snd_soc_codec *codec = codec_dai->codec;
- u16 iface = 0;
+ u16 iface = snd_soc_read(codec, WM8711_IFACE) & 0x000c;
/* set master/slave audio interface */
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c
index 9fc8f4c..285ef87 100644
--- a/sound/soc/codecs/wm8904.c
+++ b/sound/soc/codecs/wm8904.c
@@ -867,7 +867,7 @@ SOC_ENUM("Right Capture Mode", rin_mode),
SOC_DOUBLE_R("Capture Volume", WM8904_ANALOGUE_LEFT_INPUT_0,
WM8904_ANALOGUE_RIGHT_INPUT_0, 0, 31, 0),
SOC_DOUBLE_R("Capture Switch", WM8904_ANALOGUE_LEFT_INPUT_0,
- WM8904_ANALOGUE_RIGHT_INPUT_0, 7, 1, 0),
+ WM8904_ANALOGUE_RIGHT_INPUT_0, 7, 1, 1),
SOC_SINGLE("High Pass Filter Switch", WM8904_ADC_DIGITAL_0, 4, 1, 0),
SOC_ENUM("High Pass Filter Mode", hpf_mode),
diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c
index dc5cb31..de9ec9b 100644
--- a/sound/soc/codecs/wm8940.c
+++ b/sound/soc/codecs/wm8940.c
@@ -621,7 +621,7 @@ static int wm8940_set_dai_clkdiv(struct snd_soc_dai *codec_dai,
switch (div_id) {
case WM8940_BCLKDIV:
- reg = snd_soc_read(codec, WM8940_CLOCK) & 0xFFEF3;
+ reg = snd_soc_read(codec, WM8940_CLOCK) & 0xFFE3;
ret = snd_soc_write(codec, WM8940_CLOCK, reg | (div << 2));
break;
case WM8940_MCLKDIV:
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index f60dfa1..91d3c6d 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -1961,7 +1961,13 @@ static int wm8962_readable_register(struct snd_soc_codec *codec, unsigned int re
static int wm8962_reset(struct snd_soc_codec *codec)
{
- return snd_soc_write(codec, WM8962_SOFTWARE_RESET, 0x6243);
+ int ret;
+
+ ret = snd_soc_write(codec, WM8962_SOFTWARE_RESET, 0x6243);
+ if (ret != 0)
+ return ret;
+
+ return snd_soc_write(codec, WM8962_PLL_SOFTWARE_RESET, 0);
}
static const DECLARE_TLV_DB_SCALE(inpga_tlv, -2325, 75, 0);
@@ -2360,15 +2366,14 @@ static int sysclk_event(struct snd_soc_dapm_widget *w,
snd_soc_update_bits(codec, WM8962_FLL_CONTROL_1,
WM8962_FLL_ENA, WM8962_FLL_ENA);
- if (wm8962->irq) {
- timeout = msecs_to_jiffies(5);
- timeout = wait_for_completion_timeout(&wm8962->fll_lock,
- timeout);
- if (timeout == 0)
- dev_err(codec->dev,
- "Timed out starting FLL\n");
- }
+ timeout = msecs_to_jiffies(5);
+ timeout = wait_for_completion_timeout(&wm8962->fll_lock,
+ timeout);
+
+ if (wm8962->irq && timeout == 0)
+ dev_err(codec->dev,
+ "Timed out starting FLL\n");
}
break;
@@ -4029,6 +4034,11 @@ static int wm8962_probe(struct snd_soc_codec *codec)
snd_soc_update_bits(codec, WM8962_CLOCKING2,
WM8962_CLKREG_OVD, WM8962_CLKREG_OVD);
+ /* Ensure that the oscillator and PLLs are disabled */
+ snd_soc_update_bits(codec, WM8962_PLL2,
+ WM8962_OSC_ENA | WM8962_PLL2_ENA | WM8962_PLL3_ENA,
+ 0);
+
regulator_bulk_disable(ARRAY_SIZE(wm8962->supplies), wm8962->supplies);
if (pdata) {
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [GIT PULL] sound updates for 3.2-rc1
@ 2011-10-28 21:04 Takashi Iwai
0 siblings, 0 replies; 2+ messages in thread
From: Takashi Iwai @ 2011-10-28 21:04 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Mark Brown, Liam Girdwood, linux-kernel
Linus,
please pull sound updates for v3.2-rc1 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git for-linus
The topmost commit is 8128c9f21509f9a8b6da94ac432d845dda458406.
One of the scattered changes over the tree are one-liner IRQF_DISALBED
removals. Other than that, the changes are mostly concentrated on
the usual stuff, HD-audio and ASoC. Pretty many commits for ASoC at
this time.
In the sound core side, the ENUM-type user-space control was newly
supported. It's needed for the better firewire sound driver support
in user-space.
In HD-audio, we improved the auto-parser for Realtek codecs, and
reduced lots of static configurations. The size halved, finally.
Also there are a few regression fixes in Conexant and other codecs.
Some highlights for ASoC changes are;
- Substantial optimization of the DAPM algorithm, substantially reducing
the CPU usage when power states change. This is especially beneficial
with larger modern devices.
- Support for CODEC drivers using the regmap API.
- Some smaller API updates - support for larger register maps, support
for specifying a source when setting a sysclk.
- New CPU for Alchemy and Freescale MXS.
- New CODEC drivers for Analog ADAU1373, Realtek RT5631 and Wolfson
Microelectronics WM1811 and WM5100.
Other than that, small fixes and imporvements here and there, e.g.
- More flexible buffer management in hdspm driver
- Support for non-SRC mode in some old drivers
- USB-audio driver refacotring, and the addition of a few new quirks
Thanks!
Takashi
===
Adrian Knoth (5):
ALSA: hdspm - Allow for 8192 period size on RME MADI and AES cards
ALSA: hdspm - Set period_bytes_min to 32 * 4 for new RME cards
ALSA: hdspm - Reorder period sizes according to their bit representation
ALSA: hdspm - Introduce hdspm_get_latency() to harmonize latency calculation
ALSA: hdspm - Enable 32 samples/period on RME RayDAT/AIO
Alexander Stein (1):
ALSA: hda - Fix typo
Andy Shevchenko (1):
ALSA: 6fire: don't use custom hex_to_bin()
Arnd Bergmann (3):
ASoC: imx: eukrea_tlv320 needs i2c
ASoC: sh: use correct __iomem annotations
ASoC: samsung: WM8994 depends on MFD_WM8994
Ashish Chavan (8):
ASoC: da7210: Add support for other DAI word lengths, format and mode
ASoC: da7210: bugfix for head phone volume control
ASoC: da7210: Add support for ADC & DAC equalizers
ASoC: da7210: Add support for High pass and Voice filters for ADC and DAC
ASoC: da7210: Add support for mute and zero cross controls
ASoC: da7210: Add support for ALC and Noise suppression
ASoC: da7210: Add support for DAPM
ASoC: da7210: Add support for line out and DAC
Axel Lin (145):
ASoC: soc-io: Add CONFIG_REGMAP_I2C/CONFIG_REGMAP_SPI guards for regmap_init_i2c/regmap_init_spi
ASoC: sgtl5000: fix module device table type for sgtl5000_dt_ids
ASoC: s6000-pcm: remove unused variable 'dai'
ASoC: soc-cache: Remove unneeded codec_drv pointer variable in snd_soc_flat_cache_init
ASoC: soc-cache: Remove unneeded codec_drv pointer variable in snd_soc_lzo_get_blksize
ASoC: soc-pcm: Remove unused global mutex
ASoC: nuc900-pcm: remove unused variable 'dai'
ASoC: sta32x: shortcut the for loop to get ir and mcs
ASoC: Remove unreachable code in au1xac97c_drvprobe and au1xi2s_drvprobe
ASoC: sta32x: Move resource allocation and release to the corresponding callback functions
ASoC: sn95031: Fix the logic to find free channel
ASoC: Add missing platform_device_put in raumfeld_audio_init error path
ASoC: alc5623: Remove unused mutex
ASoC: ad1980: Return proper error if vendor id mismatch
ASoC: playpaq_wm8510: Return proper error if clk_get fails
ALSA: aoa: Remove obsolete cleanup for clientdata
ALSA: keywest: Remove obsolete cleanup for clientdata
ASoC: samsung: Fix checking return value of clk_get
ASoC: tpa6130a2: Remove obsolete cleanup for clientdata
ASoC: wm8995: Return -EINVAL if device ID mismatch
ASoC: wm8995: Remove unused i2c variable in wm8995_remove()
ASoC: sn95031: Staticize sn95031_pcm_hw_params
ASoC: fsl: Fix error handling if platform_device_add fails
ASoC: Staticise bf5xx_pcm_ac97_new()
ASoC: Staticise bf5xx_pcm_i2s_new()
ASoC: Staticise jz4740_pcm_new()
ASoC: Staticise nuc900_dma_getposition()
ASoC: Add Kconfig and Makefile entries for rt5631 codec
ASoC: Staticize rt5631_dai
ASoC: Staticize sn95031_dais
ASoC: Remove unneeded mutex_init in wl1273_probe()
ASoC: Add missed free_irq in wm5100_remove and wm5100_probe error path
ASoC: Drop exporting sn95031_get_mic_bias
ASoC: Drop exporting ad1980_dai
ASoC: Remove unused fields in struct mfld_mc_private
ASoC: Staticise sst_platform_dai
ASoC: Remove unused "control_data" field of struct wm8940_priv
ASoC: Remove unused "control_data" field of struct wm8960_priv
ASoC: Remove unused "control_data" field of struct wm8978_priv
ASoC: Remove unused "control_data" field of struct wm9081_priv
ASoC: Remove unused "control_data" field of struct wm9090_priv
ASoC: Remove unused "control_data" field of struct wm8904_priv
ASoC: Fix setting adau1373_dai->master for SND_SOC_DAIFMT_CBS_CFS
ASoC: adau1701: Initialize codec->control_data before using it
ASoC: Remove unused "control_data" field of struct alc5623_priv
ASoC: Remove unused "control_data" field of struct cs4270_private
ASoC: Remove unused "control_data" field of struct cs42l51_private
ASoC: Remove unused "control_data" field of struct max98088_priv
ASoC: Remove unused "control_data" field of struct max98095_priv
ASoC: Remove unused "control_data" field of struct ak4671_priv
ASoC: adau1701: Fix prototype for adau1701_set_sysclk
ASoC: tlv320dac33: Add guarding parentheses to macros
ASoC: Remove unused "control_data" field of struct cs4271_private
ASoC: Remove unused "control_data" field of struct aic3x_priv
ASoC: Add missed regulator_unregister_notifier and regulator_bulk_free in wm8995_remove
ASoC: sn95031: Do not use static variable for channel_index
ASoC: tlv320aic3x: Use driver_data field of struct i2c_device_id to identify models
ASoC: wm8782: Add __devexit_p at necessary place
ASoC: kirkwood-i2s: Add __devexit_p at necessary place
ASoC: samsung: Add __devexit_p at necessary places
ASoC: tegra: Staticise tegra_i2s_dai and tegra_spdif_dai
ASoC: Staticise samsung_spdif_dai
ASoC: Staticise sh4_ssi_dai
ASoC: Remove unused rate variable in magician_playback_hw_params
ASoC: Remove unused srate variable in tegra_spdif_hw_params
ASoC: Remove needless codec->dapm.bias_level assignment to SND_SOC_BIAS_OFF
ASoC: Staticise simtec_audio_resume()
ASoC: Staticise ep93xx_ac97_dai
ASoC: txx9: Add __exit_p at necessary place
ASoC: Fix setting update bits for WM8741_DACRMSB_ATTENUATION
ASoC: samsung: s3c-i2s-v2.c needs module.h
ASoC: wm8711: Use snd_soc_update_bits for read-modify-write
ASoC: wm8971: Use snd_soc_update_bits for read-modify-write
ASoC: wm8988: Use snd_soc_update_bits for read-modify-write
ASoC: wm8994: Slightly optimize configure_clock
ASoC: wm8995: Slightly optimize configure_clock
ASoC: wm8994: Fix setting rate_reg for wm8994-aif2
ASoC: Avoid writing to WM8971_RESET in wm8971_resume
ASoC: wm8750: Use snd_soc_update_bits for read-modify-write
ASoC: wm8988: Use snd_soc_update_bits for read-modify-write
ASoC: wm8711: Use snd_soc_update_bits for read-modify-write
ASoC: Remove unneeded hw_write initialisation in ak4671
ASoC: Remove unneeded hw_write initialisation in wm8523
ASoC: Remove unused function declaration in imx-ssi.h
ASoC: imx: Remove unused variable 'dai'
ASoC: Remove unused variable 'wm9090' in wm9090_probe
ASoC: wm8990: Convert to snd_soc_cache_sync for sync reg_cache with the hardware
ASoC: wm8990: Remove incorrect comments
ASoC: Return early with -EINVAL if invalid dai format is detected
ASoC: wm8510: Convert to snd_soc_cache_sync
ASoC: wm8711: Convert to snd_soc_cache_sync
ASoC: wm8731: Convert to snd_soc_cache_sync
ASoC: wm8750: Convert to snd_soc_cache_sync
ASoC: wm8776: Convert to snd_soc_cache_sync
ASoC: wm8940: Convert to snd_soc_cache_sync
ASoC: wm8960: Convert to snd_soc_cache_sync
ASoC: wm8971: Convert to snd_soc_cache_sync
ASoC: wm8974: Convert to snd_soc_cache_sync
ASoC: wm8988: Convert to snd_soc_cache_sync
ASoC: ak4535: convert to soc-cache
ASoC: Writing register default value for the reset register
ASoC: ak4642: convert to soc-cache
ASoC: Delete ads117x.h
ASoC: Remove impossible case from wm8994_hw_params
ASoC: da7210: convert to soc-cache
ASoC: Make SND_SOC_SAARB and SND_SOC_TAVOREVB3 select MFD_88PM860X
ASoC: pxa: Remove redundant snd_soc_dapm_sync() calls from machine drivers
ASoC: sta32x: Set reg_cache_default to sta32x_regs
ASoC: sta32x: Write the register default value to cache for reserved registers
ASoC: ak4535: fixup cache register table
ASoC: tlv320aic32x4: Use snd_soc_update_bits for read-modify-write
ASoC: tlv320aic23: convert to soc-cache
ASoC: alc5623: Convert codec->hw_read to snd_soc_read
ASoC: tlv320aic3x: Convert codec->hw_read to snd_soc_read
ASoC: wm8961: Convert codec->hw_read to snd_soc_read
ASoC: wm8991: Fix wrong bit setting for WM8991_POWER_MANAGEMENT_2
ASoC: wm8991: Use snd_soc_update_bits for read-modify-write
ASoC: wm8400: Fix wrong bit setting for WM8400_POWER_MANAGEMENT_2
ASoC: wm8990: Fix wrong bit setting for WM8990_POWER_MANAGEMENT_2
ASoC: wm8990: Use snd_soc_update_bits for read-modify-write
ASoC: ad193x: Fix define of AD193X_PLL_INPUT_MASK
ASoC: wm8741: Fix setting interface format for DSP modes
ASoC: wm8741: Use snd_soc_cache_sync to sync reg_cache with the hardware
ASoC: wm8900: Fix wrong mask for setting DAC_CLKDIV/ADC_CLKDIV/LRCLK_MODE
ASoC: wm8900: Fix the mask defines
ASoC: wm8900: Use snd_soc_update_bits for read-modify-write
ASoC: wm8580: Use snd_soc_update_bits for read-modify-write
ASoC: ad193x: Use snd_soc_update_bits for read-modify-write
ASoC: sgtl5000: Fix define for SGTL5000_BIAS_R_MASK
ASoC: sgtl5000: Fix setting mic bias resistor
ASoC: ssm2602: Use snd_soc_update_bits for read-modify-write
ASoC: ak4641: Remove unused codec field from struct ak4641_priv
ASoC: ak4641: Use SND_SOC_DAPM_DAC for Voice Playback stream widget
ASoC: wm9081: Fix setting soft VMID ramp enable with VMID 2*240k
ASoC: Fix reg_word_size for ak4104
ASoC: ak4671: Use snd_soc_update_bits for read-modify-write
ASoC: rt5631: Remove unused codec field from struct rt5631_priv
ASoC: wm8994: Use SND_SOC_DAPM_AIF_OUT for AIF3 Capture
ASoC: wm8996: Use SND_SOC_DAPM_AIF_OUT for AIF2 Capture
ASoC: Set sgtl5000->ldo in ldo_regulator_register
ASoC: Use SGTL5000_LINREG_VDDD_MASK instead of hardcoded mask value
ASoC: wm8996: Fix wrong mask for setting WM8996_AIF_CLOCKING_2
ASoC: sgtl5000: Fix wrong mask in some snd_soc_update_bits calls
ASoC: max98095: Convert codec->hw_write to snd_soc_write
ASoC: wm8940: Properly set codec->dapm.bias_level
Bas Vermeulen (2):
ASoC: 88pm860x-codec - Allow independent use of both I2S playback and capture
ASoC: 88pm860x-codec - reset the codec correctly
Ben Gardiner (2):
ASoC: davinci-mcasp: add support for unsigned PCM formats
ASoC: davinci-pcm: trivial: replace link with actual chan/link
Charles Chin (1):
ALSA: hda - Remove bad code for IDT 92HD83 family patch
Clemens Ladisch (10):
ALSA: isight: remove superfluous field
ALSA: virtuoso: fix Essence ST(X) S/PDIF input
ALSA: mpu401: clean up interrupt specification
ALSA: ymfpci: fix PCM open error handling
ALSA: pcm: add snd_pcm_hw_rule_noresample()
ALSA: ymfpci: allow to disable the SRC
ALSA: emu10k1: allow to disable the SRC
ALSA: via82xx: allow to disable the SRC
ALSA: usb-audio: increase control transfer timeout
ALSA: control: add support for ENUMERATED user space controls
Dan Carpenter (4):
ALSA: hdspm - potential info leak in snd_hdspm_hwdep_ioctl()
ALSA: hdspm - cleanup __user tags in ioctl()
sound: oss: use strlcpy() in sound_timer_init()
ALSA: oss-mixer - use strlcpy() instead strcpy()
Daniel Mack (4):
USB: Add endpoint usage definitions to ch9.h
ALSA: snd-usb: re-order the Makefile
ALSA: snd-usb: re-order code
ALSA: snd-usb: move code from urb.c to endpoint.c
Daniele Guerrieri (1):
ALSA: usb-audio: Added support for Roland UM-ONE midi-usb interface
David Henningsson (7):
ALSA: HDA: Refactor Realtek's automute
ALSA: hda: hdmi: Hint matching between input devices and pcm devices
ALSA: HDA: Fix naming of input jacks for IDT parser
ALSA: HDA: Fix DAC assignment for secondary headphone on Sigmatel/IDT
ALSA: jack - Add "Line In" input jack constants
ALSA: HDA: Fixup Realtek headphone pin initialization
ALSA: HDA: Add new revision for ALC662
Dong Aisheng (9):
ASoC: mxs: add mxs-pcm driver
ASoC: mxs: add mxs-saif driver
ASoC: mxs: add mxs-sgtl5000 machine driver
ASoC: mxs: add asoc configuration files
ASoC: sgtl5000: add one missed cache reg
ASoC: mxs-saif: clear clk gate first before register setting
ASoC: mxs-sgtl5000: add record function
ASoC: mxs-saif: add record function
ASoC: soc-core: symmetry checking for each DAIs separately
Feng Tang (1):
ALSA: pcm - remove the dead code from snd_pcm_open_file()
Jarkko Nikula (5):
ASoC: Davinci: Fix FS polarity for I2S format
ASoC: omap-mcbsp: Fix FS polarity for LEFT_J, DSP_A and DSP_B formats
ASoC: omap-mcbsp: Prepare for init time DAI format setting
ASoC: omap: Convert bunch of machine drivers to use init time DAI format
ASoC: omap: Use single hw_params callback in sdp3430 and zoom2
Julia Lawall (2):
sound/soc/mxs/mxs-saif.c: add missing kfree
ASoC: keep pointer to resource so it can be freed
Kailang Yang (1):
ALSA: hda - ALC888S-VC remark to ALC886
Karl Tsou (1):
ASoC: Add DRC control for WM8996
Kristian Amlie (1):
ALSA: usb-audio: add Starr Labs USB MIDI support
Kuninori Morimoto (1):
ASoC: ak4642: fixup cache register table
Lars-Peter Clausen (9):
ASoC: DAPM: Allow multiple mixer sources to be routed via the same switch
ASoC: Add ADAU1373 codec support
ASoC: Blackfin: ADAU1373 eval board support
ASoC: soc_codec_reg_show use snd_soc_codec_readable_register
ASoC: ad193x: Setup regmap read and write flag masks for SPI
ASoC: ssm2602: Do not dereference codec->control_data
ASoC: ssm2602: Set initial bias level to standby
ASoC: ssm2602: Support setting the oscillator and the clock output state
MAINTAINERS: Add maintainer for Analog Devices sound CODECs
Liam Girdwood (2):
ASoC: dapm - Add DAPM stream completion event.
ASoC: dapm - change stream event dbg to vdgb
Lu Guanqun (5):
ALSA: core: trivial code style fix
ALSA: core: release the constraint check for replace ops
ASoC: sst_platform: trivial coding style fix
ASoC: sst_platform: using builtin function
ASoC: sst_platform: fix memory leak
Maarten Lankhorst (1):
ALSA: ctxfi: Bump playback substreams to 256
Manuel Lauss (6):
ASoC: Alchemy AC97C/I2SC audio support
ASoC: Add a DB1x00 AC97 machine driver
ALSA: deprecate MIPS AU1X00 AC97 driver
ASoC: au1x: remove automatic DMA device registration from PSC drivers
ASoC: au1x: update db1200 machine to the new way of things
ASoC: au1x: use substream stream info directly
Mark Brown (130):
ASoC: Add device tree binding for WM8731
ASoC: Trivial formatting fix in soc-core.c
ASoC: Implement new DC servo readback mode for late WM8994 revisions
ASoC: Support separate left and right channel dcs_codes values
ASoC: Parse board ID/revision information from WM1250-EV1 board
ASoC: Remove -codec from WM8523 driver name
ASoC: Remove redundant -codec from WM8580 driver name
ASoC: Use new register map API for ASoC generic physical I/O
ASoC: Add regmap as a control type
ASoC: Remove unneeded -codec from WM8753 driver name
ASoC: Update SMDKs for WM8580 -codec removal
ASoC: Remove some more redundant -codecs from driver names
ASoC: Refactor WM8741 regulator handling into CODEC generic code
ASoC: Add SPI support for WM8741
ASoC: Fix warning in WM1250-EV1 driver
ASoC: Specify register defaults for WM8958 MICBIAS1 and MICBIAS2
ASoC: Allow userspace control of Speyside headphone output
ASoC: Add bitfield definitions for WM8958 MICBIAS registers
ASoC: Add device tree binding for WM8510
ASoC: Add device tree binding for WM8523
ASoC: Add device tree support for WM8580
ASoC: Add device tree binding for WM8711
ASoC: Add device tree binding for WM8728
ASoC: Add device tree binding for WM8737
ASoC: Add device tree binding for WM8750
ASoC: Add device tree binding for WM8753
ASoC: Add VMID widget for wm_hubs devices
ASoC: Disable WM8994 VMID for digital only paths
ASoC: Remove redundant -codec from WM8750
ASoC: Support !CONFIG_REGMAP builds
ASoC: Add device tree binding for WM8741
ASoC: Correct revision display for WM1250-EV1 module
ASoC: Disable pulls on WM8994 AIF2 when starting it
ASoC: Run Speyside WM8962 at 512fs
ASoC: Add WM8958 noise gate support
ASoC: Implement WM8994 thermal warning and shutdown interrupt support
ASoC: Fix backport of WM8994 thermal warning
ASoC: Automatically manage WM8996 MICBIAS regulating mode
ASoC: Optimise WM8996 no interrupt path
ASoC: Add basic WM8962 capture low/high pass filter control
ASoC: Initial WM8962 DSP2 support
ASoC: Report IRQ_NONE when we don't see an interrupt from WM8962
ASoC: Provide more detail on WM8962 thermal shutdown status
ASoC: Convert WM8523 to table based control and DAPM initialization
ASoC: Allow idle_bias_off to be specified in CODEC drivers
ASoC: Allow register defaults to be larger than unsigned short
ASoC: Remove unused mutex from WM9090 driver
ASoC: Remove redundant -codec from WM8776 driver name
ASoC: Add device tree binding for WM8770
ASoC: Add device tree binding for WM8776
ASoC: Add device tree binding for WM8804
ASoC: Allow source specification for CODEC level sysclk
ASoC: Check that WM8996 FLL started even if we don't have the IRQ
ASoC: Remove unused step size from debugfs CODEC write function
regulator: Implement deferred disable support
ASoC: Disable WM8996 CPVDD supply when not in use
ASoC: Correct channel numbers for WM8996 AIF2
ASoC: Fix WM8996 DC servo operation without IRQ
ASoC: Display the error code when we fail to add a DAPM control
ASoC: WM8996 only needs bandgap for analogue functionality
ASoC: Initial WM8996 headphone impedance measurement support
ASoC: Add line loads to the list of supported detections for Speyside
ASoC: Fix unused variable warning in WM8996
ASoC: Refcount WM8996 bandgap from FLL too
ASoC: Add WM5100 driver
ASoC: Trace and collect statistics for DAPM graph walking
ASoC: Factor out per-widget DAPM power checks
ASoC: Include delay.h in 88pm860x
ASoC: Dynamically manage DBVDD2 and DBVDD3 on WM5100
ASoC: Add another DAPM stat for neighbour checks
ASoC: Add missed BCLK rate to WM5100 driver
ASoC: Support a wider range of sample rates on Speyside WM8962
ASoC: Rename WM8962 DMIC widget to DMIC_ENA
ASoC: Convert WM8962 MICBIAS to a supply widget
ASoC: Add support for on-board analogue microphones on Speyside WM8962
ASoC: Add DMIC control to Speyside WM8962 board
ASoC: Don't force bias on ground referenced devices
ASoC: Add platform data for WM1250 EV1 GPIOs
ASoC: Set idle_bias_off for WM1250 EV1
ASoC: Add device ID for WM9093 to WM9090 driver
ASoC: Allow DAI formats to be specified in the dai_link
ASoC: Use dai_fmt in speyside_wm8962
ASoC: Also count neighbour checks for supplies
ASoC: Staticise non-exported symbols in rt5631
ASoC: Remove unused function check_vdac_to_outmix from rt5631
ASoC: Instantiate DAPM widgets before we do the DAI link init
ASoC: Fix typo in 24.576MHz rate in WM5100
mfd: Add WM1811 support
ASoC: Add WM1811 support
ASoC: Remove direct register cache accesses from WM8962 driver
regulator: Fix return code from regulator_disable_deferred()
ASoC: Factor write of widget power out into a separate function
ASoC: Move bias level decision into main dapm_power_widgets()
ASoC: Ensure all DAPM widgets have a power check callback
ASoC: Factor out widget power check operation
ASoC: Mark headphone, mic, speaker and line widgets as always connected
ASoC: Do DAPM power checks only for widgets changed since last run
ASoC: Reduce the number of neigbours we mark dirty when updating power
ASoC: Add verbose debugging showing why widgets get marked dirty
ASoC: Only run power_check() on a widget once per run
ASoC: Don't mark the outputs of supplies as dirty on state changes
ASoC: Stop checking for supplied widgets after we find the first
ASoC: Use dapm_mark_dirty() for new DAPM widgets for consistency
ASoC: Remove references to linux@wolfsonmicro.com
ASoC: Ensure DAPM widgets are set up before we sync jacks
regulator: Add WM1811 support
ASoC: Suppress early calls to snd_soc_dapm_sync()
ASoC: Remove redundant snd_soc_dapm_sync() calls from machine drivers
ASoC: Ensure all DAPM widgets are instantiated with the card
ASoC: Assign power_check when we allocate DAPM widgets
ASoC: Cache connected input and output recursions
ASoC: Squash error codes from regmap down to -1 on read
ASoC: Fix DAPM sync for TLV320AIC3x custom DAPM widget
ASoC: Convert Simtec machines to table based DAPM init
ASoC: Convert H1940 to table based init
ASoC: Convert RX1950 to table based init
ASoC: Convert SmartQ to table based init
ASoC: Convert SMDK WM8580 to table based DAPM init
ASoC: Convert Jive to table based init
ASoC: Convert Goni to data based DAPM init
ASoC: Add missing default for WM5100 Clocking 1
ASoC: Implement WM5100 accessory detection support
ASoC: Instantiate card widgets immediately
ASoC: Update WM5100 accessory detection for revision A
ASoC: Convert DA7210 to table based DAPM init
MANITAINERS: Add Cragganmore reference platform to Wolfson support
ASoC: Update WM1811 DCS codes for latest evaluation results
ASoC: Convert WM9081 to table based control init
ASoC: Fix prefixing of DAPM controls
ASoC: WM9081 interrupt status register is volatile
Michael Opdenacker (1):
ASoC: fix checkpatch.pl error in omap-mcbsp
Mika Westerberg (7):
ASoC: snappercl15: convert to use snd_soc_register_card()
ARM: ep93xx: simone: register audio platform device
ARM: ep93xx: edb93xx: register audio platform device
ARM: ep93xx: snappercl15: register audio platform device
ASoC: ep93xx-pcm: add MODULE_ALIAS
ASoC: simone: convert to use snd_soc_register_card()
ASoC: edb93xx: convert to use snd_soc_register_card()
Misael Lopez Cruz (1):
ASoC: omap-mcpdm: Replace legacy driver
Olof Johansson (1):
ASoC: Tegra: sparse cleanup
Peter Ujfalusi (81):
MFD: twl6040: Remove global pointer for platform_device
MFD: twl6040: Add accessor for revision ID
Input: twl6040-vibra: Use accessor to get revision information
MFD: twl6040: Fix power on GPIO handling
ASoC: twl6040: Chip initialization cleanup
ASoC: twl6040: Use chip defaults in the initial reg_cache
ASoC: twl6040: Fix the number of channels for vibra
ASoC: twl6040: Correct supported number of playback channels
ASoC: tpa6130a2: Model support cleanup
ASoC: tpa6130a2: Remove model_id from platform data
OMAP: McPDM: Convert McPDM device to omap_device
OMAP4: hwmod: enable mcpdm hwmod device.
ASoC: omap-mcpdm: Fix threshold and dma configuration
ASoC: OMAP4: McPDM: Convert to hwmod/omap_device
ASoC: twl6040: Lower the power on gain values at startup
ASoC: twl6040: Fix comments for register names
ASoC: twl6040: Remove strings "NULL" from DAPM route
ASoC: twl6040: Introduce SW only shadow register
ASoC: twl6040: Earphone path correction
ASoC: twl6040: Use consistent names for Handsfree path
ASoC: twl6040: Use consistent names for Headset path
ASoC: twl6040: Support for AUX L/R output
ASoC: twl6040/sdp4430: Change legacy DAI name
ASoC/MFD: twl6040: Combine bit definitions for Headset control registers
ASoC: omap-mcpdm: Correct the supported number of channels
ASoC: twl6040: No need to read the INTID register
ASoC: omap-mcbsp: Fix compile time warning about ambiguous ‘else’
ASoC: twl6040: Read the TRIM values from the chip
ASoC: twl6040: Function to fetch the TRIM values
ASoC: omap-mcpdm: API to configure offset cancellation
ASoC: sdp4430: Configure McPDM offset cancellation
ASoC: twl6040: Rename pga_event to out_drv_event
ASoC: twl6040: Combine the custom volsw get, and put functions
ASoC: twl6040: Move delayed_work struct inside twl6040_output for HS/HF
ASoC: twl6040: Move the delayed_work for HS detection under twl6040_jack_data
ASoC: twl6040: No need to change delay during HS ramp
ASoC: twl6040: No need to change delay during HF ramp
ASoC: twl6040: One workqueue should be enough
ASoC: twl6040: correct loop counters for HS/HF ramp code
ASoC: twl6040: Shift 2 identifies the HS output in out_drv_event
ASoC: twl6040: Simplify code in out_drv_event for pending work check
ASoC: omap-pcm: Fix the no period wakeup implementation
ASoC: core: Introduce SOC_DOUBLE_VALUE macro
ASoC: core: Introduce SOC_DOUBLE_R_VALUE macro
ASoC: twl6040: Simplify custom put_volsw callback
ASoC: Consolidate use of controls with custom get/put function
ASoC: twl6040: Simplify custom get_volsw callback
ASoC: twl6040: Prepare for core put_volsw/volsw_2r merger
ASoC: core: Change SOC_SINGLE/DOUBLE_VALUE representation
ASoC: core: Combine snd_soc_info_volsw/info_volsw_2r functions
ASoC: core: Combine snd_soc_get_volsw/get_volsw_2r functions
ASoC: core: Combine snd_soc_put_volsw/put_volsw_2r functions
ASoC: twl6040: Simply call snd_soc_put_volsw form the custom code
ASoC: core: Remove snd_soc_put_volsw_2r definition
ASoC: twl6040: Warn user in twl6040_put_volsw for error case
ASoC: Replace remaining use of *_volsw_2r with *_volsw
ASoC: fix codec breakage caused by the volsw/volsw_2r merger
ASoC: OMAP machines: Remove soc_dapm_sync() call from init
ASoC: zoom2: Let core to deal with the DAPM widgets
ASoC: zoom2: No need to call dapm_pin_enable at init time
ASoC: sdp4430: Let core to deal with the DAPM widgets
ASoC: sdp4430: No need to call dapm_pin_enable at init time
ASoC: am3517evm: Let core to deal with the DAPM widgets
ASoC: n810: Let the core to register DAPM widgets/routes and controls
ASoC: osk5912: Let core to deal with the DAPM widgets
ASoC: sdp3430: Let core to deal with the DAPM widgets
ASoC: twl6040: Convert to table based init
ASoC: twl4030: Convert to table based init
ASoC: tlv320dac33: Convert to table based init
Input: twl6040: Simplify vibra regsiter definitions
MFD: twl6040: Cache the vibra control registers
MFD: twl6040: function to query the vibra status for clients
Input: twl6040-vibra: Check the selected path for vibra
ASoC: twl6040: Support for vibra output paths
ASoC: twl6040: Workaround for headset DC offset caused pop noise
ASoC: twl6040: Remove Capture restriction for 17.64MHz sysclk
ASoC: twl6040: Remove PLL usage restrictions
ASoC: twl6040: Change event ordering for Earphone driver
ASoC: twl6040: Rename the Earphone Driver event handler
ASoC: core: Add flag to ignore pmdown_time at pcm_close
ASoC: twl6040: Request core to inline the DAPM sequence
Pierre-Louis Bossart (4):
ALSA: hda: option to enable arbitrary buffer/period sizes
ALSA: usb: refine delay information with USB frame counter
ALSA: hda/hdmi: expose ELD control
ALSA: hdmi: fix printout of SAD sampling rates
Raymond Yau (4):
ALSA: ymfpci: add "Playback" to FM Legacy Volume control
ALSA: hda - Add Headphone Playback Volume control for ad1988/ad1989
ALSA: HDA - Add Independent Headphone for all models of ad1988/ad1989
ALSA: hda - Add documentation for codec specific mixer controls of Analog codecs
Ryan Mallon (2):
ASoC: max98088 codec: Catch driver bugs for eq channel name
ASoC: max98095 codec: Catch driver bugs for biquad channel name
Sangbeom Kim (1):
ASoC: SAMSUNG: Add Kconfig to support SMDK4212
Shawn Guo (1):
ASoC: sgtl5000: add device tree probe support
Stefan Richter (1):
ALSA: firewire-speakers: fix locking
Stephen Warren (1):
ASoC: soc-io: Fix CONFIG_REGMAP_I2C/SPI guards to support regmap modules
Susan Gao (1):
ASoC: Fix a bug in WM8962 DSP_A and DSP_B settings
Takashi Iwai (60):
ALSA: hda - Add basic tracepoints
ALSA: hda - Add documentation for tracepoints
ALSA: hda - Add tracepoint for unsolicited events
ALSA: hda - Add snd_hda_override_pin_caps() helper function
ALSA: hda - Remove ALC262 HP and sony-assamd quirks
ALSA: hda - Remove ALC260 HP model quirks
ALSA: hda - Remove ALC268 Dell, Toshiba and Zapto model quirks
ALSA: hda - Remove ALC680 model quirks
ALSA: hda - Remove ALC861VD Lenovo, Dallas, HP and V1S model quirks
ALSA: hdspm - Correct max buffer size limit
ALSA: hdspm - Add missing KNOT flag for AES32 rate restriction
ALSA: hdspm - Simplify with snd_pcm_hw_constraint_pow2()
ALSA: hda - Remove dell, dell-zm1 and samsung-nc10 models for ALC272
ALSA: hda - Remove acer, acer-aspire and acer-dmic models for ALC268
ALSA: hda - Remove ALC269 model=futjisu and Acer
ALSA: hda - Replace ALC269 quanta and lifebook models with fixups
ALSA: hda - Remove ALC268 model quirks
ALSA: hda - Remove ALC861 uniwill-m31, toshiba, asus and asus-laptop models
ALSA: hda - Get rid of left-over chunks by previous cleanups
ALSA: hda - Remove ALC662 eeepc-p701 and ecs models
ALSA: usb-audio - Check the dB-range validity in the later read, too
ALSA: hda - Support multiple speakers by Realtek auto-parser
ALSA: hda - Allow different assoc numbers for multiple speakers
ALSA: hda - Remove ALC662 model=levono-101e model quirk
ALSA: hda - Fix initialization of multi-speaker output paths for Realtek
ALSA: hda - Rename to snd_hda_parse_pin_defcfg()
ALSA: hda - Restore VREF50 setup for ALC861-VD dallas/hp models
ALSA: hda - Remove all ALC861 and ALC861-VD quirks
ALSA: hda - Add multi-headphone NIDs in multiout struct
ALSA: hda - Support multiple headphones in Realtek auto-parser
ALSA: hda - Rewrite ALC662 asus-mode* models with fixups
ALSA: hda - Rewrite ALC269 laptop-amic,dmic,&co quirks with fixups
ALSA: hda - Remove ALC662 ASUS M51VA, G71V, H13 and G50V model quirks
ALSA: hda - Rewrite Lenovo X200 quirk with pincfg-fix using auto-parser
ALSA: hda - Fix Center/LFE mixer element creations for Realtek
ALSA: hda - Prefer multi-io to speakers for realtek auto-parser
ALSA: hda - Remove ALC662 ASUS eeepc-ep20 model quirk
ALSA: hda - Remove the rest of ALC662 quirks
ALSA: fm801 - Clean up redundant reference to snd_fm801_tea575x_gpios[]
ALSA: aloop - Use vmalloc buffer
ALSA: hda - Avoid unnecessary verbs to clear PCM formats
ALSA: hda:via - Skip creations of empty PCM streams
ALSA: pcm - Export snd_pcm_lib_default_mmap() helper
ALSA: hda - Add snoop option
ALSA: hda - Allow patching with any vendor/subsystem ids
ALSA: hda - Moved snd_print_pcm_rates() back into hda_proc.c
ALSA: hda/realtek - Choose more cleverly the primary outputs
ALSA: hda - Distinguish each substream for better sticky assignment
ALSA: usb-audio - Fix possible access over audio_feature_info[] array
ALSA: hda/realtek - Check the error from alc_codec_rename()
ALSA: hda/realtek - Use alc_codec_rename()
ALSA: hda/realtek - Clean up codec renames
ALSA: hda/realtek - Cache COEF 0 value
ALSA: hda/realtek - Fix DAC assignments of multiple speakers
ALSA: Update the sound git tree URL
ALSA: hda - Fix surround/CLFE headphone and speaker pins order
ALSA: hda - Fix pin-config for ASUS W90V
ALSA: hda/realtek - Fix missing volume controls with ALC260
ALSA: hda - Keep EAPD turned on for old Conexant chips
ALSA: hda - Fix ADC input-amp handling for Cx20549 codec
Timur Tabi (5):
ASoC: claim the IRQ when the fsl_ssi device is probed, not opened
ASoC: fsl: fix build warning in fsl_dma
ASoC: improve asynchronous mode support in the fsl_ssi driver
ASoC: support sample sizes properly in the WM8776 codec driver
ASoC: support all possible sample rates in the WM8776 driver
Ujfalusi, Peter (1):
ASoC: sdp4430: Fix string for FM input name
William Light (2):
ALSA: snd-usb-caiaq: Fix NULL dereference in input.c
ALSA: snd-usb-caiaq: Add support for Maschine
Wolfram Sang (4):
ASoC: imx-ssi: use dma_writecombine consistently
ASoC: imx: use more robust checking of available streams
ASoC: tlv320aic32x4 fix initialization of micpga routing
ASoC: Fix typo in Kconfig symbol for tlv320aic32x4
Yong Zhang (1):
sound: irq: Remove IRQF_DISABLED
johnnyhsu@realtek.com (1):
ASoC: Add driver for rt5631
susan gao (1):
ASoC: Add 3D stereo support for wm8996
---
Documentation/DocBook/writing-an-alsa-driver.tmpl | 36 +-
.../bindings/sound/soc/codecs/fsl-sgtl5000.txt | 11 +
Documentation/devicetree/bindings/sound/wm8510.txt | 18 +
Documentation/devicetree/bindings/sound/wm8523.txt | 16 +
Documentation/devicetree/bindings/sound/wm8580.txt | 16 +
Documentation/devicetree/bindings/sound/wm8711.txt | 18 +
Documentation/devicetree/bindings/sound/wm8728.txt | 18 +
Documentation/devicetree/bindings/sound/wm8731.txt | 18 +
Documentation/devicetree/bindings/sound/wm8737.txt | 18 +
Documentation/devicetree/bindings/sound/wm8741.txt | 18 +
Documentation/devicetree/bindings/sound/wm8750.txt | 18 +
Documentation/devicetree/bindings/sound/wm8753.txt | 18 +
Documentation/devicetree/bindings/sound/wm8770.txt | 16 +
Documentation/devicetree/bindings/sound/wm8776.txt | 18 +
Documentation/devicetree/bindings/sound/wm8804.txt | 18 +
Documentation/sound/alsa/ALSA-Configuration.txt | 6 +
Documentation/sound/alsa/HD-Audio-Controls.txt | 16 +
Documentation/sound/alsa/HD-Audio-Models.txt | 67 +-
Documentation/sound/alsa/HD-Audio.txt | 55 +-
MAINTAINERS | 4 +-
arch/arm/mach-ep93xx/edb93xx.c | 6 +
arch/arm/mach-ep93xx/simone.c | 13 +-
arch/arm/mach-ep93xx/snappercl15.c | 13 +-
arch/arm/mach-omap2/board-rx51-peripherals.c | 1 -
arch/arm/mach-omap2/devices.c | 33 +
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 2 +-
arch/arm/plat-omap/devices.c | 36 -
arch/mips/alchemy/devboards/db1200/platform.c | 16 +
arch/mips/alchemy/devboards/db1x00/platform.c | 48 +
drivers/input/misc/twl6040-vibra.c | 21 +-
drivers/mfd/twl6040-core.c | 67 +-
drivers/mfd/wm8994-core.c | 27 +
drivers/regulator/core.c | 64 +
drivers/regulator/wm8994-regulator.c | 13 +
include/linux/input.h | 1 +
include/linux/mfd/twl6040.h | 46 +-
include/linux/mfd/wm8994/core.h | 1 +
include/linux/mfd/wm8994/registers.h | 88 +
include/linux/regulator/consumer.h | 7 +
include/linux/regulator/driver.h | 3 +
include/linux/usb/ch9.h | 17 +-
include/sound/adau1373.h | 34 +
include/sound/asound.h | 4 +-
include/sound/initval.h | 2 +-
include/sound/jack.h | 1 +
include/sound/mpu401.h | 7 +-
include/sound/pcm.h | 4 +
include/sound/saif.h | 16 +
include/sound/soc-dai.h | 37 +-
include/sound/soc-dapm.h | 16 +
include/sound/soc.h | 107 +-
include/sound/tpa6130a2-plat.h | 6 -
include/sound/wm1250-ev1.h | 27 +
include/sound/wm5100.h | 59 +
include/trace/events/asoc.h | 25 +
sound/aoa/codecs/onyx.c | 4 +-
sound/arm/aaci.c | 2 +-
sound/arm/pxa2xx-ac97-lib.c | 2 +-
sound/core/control.c | 84 +-
sound/core/control_compat.c | 4 +
sound/core/jack.c | 1 +
sound/core/oss/mixer_oss.c | 2 +-
sound/core/pcm_lib.c | 26 +
sound/core/pcm_native.c | 19 +-
sound/drivers/aloop.c | 13 +-
sound/drivers/ml403-ac97cr.c | 4 +-
sound/drivers/mpu401/mpu401.c | 3 +-
sound/drivers/mpu401/mpu401_uart.c | 20 +-
sound/drivers/mtpav.c | 2 +-
sound/drivers/serial-u16550.c | 2 +-
sound/firewire/isight.c | 1 -
sound/firewire/speakers.c | 5 +-
sound/isa/ad1816a/ad1816a.c | 2 +-
sound/isa/ad1816a/ad1816a_lib.c | 2 +-
sound/isa/als100.c | 1 -
sound/isa/azt2320.c | 3 +-
sound/isa/cmi8330.c | 2 +-
sound/isa/cs423x/cs4231.c | 1 -
sound/isa/cs423x/cs4236.c | 3 +-
sound/isa/es1688/es1688.c | 2 +-
sound/isa/es1688/es1688_lib.c | 2 +-
sound/isa/es18xx.c | 6 +-
sound/isa/galaxy/galaxy.c | 3 +-
sound/isa/gus/gus_main.c | 2 +-
sound/isa/gus/gusextreme.c | 3 +-
sound/isa/gus/gusmax.c | 2 +-
sound/isa/gus/interwave.c | 2 +-
sound/isa/msnd/msnd_pinnacle.c | 2 +-
sound/isa/opl3sa2.c | 7 +-
sound/isa/opti9xx/miro.c | 3 +-
sound/isa/opti9xx/opti92x-ad1848.c | 4 +-
sound/isa/sb/jazz16.c | 1 -
sound/isa/sb/sb16.c | 5 +-
sound/isa/sb/sb_common.c | 2 +-
sound/isa/sc6000.c | 3 +-
sound/isa/sscape.c | 3 +-
sound/isa/wavefront/wavefront.c | 5 +-
sound/isa/wss/wss_lib.c | 2 +-
sound/mips/Kconfig | 5 +-
sound/mips/au1x00.c | 4 +-
sound/oss/sound_timer.c | 2 +-
sound/pci/als4000.c | 5 +-
sound/pci/au88x0/au88x0_mpu401.c | 6 +-
sound/pci/azt3328.c | 5 +-
sound/pci/cmipci.c | 5 +-
sound/pci/ctxfi/ctpcm.c | 2 +-
sound/pci/ctxfi/ctsrc.c | 2 +-
sound/pci/ctxfi/ctvmem.h | 2 +-
sound/pci/emu10k1/emupcm.c | 5 +
sound/pci/es1938.c | 5 +-
sound/pci/es1968.c | 5 +-
sound/pci/fm801.c | 20 +-
sound/pci/hda/Makefile | 3 +
sound/pci/hda/alc260_quirks.c | 304 --
sound/pci/hda/alc262_quirks.c | 530 +--
sound/pci/hda/alc268_quirks.c | 636 ---
sound/pci/hda/alc269_quirks.c | 674 ---
sound/pci/hda/alc662_quirks.c | 1408 ------
sound/pci/hda/alc680_quirks.c | 222 -
sound/pci/hda/alc861_quirks.c | 725 ---
sound/pci/hda/alc861vd_quirks.c | 605 ---
sound/pci/hda/alc880_quirks.c | 17 +-
sound/pci/hda/alc882_quirks.c | 85 +-
sound/pci/hda/alc_quirks.c | 13 +
sound/pci/hda/hda_codec.c | 143 +-
sound/pci/hda/hda_eld.c | 39 +-
sound/pci/hda/hda_hwdep.c | 6 +-
sound/pci/hda/hda_intel.c | 225 +-
sound/pci/hda/hda_local.h | 32 +-
sound/pci/hda/hda_proc.c | 12 +-
sound/pci/hda/hda_trace.h | 117 +
sound/pci/hda/patch_analog.c | 176 +-
sound/pci/hda/patch_conexant.c | 165 +-
sound/pci/hda/patch_hdmi.c | 99 +-
sound/pci/hda/patch_realtek.c | 1408 ++++--
sound/pci/hda/patch_sigmatel.c | 50 +-
sound/pci/hda/patch_via.c | 68 +-
sound/pci/ice1712/ice1712.c | 10 +-
sound/pci/maestro3.c | 4 +-
sound/pci/oxygen/oxygen_lib.c | 6 +-
sound/pci/oxygen/xonar_pcm179x.c | 1 +
sound/pci/riptide/riptide.c | 2 +-
sound/pci/rme9652/hdspm.c | 153 +-
sound/pci/sis7019.c | 4 +-
sound/pci/sonicvibes.c | 7 +-
sound/pci/trident/trident.c | 5 +-
sound/pci/via82xx.c | 13 +-
sound/pci/ymfpci/ymfpci.c | 5 +-
sound/pci/ymfpci/ymfpci_main.c | 32 +-
sound/ppc/keywest.c | 1 -
sound/ppc/snd_ps3.c | 2 +-
sound/soc/Kconfig | 3 +
sound/soc/Makefile | 1 +
sound/soc/atmel/playpaq_wm8510.c | 6 +-
sound/soc/atmel/sam9g20_wm8731.c | 2 -
sound/soc/atmel/snd-soc-afeb9260.c | 2 -
sound/soc/au1x/Kconfig | 28 +
sound/soc/au1x/Makefile | 10 +
sound/soc/au1x/ac97c.c | 366 ++
sound/soc/au1x/db1000.c | 75 +
sound/soc/au1x/db1200.c | 64 +-
sound/soc/au1x/dbdma2.c | 91 +-
sound/soc/au1x/dma.c | 377 ++
sound/soc/au1x/i2sc.c | 349 ++
sound/soc/au1x/psc-ac97.c | 61 +-
sound/soc/au1x/psc-i2s.c | 55 +-
sound/soc/au1x/psc.h | 16 +-
sound/soc/blackfin/Kconfig | 13 +
sound/soc/blackfin/Makefile | 2 +
sound/soc/blackfin/bf5xx-ac97-pcm.c | 2 +-
sound/soc/blackfin/bf5xx-i2s-pcm.c | 2 +-
sound/soc/blackfin/bfin-eval-adau1373.c | 202 +
sound/soc/codecs/88pm860x-codec.c | 14 +-
sound/soc/codecs/Kconfig | 16 +-
sound/soc/codecs/Makefile | 8 +-
sound/soc/codecs/ad193x.c | 96 +-
sound/soc/codecs/ad193x.h | 36 +-
sound/soc/codecs/ad1980.c | 11 +-
sound/soc/codecs/adau1373.c | 1414 ++++++
sound/soc/codecs/adau1373.h | 29 +
sound/soc/codecs/adau1701.c | 3 +-
sound/soc/codecs/adav80x.c | 3 +-
sound/soc/codecs/ads117x.h | 13 -
sound/soc/codecs/ak4104.c | 2 +-
sound/soc/codecs/ak4535.c | 110 +-
sound/soc/codecs/ak4641.c | 3 +-
sound/soc/codecs/ak4642.c | 104 +-
sound/soc/codecs/ak4671.c | 22 +-
sound/soc/codecs/alc5623.c | 8 +-
sound/soc/codecs/cs4270.c | 14 +-
sound/soc/codecs/cs4271.c | 5 -
sound/soc/codecs/cs42l51.c | 15 +-
sound/soc/codecs/da7210.c | 649 ++-
sound/soc/codecs/lm4857.c | 2 +-
sound/soc/codecs/max98088.c | 36 +-
sound/soc/codecs/max98095.c | 47 +-
sound/soc/codecs/rt5631.c | 1773 +++++++
sound/soc/codecs/rt5631.h | 701 +++
sound/soc/codecs/sgtl5000.c | 37 +-
sound/soc/codecs/sgtl5000.h | 2 +-
sound/soc/codecs/sn95031.c | 16 +-
sound/soc/codecs/ssm2602.c | 107 +-
sound/soc/codecs/ssm2602.h | 6 +-
sound/soc/codecs/sta32x.c | 54 +-
sound/soc/codecs/tlv320aic23.c | 181 +-
sound/soc/codecs/tlv320aic32x4.c | 65 +-
sound/soc/codecs/tlv320aic3x.c | 25 +-
sound/soc/codecs/tlv320dac33.c | 31 +-
sound/soc/codecs/tpa6130a2.c | 13 +-
sound/soc/codecs/twl4030.c | 69 +-
sound/soc/codecs/twl6040.c | 795 ++--
sound/soc/codecs/twl6040.h | 13 +
sound/soc/codecs/wl1273.c | 1 -
sound/soc/codecs/wm1250-ev1.c | 140 +-
sound/soc/codecs/wm5100-tables.c | 1531 ++++++
sound/soc/codecs/wm5100.c | 2809 +++++++++++
sound/soc/codecs/wm5100.h | 5155 ++++++++++++++++++++
sound/soc/codecs/wm8350.c | 43 +-
sound/soc/codecs/wm8400.c | 2 +-
sound/soc/codecs/wm8510.c | 21 +-
sound/soc/codecs/wm8523.c | 36 +-
sound/soc/codecs/wm8580.c | 69 +-
sound/soc/codecs/wm8711.c | 38 +-
sound/soc/codecs/wm8728.c | 13 +-
sound/soc/codecs/wm8731.c | 25 +-
sound/soc/codecs/wm8737.c | 10 +
sound/soc/codecs/wm8741.c | 151 +-
sound/soc/codecs/wm8750.c | 56 +-
sound/soc/codecs/wm8753.c | 13 +-
sound/soc/codecs/wm8770.c | 8 +
sound/soc/codecs/wm8776.c | 67 +-
sound/soc/codecs/wm8782.c | 2 +-
sound/soc/codecs/wm8804.c | 9 +
sound/soc/codecs/wm8900.c | 115 +-
sound/soc/codecs/wm8904.c | 2 -
sound/soc/codecs/wm8940.c | 51 +-
sound/soc/codecs/wm8960.c | 18 +-
sound/soc/codecs/wm8961.c | 4 +-
sound/soc/codecs/wm8962.c | 222 +-
sound/soc/codecs/wm8971.c | 42 +-
sound/soc/codecs/wm8974.c | 15 +-
sound/soc/codecs/wm8978.c | 3 -
sound/soc/codecs/wm8983.c | 2 +-
sound/soc/codecs/wm8988.c | 33 +-
sound/soc/codecs/wm8990.c | 105 +-
sound/soc/codecs/wm8991.c | 24 +-
sound/soc/codecs/wm8993.c | 7 +-
sound/soc/codecs/wm8994-tables.c | 16 +-
sound/soc/codecs/wm8994.c | 376 ++-
sound/soc/codecs/wm8994.h | 2 +
sound/soc/codecs/wm8995.c | 22 +-
sound/soc/codecs/wm8996.c | 319 +-
sound/soc/codecs/wm9081.c | 14 +-
sound/soc/codecs/wm9090.c | 7 +-
sound/soc/codecs/wm_hubs.c | 68 +-
sound/soc/codecs/wm_hubs.h | 3 +-
sound/soc/davinci/davinci-evm.c | 2 -
sound/soc/davinci/davinci-i2s.c | 5 +-
sound/soc/davinci/davinci-mcasp.c | 20 +-
sound/soc/davinci/davinci-pcm.c | 123 +-
sound/soc/ep93xx/edb93xx.c | 60 +-
sound/soc/ep93xx/ep93xx-ac97.c | 2 +-
sound/soc/ep93xx/ep93xx-pcm.c | 1 +
sound/soc/ep93xx/simone.c | 64 +-
sound/soc/ep93xx/snappercl15.c | 53 +-
sound/soc/fsl/fsl_dma.c | 1 -
sound/soc/fsl/fsl_ssi.c | 204 +-
sound/soc/fsl/mpc8610_hpcd.c | 2 +-
sound/soc/fsl/p1022_ds.c | 4 +-
sound/soc/imx/Kconfig | 3 +-
sound/soc/imx/imx-pcm-fiq.c | 12 +-
sound/soc/imx/imx-ssi.c | 9 +-
sound/soc/imx/imx-ssi.h | 6 -
sound/soc/jz4740/jz4740-pcm.c | 2 +-
sound/soc/kirkwood/kirkwood-i2s.c | 2 +-
sound/soc/kirkwood/kirkwood-t5325.c | 2 -
sound/soc/mid-x86/mfld_machine.c | 4 -
sound/soc/mid-x86/sst_platform.c | 19 +-
sound/soc/mxs/Kconfig | 20 +
sound/soc/mxs/Makefile | 10 +
sound/soc/mxs/mxs-pcm.c | 359 ++
sound/soc/mxs/mxs-pcm.h | 43 +
sound/soc/mxs/mxs-saif.c | 798 +++
sound/soc/mxs/mxs-saif.h | 134 +
sound/soc/mxs/mxs-sgtl5000.c | 173 +
sound/soc/nuc900/nuc900-pcm.c | 5 +-
sound/soc/omap/Makefile | 2 +-
sound/soc/omap/am3517evm.c | 50 +-
sound/soc/omap/ams-delta.c | 1 -
sound/soc/omap/igep0020.c | 23 +-
sound/soc/omap/mcpdm.c | 470 --
sound/soc/omap/mcpdm.h | 153 -
sound/soc/omap/n810.c | 42 +-
sound/soc/omap/omap-mcbsp.c | 27 +-
sound/soc/omap/omap-mcpdm.c | 479 ++-
sound/soc/omap/omap-mcpdm.h | 107 +
sound/soc/omap/omap-pcm.c | 8 +
sound/soc/omap/omap3evm.c | 23 +-
sound/soc/omap/omap3pandora.c | 28 +-
sound/soc/omap/osk5912.c | 50 +-
sound/soc/omap/overo.c | 23 +-
sound/soc/omap/rx51.c | 22 +-
sound/soc/omap/sdp3430.c | 88 +-
sound/soc/omap/sdp4430.c | 47 +-
sound/soc/omap/zoom2.c | 96 +-
sound/soc/pxa/Kconfig | 2 +
sound/soc/pxa/corgi.c | 1 -
sound/soc/pxa/e740_wm9705.c | 2 -
sound/soc/pxa/e750_wm9705.c | 2 -
sound/soc/pxa/e800_wm9712.c | 1 -
sound/soc/pxa/magician.c | 4 +-
sound/soc/pxa/mioa701_wm9713.c | 1 -
sound/soc/pxa/palm27x.c | 4 -
sound/soc/pxa/poodle.c | 1 -
sound/soc/pxa/raumfeld.c | 4 +-
sound/soc/pxa/saarb.c | 4 -
sound/soc/pxa/spitz.c | 3 +-
sound/soc/pxa/tavorevb3.c | 4 -
sound/soc/pxa/tosa.c | 1 -
sound/soc/pxa/z2.c | 6 +-
sound/soc/pxa/zylonite.c | 1 -
sound/soc/s6000/s6000-pcm.c | 1 -
sound/soc/samsung/Kconfig | 12 +-
sound/soc/samsung/ac97.c | 4 +-
sound/soc/samsung/goni_wm8994.c | 15 +-
sound/soc/samsung/h1940_uda1380.c | 19 +-
sound/soc/samsung/i2s.c | 2 +-
sound/soc/samsung/jive_wm8750.c | 19 +-
sound/soc/samsung/neo1973_wm8753.c | 4 -
sound/soc/samsung/pcm.c | 2 +-
sound/soc/samsung/rx1950_uda1380.c | 33 +-
sound/soc/samsung/s3c-i2s-v2.c | 1 +
sound/soc/samsung/s3c2412-i2s.c | 6 +-
sound/soc/samsung/s3c24xx-i2s.c | 6 +-
sound/soc/samsung/s3c24xx_simtec.c | 2 +-
sound/soc/samsung/s3c24xx_simtec_hermes.c | 11 +-
sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c | 11 +-
sound/soc/samsung/s3c24xx_uda134x.c | 8 +-
sound/soc/samsung/smartq_wm8987.c | 27 +-
sound/soc/samsung/smdk_wm8580.c | 51 +-
sound/soc/samsung/smdk_wm8580pcm.c | 4 +-
sound/soc/samsung/smdk_wm8994.c | 2 -
sound/soc/samsung/spdif.c | 4 +-
sound/soc/samsung/speyside.c | 10 +-
sound/soc/samsung/speyside_wm8962.c | 41 +-
sound/soc/sh/fsi.c | 12 +-
sound/soc/sh/sh7760-ac97.c | 7 -
sound/soc/sh/ssi.c | 2 +-
sound/soc/soc-cache.c | 7 -
sound/soc/soc-core.c | 215 +-
sound/soc/soc-dapm.c | 416 ++-
sound/soc/soc-io.c | 357 +--
sound/soc/soc-jack.c | 2 +
sound/soc/soc-pcm.c | 57 +-
sound/soc/tegra/tegra_das.c | 4 +-
sound/soc/tegra/tegra_i2s.c | 2 +-
sound/soc/tegra/tegra_pcm.c | 2 +-
sound/soc/tegra/tegra_spdif.c | 5 +-
sound/soc/tegra/tegra_wm8903.c | 2 -
sound/soc/tegra/trimslice.c | 2 -
sound/soc/txx9/txx9aclc-ac97.c | 2 +-
sound/soc/txx9/txx9aclc-generic.c | 2 +-
sound/sparc/amd7930.c | 2 +-
sound/usb/6fire/firmware.c | 25 +-
sound/usb/Kconfig | 2 +
sound/usb/Makefile | 12 +-
sound/usb/caiaq/device.c | 8 +-
sound/usb/caiaq/device.h | 1 +
sound/usb/caiaq/input.c | 155 +-
sound/usb/card.c | 4 +-
sound/usb/card.h | 2 +
sound/usb/clock.c | 12 +-
sound/usb/endpoint.c | 1173 ++++--
sound/usb/endpoint.h | 20 +-
sound/usb/format.c | 4 +-
sound/usb/helper.c | 4 +-
sound/usb/helper.h | 2 +-
sound/usb/midi.c | 27 +
sound/usb/mixer.c | 21 +-
sound/usb/mixer_quirks.c | 10 +-
sound/usb/pcm.c | 34 +-
sound/usb/pcm.h | 3 +
sound/usb/quirks-table.h | 25 +
sound/usb/quirks.c | 16 +-
sound/usb/stream.c | 452 ++
sound/usb/stream.h | 12 +
sound/usb/urb.c | 941 ----
sound/usb/urb.h | 21 -
sound/usb/usbaudio.h | 1 +
389 files changed, 25721 insertions(+), 12163 deletions(-)
create mode 100644 Documentation/devicetree/bindings/sound/soc/codecs/fsl-sgtl5000.txt
create mode 100644 Documentation/devicetree/bindings/sound/wm8510.txt
create mode 100644 Documentation/devicetree/bindings/sound/wm8523.txt
create mode 100644 Documentation/devicetree/bindings/sound/wm8580.txt
create mode 100644 Documentation/devicetree/bindings/sound/wm8711.txt
create mode 100644 Documentation/devicetree/bindings/sound/wm8728.txt
create mode 100644 Documentation/devicetree/bindings/sound/wm8731.txt
create mode 100644 Documentation/devicetree/bindings/sound/wm8737.txt
create mode 100644 Documentation/devicetree/bindings/sound/wm8741.txt
create mode 100644 Documentation/devicetree/bindings/sound/wm8750.txt
create mode 100644 Documentation/devicetree/bindings/sound/wm8753.txt
create mode 100644 Documentation/devicetree/bindings/sound/wm8770.txt
create mode 100644 Documentation/devicetree/bindings/sound/wm8776.txt
create mode 100644 Documentation/devicetree/bindings/sound/wm8804.txt
create mode 100644 include/sound/adau1373.h
create mode 100644 include/sound/saif.h
create mode 100644 include/sound/wm1250-ev1.h
create mode 100644 include/sound/wm5100.h
delete mode 100644 sound/pci/hda/alc268_quirks.c
delete mode 100644 sound/pci/hda/alc269_quirks.c
delete mode 100644 sound/pci/hda/alc662_quirks.c
delete mode 100644 sound/pci/hda/alc680_quirks.c
delete mode 100644 sound/pci/hda/alc861_quirks.c
delete mode 100644 sound/pci/hda/alc861vd_quirks.c
create mode 100644 sound/pci/hda/hda_trace.h
create mode 100644 sound/soc/au1x/ac97c.c
create mode 100644 sound/soc/au1x/db1000.c
create mode 100644 sound/soc/au1x/dma.c
create mode 100644 sound/soc/au1x/i2sc.c
create mode 100644 sound/soc/blackfin/bfin-eval-adau1373.c
create mode 100644 sound/soc/codecs/adau1373.c
create mode 100644 sound/soc/codecs/adau1373.h
delete mode 100644 sound/soc/codecs/ads117x.h
create mode 100644 sound/soc/codecs/rt5631.c
create mode 100644 sound/soc/codecs/rt5631.h
create mode 100644 sound/soc/codecs/wm5100-tables.c
create mode 100644 sound/soc/codecs/wm5100.c
create mode 100644 sound/soc/codecs/wm5100.h
create mode 100644 sound/soc/mxs/Kconfig
create mode 100644 sound/soc/mxs/Makefile
create mode 100644 sound/soc/mxs/mxs-pcm.c
create mode 100644 sound/soc/mxs/mxs-pcm.h
create mode 100644 sound/soc/mxs/mxs-saif.c
create mode 100644 sound/soc/mxs/mxs-saif.h
create mode 100644 sound/soc/mxs/mxs-sgtl5000.c
delete mode 100644 sound/soc/omap/mcpdm.c
delete mode 100644 sound/soc/omap/mcpdm.h
create mode 100644 sound/soc/omap/omap-mcpdm.h
create mode 100644 sound/usb/stream.c
create mode 100644 sound/usb/stream.h
delete mode 100644 sound/usb/urb.c
delete mode 100644 sound/usb/urb.h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-11-04 9:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-11-04 9:46 [GIT PULL] sound updates for 3.2-rc1 Takashi Iwai
-- strict thread matches above, loose matches on Subject: below --
2011-10-28 21:04 Takashi Iwai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).