korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-25 21:24:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

Browse Source 
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: hda - Fix initialization for HP 2011 notebooks
  ALSA: hda - Add support for VMware controller
  ALSA: hda - consitify string arrays
  ALSA: hda - Add add multi-streaming playback for AD1988
  ASoC: EP93xx: fixed LRCLK rate and DMA oper. in I2S code
  ASoC: WM8990: msleep() takes milliseconds not jiffies
  ALSA : au88x0 - Limit number of channels to fix Oops via OSS emu
  ALSA: constify functions in ac97
  ASoC: WL1273 FM radio: Fix breakage with MFD API changes
  ALSA: hda - More coverage for odd-number channels elimination for HDMI
  ALSA: hda - Store PCM parameters properly in HDMI open callback
  ALSA: hda - Rearrange fixup struct in patch_realtek.c
  ALSA: oxygen: Xonar DG: fix CS4245 register writes
  ALSA: hda - Suppress the odd number of channels for HDMI
  ALSA: hda - Add fixup-call in init callback
  ALSA: hda - Reorganize fixup structure for Realtek
  ALSA: hda - Apply Sony VAIO hweq fixup only once
  ALSA: hda - Apply mario fixup only once
  ALSA: hda - Remove unused fixup entry for ALC262
This commit is contained in:
Linus Torvalds 2011-01-18 08:05:50 -08:00
commit b7c15e4a1c
23 changed files with 579 additions and 396 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sound/ac97_codec.h
View File

@ -477,7 +477,7 @@ struct snd_ac97_template {
struct snd_ac97 { struct snd_ac97 {
/* -- lowlevel (hardware) driver specific -- */ /* -- lowlevel (hardware) driver specific -- */
struct snd_ac97_build_ops * build_ops; const struct snd_ac97_build_ops *build_ops;
void *private_data; void *private_data;
void (*private_free) (struct snd_ac97 *ac97); void (*private_free) (struct snd_ac97 *ac97);
/* --- */ /* --- */

2
sound/pci/ac97/ac97_codec.c
View File

@ -1961,7 +1961,7 @@ static int snd_ac97_dev_disconnect(struct snd_device *device)
} }
/* build_ops to do nothing */ /* build_ops to do nothing */
static struct snd_ac97_build_ops null_build_ops; static const struct snd_ac97_build_ops null_build_ops;
#ifdef CONFIG_SND_AC97_POWER_SAVE #ifdef CONFIG_SND_AC97_POWER_SAVE
static void do_update_power(struct work_struct *work) static void do_update_power(struct work_struct *work)

62
sound/pci/ac97/ac97_patch.c
View File

@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spdif(struct snd_ac97 *ac97)
return 0; return 0;
} }
static struct snd_ac97_build_ops patch_yamaha_ymf743_ops = { static const struct snd_ac97_build_ops patch_yamaha_ymf743_ops = {
.build_spdif = patch_yamaha_ymf743_build_spdif, .build_spdif = patch_yamaha_ymf743_build_spdif,
.build_3d = patch_yamaha_ymf7x3_3d, .build_3d = patch_yamaha_ymf7x3_3d,
}; };
@ -455,7 +455,7 @@ static int patch_yamaha_ymf753_post_spdif(struct snd_ac97 * ac97)
return 0; return 0;
} }
static struct snd_ac97_build_ops patch_yamaha_ymf753_ops = { static const struct snd_ac97_build_ops patch_yamaha_ymf753_ops = {
.build_3d = patch_yamaha_ymf7x3_3d, .build_3d = patch_yamaha_ymf7x3_3d,
.build_post_spdif = patch_yamaha_ymf753_post_spdif .build_post_spdif = patch_yamaha_ymf753_post_spdif
}; };
@ -502,7 +502,7 @@ static int patch_wolfson_wm9703_specific(struct snd_ac97 * ac97)
return 0; return 0;
} }
static struct snd_ac97_build_ops patch_wolfson_wm9703_ops = { static const struct snd_ac97_build_ops patch_wolfson_wm9703_ops = {
.build_specific = patch_wolfson_wm9703_specific, .build_specific = patch_wolfson_wm9703_specific,
}; };
@ -533,7 +533,7 @@ static int patch_wolfson_wm9704_specific(struct snd_ac97 * ac97)
return 0; return 0;
} }
static struct snd_ac97_build_ops patch_wolfson_wm9704_ops = { static const struct snd_ac97_build_ops patch_wolfson_wm9704_ops = {
.build_specific = patch_wolfson_wm9704_specific, .build_specific = patch_wolfson_wm9704_specific,
}; };
@ -677,7 +677,7 @@ static int patch_wolfson_wm9711_specific(struct snd_ac97 * ac97)
return 0; return 0;
} }
static struct snd_ac97_build_ops patch_wolfson_wm9711_ops = { static const struct snd_ac97_build_ops patch_wolfson_wm9711_ops = {
.build_specific = patch_wolfson_wm9711_specific, .build_specific = patch_wolfson_wm9711_specific,
}; };
@ -871,7 +871,7 @@ static void patch_wolfson_wm9713_resume (struct snd_ac97 * ac97)
} }
#endif #endif
static struct snd_ac97_build_ops patch_wolfson_wm9713_ops = { static const struct snd_ac97_build_ops patch_wolfson_wm9713_ops = {
.build_specific = patch_wolfson_wm9713_specific, .build_specific = patch_wolfson_wm9713_specific,
.build_3d = patch_wolfson_wm9713_3d, .build_3d = patch_wolfson_wm9713_3d,
#ifdef CONFIG_PM #ifdef CONFIG_PM
@ -976,7 +976,7 @@ static int patch_sigmatel_stac97xx_specific(struct snd_ac97 * ac97)
return 0; return 0;
} }
static struct snd_ac97_build_ops patch_sigmatel_stac9700_ops = { static const struct snd_ac97_build_ops patch_sigmatel_stac9700_ops = {
.build_3d = patch_sigmatel_stac9700_3d, .build_3d = patch_sigmatel_stac9700_3d,
.build_specific = patch_sigmatel_stac97xx_specific .build_specific = patch_sigmatel_stac97xx_specific
}; };
@ -1023,7 +1023,7 @@ static int patch_sigmatel_stac9708_specific(struct snd_ac97 *ac97)
return patch_sigmatel_stac97xx_specific(ac97); return patch_sigmatel_stac97xx_specific(ac97);
} }
static struct snd_ac97_build_ops patch_sigmatel_stac9708_ops = { static const struct snd_ac97_build_ops patch_sigmatel_stac9708_ops = {
.build_3d = patch_sigmatel_stac9708_3d, .build_3d = patch_sigmatel_stac9708_3d,
.build_specific = patch_sigmatel_stac9708_specific .build_specific = patch_sigmatel_stac9708_specific
}; };
@ -1252,7 +1252,7 @@ static int patch_sigmatel_stac9758_specific(struct snd_ac97 *ac97)
return 0; return 0;
} }
static struct snd_ac97_build_ops patch_sigmatel_stac9758_ops = { static const struct snd_ac97_build_ops patch_sigmatel_stac9758_ops = {
.build_3d = patch_sigmatel_stac9700_3d, .build_3d = patch_sigmatel_stac9700_3d,
.build_specific = patch_sigmatel_stac9758_specific .build_specific = patch_sigmatel_stac9758_specific
}; };
@ -1327,7 +1327,7 @@ static int patch_cirrus_build_spdif(struct snd_ac97 * ac97)
return 0; return 0;
} }
static struct snd_ac97_build_ops patch_cirrus_ops = { static const struct snd_ac97_build_ops patch_cirrus_ops = {
.build_spdif = patch_cirrus_build_spdif .build_spdif = patch_cirrus_build_spdif
}; };
@ -1384,7 +1384,7 @@ static int patch_conexant_build_spdif(struct snd_ac97 * ac97)
return 0; return 0;
} }
static struct snd_ac97_build_ops patch_conexant_ops = { static const struct snd_ac97_build_ops patch_conexant_ops = {
.build_spdif = patch_conexant_build_spdif .build_spdif = patch_conexant_build_spdif
}; };
@ -1560,7 +1560,7 @@ static void patch_ad1881_chained(struct snd_ac97 * ac97, int unchained_idx, int
} }
} }
static struct snd_ac97_build_ops patch_ad1881_build_ops = { static const struct snd_ac97_build_ops patch_ad1881_build_ops = {
#ifdef CONFIG_PM #ifdef CONFIG_PM
.resume = ad18xx_resume .resume = ad18xx_resume
#endif #endif
@ -1647,7 +1647,7 @@ static int patch_ad1885_specific(struct snd_ac97 * ac97)
return 0; return 0;
} }
static struct snd_ac97_build_ops patch_ad1885_build_ops = { static const struct snd_ac97_build_ops patch_ad1885_build_ops = {
.build_specific = &patch_ad1885_specific, .build_specific = &patch_ad1885_specific,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.resume = ad18xx_resume .resume = ad18xx_resume
@ -1674,7 +1674,7 @@ static int patch_ad1886_specific(struct snd_ac97 * ac97)
return 0; return 0;
} }
static struct snd_ac97_build_ops patch_ad1886_build_ops = { static const struct snd_ac97_build_ops patch_ad1886_build_ops = {
.build_specific = &patch_ad1886_specific, .build_specific = &patch_ad1886_specific,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.resume = ad18xx_resume .resume = ad18xx_resume
@ -1881,7 +1881,7 @@ static int patch_ad1981a_specific(struct snd_ac97 * ac97)
ARRAY_SIZE(snd_ac97_ad1981x_jack_sense)); ARRAY_SIZE(snd_ac97_ad1981x_jack_sense));
} }
static struct snd_ac97_build_ops patch_ad1981a_build_ops = { static const struct snd_ac97_build_ops patch_ad1981a_build_ops = {
.build_post_spdif = patch_ad198x_post_spdif, .build_post_spdif = patch_ad198x_post_spdif,
.build_specific = patch_ad1981a_specific, .build_specific = patch_ad1981a_specific,
#ifdef CONFIG_PM #ifdef CONFIG_PM
@ -1936,7 +1936,7 @@ static int patch_ad1981b_specific(struct snd_ac97 *ac97)
ARRAY_SIZE(snd_ac97_ad1981x_jack_sense)); ARRAY_SIZE(snd_ac97_ad1981x_jack_sense));
} }
static struct snd_ac97_build_ops patch_ad1981b_build_ops = { static const struct snd_ac97_build_ops patch_ad1981b_build_ops = {
.build_post_spdif = patch_ad198x_post_spdif, .build_post_spdif = patch_ad198x_post_spdif,
.build_specific = patch_ad1981b_specific, .build_specific = patch_ad1981b_specific,
#ifdef CONFIG_PM #ifdef CONFIG_PM
@ -2075,7 +2075,7 @@ static int patch_ad1888_specific(struct snd_ac97 *ac97)
return patch_build_controls(ac97, snd_ac97_ad1888_controls, ARRAY_SIZE(snd_ac97_ad1888_controls)); return patch_build_controls(ac97, snd_ac97_ad1888_controls, ARRAY_SIZE(snd_ac97_ad1888_controls));
} }
static struct snd_ac97_build_ops patch_ad1888_build_ops = { static const struct snd_ac97_build_ops patch_ad1888_build_ops = {
.build_post_spdif = patch_ad198x_post_spdif, .build_post_spdif = patch_ad198x_post_spdif,
.build_specific = patch_ad1888_specific, .build_specific = patch_ad1888_specific,
#ifdef CONFIG_PM #ifdef CONFIG_PM
@ -2124,7 +2124,7 @@ static int patch_ad1980_specific(struct snd_ac97 *ac97)
return patch_build_controls(ac97, &snd_ac97_ad198x_2cmic, 1); return patch_build_controls(ac97, &snd_ac97_ad198x_2cmic, 1);
} }
static struct snd_ac97_build_ops patch_ad1980_build_ops = { static const struct snd_ac97_build_ops patch_ad1980_build_ops = {
.build_post_spdif = patch_ad198x_post_spdif, .build_post_spdif = patch_ad198x_post_spdif,
.build_specific = patch_ad1980_specific, .build_specific = patch_ad1980_specific,
#ifdef CONFIG_PM #ifdef CONFIG_PM
@ -2239,7 +2239,7 @@ static int patch_ad1985_specific(struct snd_ac97 *ac97)
ARRAY_SIZE(snd_ac97_ad1985_controls)); ARRAY_SIZE(snd_ac97_ad1985_controls));
} }
static struct snd_ac97_build_ops patch_ad1985_build_ops = { static const struct snd_ac97_build_ops patch_ad1985_build_ops = {
.build_post_spdif = patch_ad198x_post_spdif, .build_post_spdif = patch_ad198x_post_spdif,
.build_specific = patch_ad1985_specific, .build_specific = patch_ad1985_specific,
#ifdef CONFIG_PM #ifdef CONFIG_PM
@ -2531,7 +2531,7 @@ static int patch_ad1986_specific(struct snd_ac97 *ac97)
ARRAY_SIZE(snd_ac97_ad1985_controls)); ARRAY_SIZE(snd_ac97_ad1985_controls));
} }
static struct snd_ac97_build_ops patch_ad1986_build_ops = { static const struct snd_ac97_build_ops patch_ad1986_build_ops = {
.build_post_spdif = patch_ad198x_post_spdif, .build_post_spdif = patch_ad198x_post_spdif,
.build_specific = patch_ad1986_specific, .build_specific = patch_ad1986_specific,
#ifdef CONFIG_PM #ifdef CONFIG_PM
@ -2636,7 +2636,7 @@ static int patch_alc650_specific(struct snd_ac97 * ac97)
return 0; return 0;
} }
static struct snd_ac97_build_ops patch_alc650_ops = { static const struct snd_ac97_build_ops patch_alc650_ops = {
.build_specific = patch_alc650_specific, .build_specific = patch_alc650_specific,
.update_jacks = alc650_update_jacks .update_jacks = alc650_update_jacks
}; };
@ -2788,7 +2788,7 @@ static int patch_alc655_specific(struct snd_ac97 * ac97)
return 0; return 0;
} }
static struct snd_ac97_build_ops patch_alc655_ops = { static const struct snd_ac97_build_ops patch_alc655_ops = {
.build_specific = patch_alc655_specific, .build_specific = patch_alc655_specific,
.update_jacks = alc655_update_jacks .update_jacks = alc655_update_jacks
}; };
@ -2900,7 +2900,7 @@ static int patch_alc850_specific(struct snd_ac97 *ac97)
return 0; return 0;
} }
static struct snd_ac97_build_ops patch_alc850_ops = { static const struct snd_ac97_build_ops patch_alc850_ops = {
.build_specific = patch_alc850_specific, .build_specific = patch_alc850_specific,
.update_jacks = alc850_update_jacks .update_jacks = alc850_update_jacks
}; };
@ -2962,7 +2962,7 @@ static int patch_cm9738_specific(struct snd_ac97 * ac97)
return patch_build_controls(ac97, snd_ac97_cm9738_controls, ARRAY_SIZE(snd_ac97_cm9738_controls)); return patch_build_controls(ac97, snd_ac97_cm9738_controls, ARRAY_SIZE(snd_ac97_cm9738_controls));
} }
static struct snd_ac97_build_ops patch_cm9738_ops = { static const struct snd_ac97_build_ops patch_cm9738_ops = {
.build_specific = patch_cm9738_specific, .build_specific = patch_cm9738_specific,
.update_jacks = cm9738_update_jacks .update_jacks = cm9738_update_jacks
}; };
@ -3053,7 +3053,7 @@ static int patch_cm9739_post_spdif(struct snd_ac97 * ac97)
return patch_build_controls(ac97, snd_ac97_cm9739_controls_spdif, ARRAY_SIZE(snd_ac97_cm9739_controls_spdif)); return patch_build_controls(ac97, snd_ac97_cm9739_controls_spdif, ARRAY_SIZE(snd_ac97_cm9739_controls_spdif));
} }
static struct snd_ac97_build_ops patch_cm9739_ops = { static const struct snd_ac97_build_ops patch_cm9739_ops = {
.build_specific = patch_cm9739_specific, .build_specific = patch_cm9739_specific,
.build_post_spdif = patch_cm9739_post_spdif, .build_post_spdif = patch_cm9739_post_spdif,
.update_jacks = cm9739_update_jacks .update_jacks = cm9739_update_jacks
@ -3227,7 +3227,7 @@ static int patch_cm9761_specific(struct snd_ac97 * ac97)
return patch_build_controls(ac97, snd_ac97_cm9761_controls, ARRAY_SIZE(snd_ac97_cm9761_controls)); return patch_build_controls(ac97, snd_ac97_cm9761_controls, ARRAY_SIZE(snd_ac97_cm9761_controls));
} }
static struct snd_ac97_build_ops patch_cm9761_ops = { static const struct snd_ac97_build_ops patch_cm9761_ops = {
.build_specific = patch_cm9761_specific, .build_specific = patch_cm9761_specific,
.build_post_spdif = patch_cm9761_post_spdif, .build_post_spdif = patch_cm9761_post_spdif,
.update_jacks = cm9761_update_jacks .update_jacks = cm9761_update_jacks
@ -3323,7 +3323,7 @@ static int patch_cm9780_specific(struct snd_ac97 *ac97)
return patch_build_controls(ac97, cm9780_controls, ARRAY_SIZE(cm9780_controls)); return patch_build_controls(ac97, cm9780_controls, ARRAY_SIZE(cm9780_controls));
} }
static struct snd_ac97_build_ops patch_cm9780_ops = { static const struct snd_ac97_build_ops patch_cm9780_ops = {
.build_specific = patch_cm9780_specific, .build_specific = patch_cm9780_specific,
.build_post_spdif = patch_cm9761_post_spdif /* identical with CM9761 */ .build_post_spdif = patch_cm9761_post_spdif /* identical with CM9761 */
}; };
@ -3443,7 +3443,7 @@ static int patch_vt1616_specific(struct snd_ac97 * ac97)
return 0; return 0;
} }
static struct snd_ac97_build_ops patch_vt1616_ops = { static const struct snd_ac97_build_ops patch_vt1616_ops = {
.build_specific = patch_vt1616_specific .build_specific = patch_vt1616_specific
}; };
@ -3797,7 +3797,7 @@ static int patch_it2646_specific(struct snd_ac97 * ac97)
return 0; return 0;
} }
static struct snd_ac97_build_ops patch_it2646_ops = { static const struct snd_ac97_build_ops patch_it2646_ops = {
.build_specific = patch_it2646_specific, .build_specific = patch_it2646_specific,
.update_jacks = it2646_update_jacks .update_jacks = it2646_update_jacks
}; };
@ -3831,7 +3831,7 @@ static int patch_si3036_specific(struct snd_ac97 * ac97)
return 0; return 0;
} }
static struct snd_ac97_build_ops patch_si3036_ops = { static const struct snd_ac97_build_ops patch_si3036_ops = {
.build_specific = patch_si3036_specific, .build_specific = patch_si3036_specific,
}; };
@ -3898,7 +3898,7 @@ static int patch_ucb1400_specific(struct snd_ac97 * ac97)
return 0; return 0;
} }
static struct snd_ac97_build_ops patch_ucb1400_ops = { static const struct snd_ac97_build_ops patch_ucb1400_ops = {
.build_specific = patch_ucb1400_specific, .build_specific = patch_ucb1400_specific,
}; };

24
sound/pci/au88x0/au88x0_pcm.c
View File

@ -42,11 +42,7 @@ static struct snd_pcm_hardware snd_vortex_playback_hw_adb = {
.rate_min = 5000, .rate_min = 5000,
.rate_max = 48000, .rate_max = 48000,
.channels_min = 1, .channels_min = 1,
#ifdef CHIP_AU8830
.channels_max = 4,
#else
.channels_max = 2, .channels_max = 2,
#endif
.buffer_bytes_max = 0x10000, .buffer_bytes_max = 0x10000,
.period_bytes_min = 0x1, .period_bytes_min = 0x1,
.period_bytes_max = 0x1000, .period_bytes_max = 0x1000,
@ -115,6 +111,17 @@ static struct snd_pcm_hardware snd_vortex_playback_hw_wt = {
.periods_max = 64, .periods_max = 64,
}; };
#endif #endif
#ifdef CHIP_AU8830
static unsigned int au8830_channels[3] = {
1, 2, 4,
};
static struct snd_pcm_hw_constraint_list hw_constraints_au8830_channels = {
.count = ARRAY_SIZE(au8830_channels),
.list = au8830_channels,
.mask = 0,
};
#endif
/* open callback */ /* open callback */
static int snd_vortex_pcm_open(struct snd_pcm_substream *substream) static int snd_vortex_pcm_open(struct snd_pcm_substream *substream)
{ {
@ -156,6 +163,15 @@ static int snd_vortex_pcm_open(struct snd_pcm_substream *substream)
if (VORTEX_PCM_TYPE(substream->pcm) == VORTEX_PCM_ADB if (VORTEX_PCM_TYPE(substream->pcm) == VORTEX_PCM_ADB
|| VORTEX_PCM_TYPE(substream->pcm) == VORTEX_PCM_I2S) || VORTEX_PCM_TYPE(substream->pcm) == VORTEX_PCM_I2S)
runtime->hw = snd_vortex_playback_hw_adb; runtime->hw = snd_vortex_playback_hw_adb;
#ifdef CHIP_AU8830
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK &&
VORTEX_PCM_TYPE(substream->pcm) == VORTEX_PCM_ADB) {
runtime->hw.channels_max = 4;
snd_pcm_hw_constraint_list(runtime, 0,
SNDRV_PCM_HW_PARAM_CHANNELS,
&hw_constraints_au8830_channels);
}
#endif
substream->runtime->private_data = NULL; substream->runtime->private_data = NULL;
} }
#ifndef CHIP_AU8810 #ifndef CHIP_AU8810

10
sound/pci/hda/hda_codec.c
View File

@ -2134,10 +2134,10 @@ int snd_hda_codec_reset(struct hda_codec *codec)
* This function returns zero if successful or a negative error code. * This function returns zero if successful or a negative error code.
*/ */
int snd_hda_add_vmaster(struct hda_codec *codec, char *name, int snd_hda_add_vmaster(struct hda_codec *codec, char *name,
unsigned int *tlv, const char **slaves) unsigned int *tlv, const char * const *slaves)
{ {
struct snd_kcontrol *kctl; struct snd_kcontrol *kctl;
const char **s; const char * const *s;
int err; int err;
for (s = slaves; *s && !snd_hda_find_mixer_ctl(codec, *s); s++) for (s = slaves; *s && !snd_hda_find_mixer_ctl(codec, *s); s++)
@ -3689,7 +3689,7 @@ EXPORT_SYMBOL_HDA(snd_hda_build_pcms);
* If no entries are matching, the function returns a negative value. * If no entries are matching, the function returns a negative value.
*/ */
int snd_hda_check_board_config(struct hda_codec *codec, int snd_hda_check_board_config(struct hda_codec *codec,
int num_configs, const char **models, int num_configs, const char * const *models,
const struct snd_pci_quirk *tbl) const struct snd_pci_quirk *tbl)
{ {
if (codec->modelname && models) { if (codec->modelname && models) {
@ -3753,7 +3753,7 @@ EXPORT_SYMBOL_HDA(snd_hda_check_board_config);
* If no entries are matching, the function returns a negative value. * If no entries are matching, the function returns a negative value.
*/ */
int snd_hda_check_board_codec_sid_config(struct hda_codec *codec, int snd_hda_check_board_codec_sid_config(struct hda_codec *codec,
int num_configs, const char **models, int num_configs, const char * const *models,
const struct snd_pci_quirk *tbl) const struct snd_pci_quirk *tbl)
{ {
const struct snd_pci_quirk *q; const struct snd_pci_quirk *q;
@ -4690,7 +4690,7 @@ const char *hda_get_input_pin_label(struct hda_codec *codec, hda_nid_t pin,
int check_location) int check_location)
{ {
unsigned int def_conf; unsigned int def_conf;
static const char *mic_names[] = { static const char * const mic_names[] = {
"Internal Mic", "Dock Mic", "Mic", "Front Mic", "Rear Mic", "Internal Mic", "Dock Mic", "Mic", "Front Mic", "Rear Mic",
}; };
int attr; int attr;

7
sound/pci/hda/hda_generic.c
View File

@ -762,7 +762,8 @@ static int check_existing_control(struct hda_codec *codec, const char *type, con
/* /*
* build output mixer controls * build output mixer controls
*/ */
static int create_output_mixers(struct hda_codec *codec, const char **names) static int create_output_mixers(struct hda_codec *codec,
const char * const *names)
{ {
struct hda_gspec *spec = codec->spec; struct hda_gspec *spec = codec->spec;
int i, err; int i, err;
@ -780,8 +781,8 @@ static int create_output_mixers(struct hda_codec *codec, const char **names)
static int build_output_controls(struct hda_codec *codec) static int build_output_controls(struct hda_codec *codec)
{ {
struct hda_gspec *spec = codec->spec; struct hda_gspec *spec = codec->spec;
static const char *types_speaker[] = { "Speaker", "Headphone" }; static const char * const types_speaker[] = { "Speaker", "Headphone" };
static const char *types_line[] = { "Front", "Headphone" }; static const char * const types_line[] = { "Front", "Headphone" };
switch (spec->pcm_vol_nodes) { switch (spec->pcm_vol_nodes) {
case 1: case 1:

2
sound/pci/hda/hda_intel.c
View File

@ -2809,6 +2809,8 @@ static DEFINE_PCI_DEVICE_TABLE(azx_ids) = {
#endif #endif
/* Vortex86MX */ /* Vortex86MX */
{ PCI_DEVICE(0x17f3, 0x3010), .driver_data = AZX_DRIVER_GENERIC }, { PCI_DEVICE(0x17f3, 0x3010), .driver_data = AZX_DRIVER_GENERIC },
/* VMware HDAudio */
{ PCI_DEVICE(0x15ad, 0x1977), .driver_data = AZX_DRIVER_GENERIC },
/* AMD/ATI Generic, PCI class code and Vendor ID for HD Audio */ /* AMD/ATI Generic, PCI class code and Vendor ID for HD Audio */
{ PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_ANY_ID), { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_ANY_ID),
.class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8, .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8,

6
sound/pci/hda/hda_local.h
View File

@ -140,7 +140,7 @@ void snd_hda_set_vmaster_tlv(struct hda_codec *codec, hda_nid_t nid, int dir,
struct snd_kcontrol *snd_hda_find_mixer_ctl(struct hda_codec *codec, struct snd_kcontrol *snd_hda_find_mixer_ctl(struct hda_codec *codec,
const char *name); const char *name);
int snd_hda_add_vmaster(struct hda_codec *codec, char *name, int snd_hda_add_vmaster(struct hda_codec *codec, char *name,
unsigned int *tlv, const char **slaves); unsigned int *tlv, const char * const *slaves);
int snd_hda_codec_reset(struct hda_codec *codec); int snd_hda_codec_reset(struct hda_codec *codec);
/* amp value bits */ /* amp value bits */
@ -341,10 +341,10 @@ void snd_print_pcm_bits(int pcm, char *buf, int buflen);
* Misc * Misc
*/ */
int snd_hda_check_board_config(struct hda_codec *codec, int num_configs, int snd_hda_check_board_config(struct hda_codec *codec, int num_configs,
const char **modelnames, const char * const *modelnames,
const struct snd_pci_quirk *pci_list); const struct snd_pci_quirk *pci_list);
int snd_hda_check_board_codec_sid_config(struct hda_codec *codec, int snd_hda_check_board_codec_sid_config(struct hda_codec *codec,
int num_configs, const char **models, int num_configs, const char * const *models,
const struct snd_pci_quirk *tbl); const struct snd_pci_quirk *tbl);
int snd_hda_add_new_ctls(struct hda_codec *codec, int snd_hda_add_new_ctls(struct hda_codec *codec,
struct snd_kcontrol_new *knew); struct snd_kcontrol_new *knew);

2
sound/pci/hda/hda_proc.c
View File

@ -418,7 +418,7 @@ static void print_digital_conv(struct snd_info_buffer *buffer,
static const char *get_pwr_state(u32 state) static const char *get_pwr_state(u32 state)
{ {
static const char *buf[4] = { static const char * const buf[4] = {
"D0", "D1", "D2", "D3" "D0", "D1", "D2", "D3"
}; };
if (state < 4) if (state < 4)

208
sound/pci/hda/patch_analog.c
View File

@ -46,6 +46,9 @@ struct ad198x_spec {
unsigned int cur_eapd; unsigned int cur_eapd;
unsigned int need_dac_fix; unsigned int need_dac_fix;
hda_nid_t *alt_dac_nid;
struct hda_pcm_stream *stream_analog_alt_playback;
/* capture */ /* capture */
unsigned int num_adc_nids; unsigned int num_adc_nids;
hda_nid_t *adc_nids; hda_nid_t *adc_nids;
@ -81,8 +84,8 @@ struct ad198x_spec {
#endif #endif
/* for virtual master */ /* for virtual master */
hda_nid_t vmaster_nid; hda_nid_t vmaster_nid;
const char **slave_vols; const char * const *slave_vols;
const char **slave_sws; const char * const *slave_sws;
}; };
/* /*
@ -130,7 +133,7 @@ static int ad198x_init(struct hda_codec *codec)
return 0; return 0;
} }
static const char *ad_slave_vols[] = { static const char * const ad_slave_vols[] = {
"Front Playback Volume", "Front Playback Volume",
"Surround Playback Volume", "Surround Playback Volume",
"Center Playback Volume", "Center Playback Volume",
@ -143,7 +146,7 @@ static const char *ad_slave_vols[] = {
NULL NULL
}; };
static const char *ad_slave_sws[] = { static const char * const ad_slave_sws[] = {
"Front Playback Switch", "Front Playback Switch",
"Surround Playback Switch", "Surround Playback Switch",
"Center Playback Switch", "Center Playback Switch",
@ -156,6 +159,25 @@ static const char *ad_slave_sws[] = {
NULL NULL
}; };
static const char * const ad1988_6stack_fp_slave_vols[] = {
"Front Playback Volume",
"Surround Playback Volume",
"Center Playback Volume",
"LFE Playback Volume",
"Side Playback Volume",
"IEC958 Playback Volume",
NULL
};
static const char * const ad1988_6stack_fp_slave_sws[] = {
"Front Playback Switch",
"Surround Playback Switch",
"Center Playback Switch",
"LFE Playback Switch",
"Side Playback Switch",
"IEC958 Playback Switch",
NULL
};
static void ad198x_free_kctls(struct hda_codec *codec); static void ad198x_free_kctls(struct hda_codec *codec);
#ifdef CONFIG_SND_HDA_INPUT_BEEP #ifdef CONFIG_SND_HDA_INPUT_BEEP
@ -309,6 +331,38 @@ static int ad198x_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,
return snd_hda_multi_out_analog_cleanup(codec, &spec->multiout); return snd_hda_multi_out_analog_cleanup(codec, &spec->multiout);
} }
static int ad198x_alt_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
struct hda_codec *codec,
unsigned int stream_tag,
unsigned int format,
struct snd_pcm_substream *substream)
{
struct ad198x_spec *spec = codec->spec;
snd_hda_codec_setup_stream(codec, spec->alt_dac_nid[0], stream_tag,
0, format);
return 0;
}
static int ad198x_alt_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,
struct hda_codec *codec,
struct snd_pcm_substream *substream)
{
struct ad198x_spec *spec = codec->spec;
snd_hda_codec_cleanup_stream(codec, spec->alt_dac_nid[0]);
return 0;
}
static struct hda_pcm_stream ad198x_pcm_analog_alt_playback = {
.substreams = 1,
.channels_min = 2,
.channels_max = 2,
/* NID is set in ad198x_build_pcms */
.ops = {
.prepare = ad198x_alt_playback_pcm_prepare,
.cleanup = ad198x_alt_playback_pcm_cleanup
},
};
/* /*
* Digital out * Digital out
*/ */
@ -446,6 +500,17 @@ static int ad198x_build_pcms(struct hda_codec *codec)
} }
} }
if (spec->alt_dac_nid && spec->stream_analog_alt_playback) {
codec->num_pcms++;
info = spec->pcm_rec + 2;
info->name = "AD198x Headphone";
info->pcm_type = HDA_PCM_TYPE_AUDIO;
info->stream[SNDRV_PCM_STREAM_PLAYBACK] =
*spec->stream_analog_alt_playback;
info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid =
spec->alt_dac_nid[0];
}
return 0; return 0;
} }
@ -1069,7 +1134,7 @@ enum {
AD1986A_MODELS AD1986A_MODELS
}; };
static const char *ad1986a_models[AD1986A_MODELS] = { static const char * const ad1986a_models[AD1986A_MODELS] = {
[AD1986A_6STACK] = "6stack", [AD1986A_6STACK] = "6stack",
[AD1986A_3STACK] = "3stack", [AD1986A_3STACK] = "3stack",
[AD1986A_LAPTOP] = "laptop", [AD1986A_LAPTOP] = "laptop",
@ -1813,7 +1878,7 @@ enum {
AD1981_MODELS AD1981_MODELS
}; };
static const char *ad1981_models[AD1981_MODELS] = { static const char * const ad1981_models[AD1981_MODELS] = {
[AD1981_HP] = "hp", [AD1981_HP] = "hp",
[AD1981_THINKPAD] = "thinkpad", [AD1981_THINKPAD] = "thinkpad",
[AD1981_BASIC] = "basic", [AD1981_BASIC] = "basic",
@ -2015,6 +2080,7 @@ static int patch_ad1981(struct hda_codec *codec)
enum { enum {
AD1988_6STACK, AD1988_6STACK,
AD1988_6STACK_DIG, AD1988_6STACK_DIG,
AD1988_6STACK_DIG_FP,
AD1988_3STACK, AD1988_3STACK,
AD1988_3STACK_DIG, AD1988_3STACK_DIG,
AD1988_LAPTOP, AD1988_LAPTOP,
@ -2047,6 +2113,10 @@ static hda_nid_t ad1988_6stack_dac_nids_rev2[4] = {
0x04, 0x05, 0x0a, 0x06 0x04, 0x05, 0x0a, 0x06
}; };
static hda_nid_t ad1988_alt_dac_nid[1] = {
0x03
};
static hda_nid_t ad1988_3stack_dac_nids_rev2[3] = { static hda_nid_t ad1988_3stack_dac_nids_rev2[3] = {
0x04, 0x0a, 0x06 0x04, 0x0a, 0x06
}; };
@ -2166,6 +2236,35 @@ static struct snd_kcontrol_new ad1988_6stack_mixers2[] = {
{ } /* end */ { } /* end */
}; };
static struct snd_kcontrol_new ad1988_6stack_fp_mixers[] = {
HDA_CODEC_VOLUME("Headphone Playback Volume", 0x03, 0x0, HDA_OUTPUT),
HDA_BIND_MUTE("Front Playback Switch", 0x29, 2, HDA_INPUT),
HDA_BIND_MUTE("Surround Playback Switch", 0x2a, 2, HDA_INPUT),
HDA_BIND_MUTE_MONO("Center Playback Switch", 0x27, 1, 2, HDA_INPUT),
HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x27, 2, 2, HDA_INPUT),
HDA_BIND_MUTE("Side Playback Switch", 0x28, 2, HDA_INPUT),
HDA_BIND_MUTE("Headphone Playback Switch", 0x22, 2, HDA_INPUT),
HDA_BIND_MUTE("Mono Playback Switch", 0x1e, 2, HDA_INPUT),
HDA_CODEC_VOLUME("CD Playback Volume", 0x20, 0x6, HDA_INPUT),
HDA_CODEC_MUTE("CD Playback Switch", 0x20, 0x6, HDA_INPUT),
HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x20, 0x0, HDA_INPUT),
HDA_CODEC_MUTE("Front Mic Playback Switch", 0x20, 0x0, HDA_INPUT),
HDA_CODEC_VOLUME("Line Playback Volume", 0x20, 0x1, HDA_INPUT),
HDA_CODEC_MUTE("Line Playback Switch", 0x20, 0x1, HDA_INPUT),
HDA_CODEC_VOLUME("Mic Playback Volume", 0x20, 0x4, HDA_INPUT),
HDA_CODEC_MUTE("Mic Playback Switch", 0x20, 0x4, HDA_INPUT),
HDA_CODEC_VOLUME("Analog Mix Playback Volume", 0x21, 0x0, HDA_OUTPUT),
HDA_CODEC_MUTE("Analog Mix Playback Switch", 0x21, 0x0, HDA_OUTPUT),
HDA_CODEC_VOLUME("Front Mic Boost Volume", 0x39, 0x0, HDA_OUTPUT),
HDA_CODEC_VOLUME("Mic Boost Volume", 0x3c, 0x0, HDA_OUTPUT),
{ } /* end */
};
/* 3-stack mode */ /* 3-stack mode */
static struct snd_kcontrol_new ad1988_3stack_mixers1[] = { static struct snd_kcontrol_new ad1988_3stack_mixers1[] = {
HDA_CODEC_VOLUME("Front Playback Volume", 0x04, 0x0, HDA_OUTPUT), HDA_CODEC_VOLUME("Front Playback Volume", 0x04, 0x0, HDA_OUTPUT),
@ -2445,6 +2544,68 @@ static struct hda_verb ad1988_6stack_init_verbs[] = {
{ } { }
}; };
static struct hda_verb ad1988_6stack_fp_init_verbs[] = {
/* Front, Surround, CLFE, side DAC; unmute as default */
{0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
{0x06, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
{0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
/* Headphone; unmute as default */
{0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
/* Port-A front headphon path */
{0x37, AC_VERB_SET_CONNECT_SEL, 0x00}, /* DAC0:03h */
{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
{0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
{0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
/* Port-D line-out path */
{0x29, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
{0x29, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
{0x12, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
/* Port-F surround path */
{0x2a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
{0x2a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
/* Port-G CLFE path */
{0x27, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
{0x27, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
{0x24, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
/* Port-H side path */
{0x28, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
{0x28, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
{0x25, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
{0x25, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
/* Mono out path */
{0x36, AC_VERB_SET_CONNECT_SEL, 0x1}, /* DAC1:04h */
{0x1e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
{0x1e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
{0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
{0x13, AC_VERB_SET_AMP_GAIN_MUTE, 0xb01f}, /* unmute, 0dB */
/* Port-B front mic-in path */
{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
{0x39, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
/* Port-C line-in path */
{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
{0x3a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
{0x33, AC_VERB_SET_CONNECT_SEL, 0x0},
/* Port-E mic-in path */
{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
{0x3c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
{0x34, AC_VERB_SET_CONNECT_SEL, 0x0},
/* Analog CD Input */
{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
/* Analog Mix output amp */
{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE | 0x1f}, /* 0dB */
{ }
};
static struct hda_verb ad1988_capture_init_verbs[] = { static struct hda_verb ad1988_capture_init_verbs[] = {
/* mute analog mix */ /* mute analog mix */
{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, {0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
@ -2792,7 +2953,9 @@ static int ad1988_auto_create_multi_out_ctls(struct ad198x_spec *spec,
const struct auto_pin_cfg *cfg) const struct auto_pin_cfg *cfg)
{ {
char name[32]; char name[32];
static const char *chname[4] = { "Front", "Surround", NULL /*CLFE*/, "Side" }; static const char * const chname[4] = {
"Front", "Surround", NULL /*CLFE*/, "Side"
};
hda_nid_t nid; hda_nid_t nid;
int i, err; int i, err;
@ -3074,13 +3237,13 @@ static int ad1988_auto_init(struct hda_codec *codec)
return 0; return 0;
} }
/* /*
*/ */
static const char *ad1988_models[AD1988_MODEL_LAST] = { static const char * const ad1988_models[AD1988_MODEL_LAST] = {
[AD1988_6STACK] = "6stack", [AD1988_6STACK] = "6stack",
[AD1988_6STACK_DIG] = "6stack-dig", [AD1988_6STACK_DIG] = "6stack-dig",
[AD1988_6STACK_DIG_FP] = "6stack-dig-fp",
[AD1988_3STACK] = "3stack", [AD1988_3STACK] = "3stack",
[AD1988_3STACK_DIG] = "3stack-dig", [AD1988_3STACK_DIG] = "3stack-dig",
[AD1988_LAPTOP] = "laptop", [AD1988_LAPTOP] = "laptop",
@ -3140,6 +3303,7 @@ static int patch_ad1988(struct hda_codec *codec)
switch (board_config) { switch (board_config) {
case AD1988_6STACK: case AD1988_6STACK:
case AD1988_6STACK_DIG: case AD1988_6STACK_DIG:
case AD1988_6STACK_DIG_FP:
spec->multiout.max_channels = 8; spec->multiout.max_channels = 8;
spec->multiout.num_dacs = 4; spec->multiout.num_dacs = 4;
if (is_rev2(codec)) if (is_rev2(codec))
@ -3152,10 +3316,22 @@ static int patch_ad1988(struct hda_codec *codec)
spec->mixers[0] = ad1988_6stack_mixers1_rev2; spec->mixers[0] = ad1988_6stack_mixers1_rev2;
else else
spec->mixers[0] = ad1988_6stack_mixers1; spec->mixers[0] = ad1988_6stack_mixers1;
spec->mixers[1] = ad1988_6stack_mixers2; if (board_config == AD1988_6STACK_DIG_FP) {
spec->mixers[1] = ad1988_6stack_fp_mixers;
spec->slave_vols = ad1988_6stack_fp_slave_vols;
spec->slave_sws = ad1988_6stack_fp_slave_sws;
spec->alt_dac_nid = ad1988_alt_dac_nid;
spec->stream_analog_alt_playback =
&ad198x_pcm_analog_alt_playback;
} else
spec->mixers[1] = ad1988_6stack_mixers2;
spec->num_init_verbs = 1; spec->num_init_verbs = 1;
spec->init_verbs[0] = ad1988_6stack_init_verbs; if (board_config == AD1988_6STACK_DIG_FP)
if (board_config == AD1988_6STACK_DIG) { spec->init_verbs[0] = ad1988_6stack_fp_init_verbs;
else
spec->init_verbs[0] = ad1988_6stack_init_verbs;
if ((board_config == AD1988_6STACK_DIG) ||
(board_config == AD1988_6STACK_DIG_FP)) {
spec->multiout.dig_out_nid = AD1988_SPDIF_OUT; spec->multiout.dig_out_nid = AD1988_SPDIF_OUT;
spec->dig_in_nid = AD1988_SPDIF_IN; spec->dig_in_nid = AD1988_SPDIF_IN;
} }
@ -3399,7 +3575,7 @@ static struct hda_amp_list ad1884_loopbacks[] = {
}; };
#endif #endif
static const char *ad1884_slave_vols[] = { static const char * const ad1884_slave_vols[] = {
"PCM Playback Volume", "PCM Playback Volume",
"Mic Playback Volume", "Mic Playback Volume",
"Mono Playback Volume", "Mono Playback Volume",
@ -3637,7 +3813,7 @@ enum {
AD1984_MODELS AD1984_MODELS
}; };
static const char *ad1984_models[AD1984_MODELS] = { static const char * const ad1984_models[AD1984_MODELS] = {
[AD1984_BASIC] = "basic", [AD1984_BASIC] = "basic",
[AD1984_THINKPAD] = "thinkpad", [AD1984_THINKPAD] = "thinkpad",
[AD1984_DELL_DESKTOP] = "dell_desktop", [AD1984_DELL_DESKTOP] = "dell_desktop",
@ -4308,7 +4484,7 @@ enum {
AD1884A_MODELS AD1884A_MODELS
}; };
static const char *ad1884a_models[AD1884A_MODELS] = { static const char * const ad1884a_models[AD1884A_MODELS] = {
[AD1884A_DESKTOP] = "desktop", [AD1884A_DESKTOP] = "desktop",
[AD1884A_LAPTOP] = "laptop", [AD1884A_LAPTOP] = "laptop",
[AD1884A_MOBILE] = "mobile", [AD1884A_MOBILE] = "mobile",
@ -4696,7 +4872,7 @@ enum {
AD1882_MODELS AD1882_MODELS
}; };
static const char *ad1882_models[AD1986A_MODELS] = { static const char * const ad1882_models[AD1986A_MODELS] = {
[AD1882_3STACK] = "3stack", [AD1882_3STACK] = "3stack",
[AD1882_6STACK] = "6stack", [AD1882_6STACK] = "6stack",
}; };

4
sound/pci/hda/patch_cirrus.c
View File

@ -490,7 +490,7 @@ static int parse_digital_input(struct hda_codec *codec)
* create mixer controls * create mixer controls
*/ */
static const char *dir_sfx[2] = { "Playback", "Capture" }; static const char * const dir_sfx[2] = { "Playback", "Capture" };
static int add_mute(struct hda_codec *codec, const char *name, int index, static int add_mute(struct hda_codec *codec, const char *name, int index,
unsigned int pval, int dir, struct snd_kcontrol **kctlp) unsigned int pval, int dir, struct snd_kcontrol **kctlp)
@ -1156,7 +1156,7 @@ static int cs_parse_auto_config(struct hda_codec *codec)
return 0; return 0;
} }
static const char *cs420x_models[CS420X_MODELS] = { static const char * const cs420x_models[CS420X_MODELS] = {
[CS420X_MBP53] = "mbp53", [CS420X_MBP53] = "mbp53",
[CS420X_MBP55] = "mbp55", [CS420X_MBP55] = "mbp55",
[CS420X_IMAC27] = "imac27", [CS420X_IMAC27] = "imac27",

2
sound/pci/hda/patch_cmedia.c
View File

@ -608,7 +608,7 @@ static void cmi9880_free(struct hda_codec *codec)
/* /*
*/ */
static const char *cmi9880_models[CMI_MODELS] = { static const char * const cmi9880_models[CMI_MODELS] = {
[CMI_MINIMAL] = "minimal", [CMI_MINIMAL] = "minimal",
[CMI_MIN_FP] = "min_fp", [CMI_MIN_FP] = "min_fp",
[CMI_FULL] = "full", [CMI_FULL] = "full",

14
sound/pci/hda/patch_conexant.c
View File

@ -537,13 +537,13 @@ static struct snd_kcontrol_new cxt_beep_mixer[] = {
}; };
#endif #endif
static const char *slave_vols[] = { static const char * const slave_vols[] = {
"Headphone Playback Volume", "Headphone Playback Volume",
"Speaker Playback Volume", "Speaker Playback Volume",
NULL NULL
}; };
static const char *slave_sws[] = { static const char * const slave_sws[] = {
"Headphone Playback Switch", "Headphone Playback Switch",
"Speaker Playback Switch", "Speaker Playback Switch",
NULL NULL
@ -1134,7 +1134,7 @@ enum {
CXT5045_MODELS CXT5045_MODELS
}; };
static const char *cxt5045_models[CXT5045_MODELS] = { static const char * const cxt5045_models[CXT5045_MODELS] = {
[CXT5045_LAPTOP_HPSENSE] = "laptop-hpsense", [CXT5045_LAPTOP_HPSENSE] = "laptop-hpsense",
[CXT5045_LAPTOP_MICSENSE] = "laptop-micsense", [CXT5045_LAPTOP_MICSENSE] = "laptop-micsense",
[CXT5045_LAPTOP_HPMICSENSE] = "laptop-hpmicsense", [CXT5045_LAPTOP_HPMICSENSE] = "laptop-hpmicsense",
@ -1579,7 +1579,7 @@ enum {
CXT5047_MODELS CXT5047_MODELS
}; };
static const char *cxt5047_models[CXT5047_MODELS] = { static const char * const cxt5047_models[CXT5047_MODELS] = {
[CXT5047_LAPTOP] = "laptop", [CXT5047_LAPTOP] = "laptop",
[CXT5047_LAPTOP_HP] = "laptop-hp", [CXT5047_LAPTOP_HP] = "laptop-hp",
[CXT5047_LAPTOP_EAPD] = "laptop-eapd", [CXT5047_LAPTOP_EAPD] = "laptop-eapd",
@ -1995,7 +1995,7 @@ enum {
CXT5051_MODELS CXT5051_MODELS
}; };
static const char *cxt5051_models[CXT5051_MODELS] = { static const char *const cxt5051_models[CXT5051_MODELS] = {
[CXT5051_LAPTOP] = "laptop", [CXT5051_LAPTOP] = "laptop",
[CXT5051_HP] = "hp", [CXT5051_HP] = "hp",
[CXT5051_HP_DV6736] = "hp-dv6736", [CXT5051_HP_DV6736] = "hp-dv6736",
@ -3084,7 +3084,7 @@ enum {
CXT5066_MODELS CXT5066_MODELS
}; };
static const char *cxt5066_models[CXT5066_MODELS] = { static const char * const cxt5066_models[CXT5066_MODELS] = {
[CXT5066_LAPTOP] = "laptop", [CXT5066_LAPTOP] = "laptop",
[CXT5066_DELL_LAPTOP] = "dell-laptop", [CXT5066_DELL_LAPTOP] = "dell-laptop",
[CXT5066_OLPC_XO_1_5] = "olpc-xo-1_5", [CXT5066_OLPC_XO_1_5] = "olpc-xo-1_5",
@ -3746,7 +3746,7 @@ static int cx_auto_build_output_controls(struct hda_codec *codec)
struct conexant_spec *spec = codec->spec; struct conexant_spec *spec = codec->spec;
int i, err; int i, err;
int num_line = 0, num_hp = 0, num_spk = 0; int num_line = 0, num_hp = 0, num_spk = 0;
static const char *texts[3] = { "Front", "Surround", "CLFE" }; static const char * const texts[3] = { "Front", "Surround", "CLFE" };
if (spec->dac_info_filled == 1) if (spec->dac_info_filled == 1)
return cx_auto_add_pb_volume(codec, spec->dac_info[0].dac, return cx_auto_add_pb_volume(codec, spec->dac_info[0].dac,

12
sound/pci/hda/patch_hdmi.c
View File

@ -817,6 +817,7 @@ static int hdmi_pcm_open(struct hda_pcm_stream *hinfo,
struct hdmi_spec *spec = codec->spec; struct hdmi_spec *spec = codec->spec;
struct hdmi_eld *eld; struct hdmi_eld *eld;
struct hda_pcm_stream *codec_pars; struct hda_pcm_stream *codec_pars;
struct snd_pcm_runtime *runtime = substream->runtime;
unsigned int idx; unsigned int idx;
for (idx = 0; idx < spec->num_cvts; idx++) for (idx = 0; idx < spec->num_cvts; idx++)
@ -844,6 +845,14 @@ static int hdmi_pcm_open(struct hda_pcm_stream *hinfo,
hinfo->formats = codec_pars->formats; hinfo->formats = codec_pars->formats;
hinfo->maxbps = codec_pars->maxbps; hinfo->maxbps = codec_pars->maxbps;
} }
/* store the updated parameters */
runtime->hw.channels_min = hinfo->channels_min;
runtime->hw.channels_max = hinfo->channels_max;
runtime->hw.formats = hinfo->formats;
runtime->hw.rates = hinfo->rates;
snd_pcm_hw_constraint_step(substream->runtime, 0,
SNDRV_PCM_HW_PARAM_CHANNELS, 2);
return 0; return 0;
} }
@ -1238,6 +1247,9 @@ static int simple_playback_pcm_open(struct hda_pcm_stream *hinfo,
snd_pcm_hw_constraint_list(substream->runtime, 0, snd_pcm_hw_constraint_list(substream->runtime, 0,
SNDRV_PCM_HW_PARAM_CHANNELS, SNDRV_PCM_HW_PARAM_CHANNELS,
hw_constraints_channels); hw_constraints_channels);
} else {
snd_pcm_hw_constraint_step(substream->runtime, 0,
SNDRV_PCM_HW_PARAM_CHANNELS, 2);
} }
return snd_hda_multi_out_dig_open(codec, &spec->multiout); return snd_hda_multi_out_dig_open(codec, &spec->multiout);

369
sound/pci/hda/patch_realtek.c
View File

@ -303,6 +303,8 @@ struct alc_customize_define {
unsigned int fixup:1; /* Means that this sku is set by driver, not read from hw */ unsigned int fixup:1; /* Means that this sku is set by driver, not read from hw */
}; };
struct alc_fixup;
struct alc_spec { struct alc_spec {
/* codec parameterization */ /* codec parameterization */
struct snd_kcontrol_new *mixers[5]; /* mixer arrays */ struct snd_kcontrol_new *mixers[5]; /* mixer arrays */
@ -404,6 +406,11 @@ struct alc_spec {
/* for PLL fix */ /* for PLL fix */
hda_nid_t pll_nid; hda_nid_t pll_nid;
unsigned int pll_coef_idx, pll_coef_bit; unsigned int pll_coef_idx, pll_coef_bit;
/* fix-up list */
int fixup_id;
const struct alc_fixup *fixup_list;
const char *fixup_name;
}; };
/* /*
@ -1683,88 +1690,131 @@ struct alc_model_fixup {
}; };
struct alc_fixup { struct alc_fixup {
unsigned int sku; int type;
const struct alc_pincfg *pins; bool chained;
const struct hda_verb *verbs; int chain_id;
void (*func)(struct hda_codec *codec, const struct alc_fixup *fix, union {
int pre_init); unsigned int sku;
const struct alc_pincfg *pins;
const struct hda_verb *verbs;
void (*func)(struct hda_codec *codec,
const struct alc_fixup *fix,
int action);
} v;
}; };
static void __alc_pick_fixup(struct hda_codec *codec, enum {
const struct alc_fixup *fix, ALC_FIXUP_INVALID,
const char *modelname, ALC_FIXUP_SKU,
int pre_init) ALC_FIXUP_PINS,
{ ALC_FIXUP_VERBS,
const struct alc_pincfg *cfg; ALC_FIXUP_FUNC,
struct alc_spec *spec; };
cfg = fix->pins; enum {
if (pre_init && fix->sku) { ALC_FIXUP_ACT_PRE_PROBE,
#ifdef CONFIG_SND_DEBUG_VERBOSE ALC_FIXUP_ACT_PROBE,
snd_printdd(KERN_INFO "hda_codec: %s: Apply sku override for %s\n", ALC_FIXUP_ACT_INIT,
codec->chip_name, modelname); };
#endif
spec = codec->spec; static void alc_apply_fixup(struct hda_codec *codec, int action)
spec->cdefine.sku_cfg = fix->sku; {
spec->cdefine.fixup = 1; struct alc_spec *spec = codec->spec;
} int id = spec->fixup_id;
if (pre_init && cfg) { const char *modelname = spec->fixup_name;
#ifdef CONFIG_SND_DEBUG_VERBOSE int depth = 0;
snd_printdd(KERN_INFO "hda_codec: %s: Apply pincfg for %s\n",
codec->chip_name, modelname); if (!spec->fixup_list)
#endif return;
for (; cfg->nid; cfg++)
snd_hda_codec_set_pincfg(codec, cfg->nid, cfg->val); while (id >= 0) {
} const struct alc_fixup *fix = spec->fixup_list + id;
if (!pre_init && fix->verbs) { const struct alc_pincfg *cfg;
#ifdef CONFIG_SND_DEBUG_VERBOSE
snd_printdd(KERN_INFO "hda_codec: %s: Apply fix-verbs for %s\n", switch (fix->type) {
codec->chip_name, modelname); case ALC_FIXUP_SKU:
#endif if (action != ALC_FIXUP_ACT_PRE_PROBE || !fix->v.sku)
add_verb(codec->spec, fix->verbs); break;;
} snd_printdd(KERN_INFO "hda_codec: %s: "
if (fix->func) { "Apply sku override for %s\n",
#ifdef CONFIG_SND_DEBUG_VERBOSE codec->chip_name, modelname);
snd_printdd(KERN_INFO "hda_codec: %s: Apply fix-func for %s\n", spec->cdefine.sku_cfg = fix->v.sku;
codec->chip_name, modelname); spec->cdefine.fixup = 1;
#endif break;
fix->func(codec, fix, pre_init); case ALC_FIXUP_PINS:
cfg = fix->v.pins;
if (action != ALC_FIXUP_ACT_PRE_PROBE || !cfg)
break;
snd_printdd(KERN_INFO "hda_codec: %s: "
"Apply pincfg for %s\n",
codec->chip_name, modelname);
for (; cfg->nid; cfg++)
snd_hda_codec_set_pincfg(codec, cfg->nid,
cfg->val);
break;
case ALC_FIXUP_VERBS:
if (action != ALC_FIXUP_ACT_PROBE || !fix->v.verbs)
break;
snd_printdd(KERN_INFO "hda_codec: %s: "
"Apply fix-verbs for %s\n",
codec->chip_name, modelname);
add_verb(codec->spec, fix->v.verbs);
break;
case ALC_FIXUP_FUNC:
if (!fix->v.func)
break;
snd_printdd(KERN_INFO "hda_codec: %s: "
"Apply fix-func for %s\n",
codec->chip_name, modelname);
fix->v.func(codec, fix, action);
break;
default:
snd_printk(KERN_ERR "hda_codec: %s: "
"Invalid fixup type %d\n",
codec->chip_name, fix->type);
break;
}
if (!fix[id].chained)
break;
if (++depth > 10)
break;
id = fix[id].chain_id;
} }
} }
static void alc_pick_fixup(struct hda_codec *codec, static void alc_pick_fixup(struct hda_codec *codec,
const struct snd_pci_quirk *quirk, const struct alc_model_fixup *models,
const struct alc_fixup *fix, const struct snd_pci_quirk *quirk,
int pre_init) const struct alc_fixup *fixlist)
{ {
quirk = snd_pci_quirk_lookup(codec->bus->pci, quirk); struct alc_spec *spec = codec->spec;
if (quirk) { int id = -1;
fix += quirk->value; const char *name = NULL;
#ifdef CONFIG_SND_DEBUG_VERBOSE
__alc_pick_fixup(codec, fix, quirk->name, pre_init);
#else
__alc_pick_fixup(codec, fix, NULL, pre_init);
#endif
}
}
static void alc_pick_fixup_model(struct hda_codec *codec,
const struct alc_model_fixup *models,
const struct snd_pci_quirk *quirk,
const struct alc_fixup *fix,
int pre_init)
{
if (codec->modelname && models) { if (codec->modelname && models) {
while (models->name) { while (models->name) {
if (!strcmp(codec->modelname, models->name)) { if (!strcmp(codec->modelname, models->name)) {
fix += models->id; id = models->id;
name = models->name;
break; break;
} }
models++; models++;
} }
__alc_pick_fixup(codec, fix, codec->modelname, pre_init); }
} else { if (id < 0) {
alc_pick_fixup(codec, quirk, fix, pre_init); quirk = snd_pci_quirk_lookup(codec->bus->pci, quirk);
if (quirk) {
id = quirk->value;
#ifdef CONFIG_SND_DEBUG_VERBOSE
name = quirk->name;
#endif
}
}
spec->fixup_id = id;
if (id >= 0) {
spec->fixup_list = fixlist;
spec->fixup_name = name;
} }
} }
@ -2866,7 +2916,7 @@ static struct snd_kcontrol_new alc880_uniwill_p53_mixer[] = {
/* /*
* slave controls for virtual master * slave controls for virtual master
*/ */
static const char *alc_slave_vols[] = { static const char * const alc_slave_vols[] = {
"Front Playback Volume", "Front Playback Volume",
"Surround Playback Volume", "Surround Playback Volume",
"Center Playback Volume", "Center Playback Volume",
@ -2880,7 +2930,7 @@ static const char *alc_slave_vols[] = {
NULL, NULL,
}; };
static const char *alc_slave_sws[] = { static const char * const alc_slave_sws[] = {
"Front Playback Switch", "Front Playback Switch",
"Surround Playback Switch", "Surround Playback Switch",
"Center Playback Switch", "Center Playback Switch",
@ -3861,6 +3911,8 @@ static int alc_init(struct hda_codec *codec)
if (spec->init_hook) if (spec->init_hook)
spec->init_hook(codec); spec->init_hook(codec);
alc_apply_fixup(codec, ALC_FIXUP_ACT_INIT);
hda_call_check_power_status(codec, 0x01); hda_call_check_power_status(codec, 0x01);
return 0; return 0;
} }
@ -4559,7 +4611,7 @@ static struct hda_verb alc880_test_init_verbs[] = {
/* /*
*/ */
static const char *alc880_models[ALC880_MODEL_LAST] = { static const char * const alc880_models[ALC880_MODEL_LAST] = {
[ALC880_3ST] = "3stack", [ALC880_3ST] = "3stack",
[ALC880_TCL_S700] = "tcl", [ALC880_TCL_S700] = "tcl",
[ALC880_3ST_DIG] = "3stack-digout", [ALC880_3ST_DIG] = "3stack-digout",
@ -5092,7 +5144,7 @@ static const char *alc_get_line_out_pfx(const struct auto_pin_cfg *cfg,
static int alc880_auto_create_multi_out_ctls(struct alc_spec *spec, static int alc880_auto_create_multi_out_ctls(struct alc_spec *spec,
const struct auto_pin_cfg *cfg) const struct auto_pin_cfg *cfg)
{ {
static const char *chname[4] = { static const char * const chname[4] = {
"Front", "Surround", NULL /*CLFE*/, "Side" "Front", "Surround", NULL /*CLFE*/, "Side"
}; };
const char *pfx = alc_get_line_out_pfx(cfg, false); const char *pfx = alc_get_line_out_pfx(cfg, false);
@ -7090,7 +7142,8 @@ enum {
static const struct alc_fixup alc260_fixups[] = { static const struct alc_fixup alc260_fixups[] = {
[PINFIX_HP_DC5750] = { [PINFIX_HP_DC5750] = {
.pins = (const struct alc_pincfg[]) { .type = ALC_FIXUP_PINS,
.v.pins = (const struct alc_pincfg[]) {
{ 0x11, 0x90130110 }, /* speaker */ { 0x11, 0x90130110 }, /* speaker */
{ } { }
} }
@ -7105,7 +7158,7 @@ static struct snd_pci_quirk alc260_fixup_tbl[] = {
/* /*
* ALC260 configurations * ALC260 configurations
*/ */
static const char *alc260_models[ALC260_MODEL_LAST] = { static const char * const alc260_models[ALC260_MODEL_LAST] = {
[ALC260_BASIC] = "basic", [ALC260_BASIC] = "basic",
[ALC260_HP] = "hp", [ALC260_HP] = "hp",
[ALC260_HP_3013] = "hp-3013", [ALC260_HP_3013] = "hp-3013",
@ -7301,8 +7354,10 @@ static int patch_alc260(struct hda_codec *codec)
board_config = ALC260_AUTO; board_config = ALC260_AUTO;
} }
if (board_config == ALC260_AUTO) if (board_config == ALC260_AUTO) {
alc_pick_fixup(codec, alc260_fixup_tbl, alc260_fixups, 1); alc_pick_fixup(codec, NULL, alc260_fixup_tbl, alc260_fixups);
alc_apply_fixup(codec, ALC_FIXUP_ACT_PRE_PROBE);
}
if (board_config == ALC260_AUTO) { if (board_config == ALC260_AUTO) {
/* automatic parse from the BIOS config */ /* automatic parse from the BIOS config */
@ -7350,8 +7405,7 @@ static int patch_alc260(struct hda_codec *codec)
set_capture_mixer(codec); set_capture_mixer(codec);
set_beep_amp(spec, 0x07, 0x05, HDA_INPUT); set_beep_amp(spec, 0x07, 0x05, HDA_INPUT);
if (board_config == ALC260_AUTO) alc_apply_fixup(codec, ALC_FIXUP_ACT_PROBE);
alc_pick_fixup(codec, alc260_fixup_tbl, alc260_fixups, 0);
spec->vmaster_nid = 0x08; spec->vmaster_nid = 0x08;
@ -9727,7 +9781,7 @@ static hda_nid_t alc1200_slave_dig_outs[] = {
/* /*
* configuration and preset * configuration and preset
*/ */
static const char *alc882_models[ALC882_MODEL_LAST] = { static const char * const alc882_models[ALC882_MODEL_LAST] = {
[ALC882_3ST_DIG] = "3stack-dig", [ALC882_3ST_DIG] = "3stack-dig",
[ALC882_6ST_DIG] = "6stack-dig", [ALC882_6ST_DIG] = "6stack-dig",
[ALC882_ARIMA] = "arima", [ALC882_ARIMA] = "arima",
@ -10678,7 +10732,8 @@ enum {
static const struct alc_fixup alc882_fixups[] = { static const struct alc_fixup alc882_fixups[] = {
[PINFIX_ABIT_AW9D_MAX] = { [PINFIX_ABIT_AW9D_MAX] = {
.pins = (const struct alc_pincfg[]) { .type = ALC_FIXUP_PINS,
.v.pins = (const struct alc_pincfg[]) {
{ 0x15, 0x01080104 }, /* side */ { 0x15, 0x01080104 }, /* side */
{ 0x16, 0x01011012 }, /* rear */ { 0x16, 0x01011012 }, /* rear */
{ 0x17, 0x01016011 }, /* clfe */ { 0x17, 0x01016011 }, /* clfe */
@ -10686,13 +10741,15 @@ static const struct alc_fixup alc882_fixups[] = {
} }
}, },
[PINFIX_PB_M5210] = { [PINFIX_PB_M5210] = {
.verbs = (const struct hda_verb[]) { .type = ALC_FIXUP_VERBS,
.v.verbs = (const struct hda_verb[]) {
{ 0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF50 }, { 0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF50 },
{} {}
} }
}, },
[PINFIX_ACER_ASPIRE_7736] = { [PINFIX_ACER_ASPIRE_7736] = {
.sku = ALC_FIXUP_SKU_IGNORE, .type = ALC_FIXUP_SKU,
.v.sku = ALC_FIXUP_SKU_IGNORE,
}, },
}; };
@ -10984,8 +11041,10 @@ static int patch_alc882(struct hda_codec *codec)
board_config = ALC882_AUTO; board_config = ALC882_AUTO;
} }
if (board_config == ALC882_AUTO) if (board_config == ALC882_AUTO) {
alc_pick_fixup(codec, alc882_fixup_tbl, alc882_fixups, 1); alc_pick_fixup(codec, NULL, alc882_fixup_tbl, alc882_fixups);
alc_apply_fixup(codec, ALC_FIXUP_ACT_PRE_PROBE);
}
alc_auto_parse_customize_define(codec); alc_auto_parse_customize_define(codec);
@ -11061,8 +11120,7 @@ static int patch_alc882(struct hda_codec *codec)
if (has_cdefine_beep(codec)) if (has_cdefine_beep(codec))
set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT); set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);
if (board_config == ALC882_AUTO) alc_apply_fixup(codec, ALC_FIXUP_ACT_PROBE);
alc_pick_fixup(codec, alc882_fixup_tbl, alc882_fixups, 0);
spec->vmaster_nid = 0x0c; spec->vmaster_nid = 0x0c;
@ -12452,19 +12510,14 @@ enum {
static const struct alc_fixup alc262_fixups[] = { static const struct alc_fixup alc262_fixups[] = {
[PINFIX_FSC_H270] = { [PINFIX_FSC_H270] = {
.pins = (const struct alc_pincfg[]) { .type = ALC_FIXUP_PINS,
.v.pins = (const struct alc_pincfg[]) {
{ 0x14, 0x99130110 }, /* speaker */ { 0x14, 0x99130110 }, /* speaker */
{ 0x15, 0x0221142f }, /* front HP */ { 0x15, 0x0221142f }, /* front HP */
{ 0x1b, 0x0121141f }, /* rear HP */ { 0x1b, 0x0121141f }, /* rear HP */
{ } { }
} }
}, },
[PINFIX_PB_M5210] = {
.verbs = (const struct hda_verb[]) {
{ 0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF50 },
{}
}
},
}; };
static struct snd_pci_quirk alc262_fixup_tbl[] = { static struct snd_pci_quirk alc262_fixup_tbl[] = {
@ -12554,7 +12607,7 @@ static void alc262_auto_init(struct hda_codec *codec)
/* /*
* configuration and preset * configuration and preset
*/ */
static const char *alc262_models[ALC262_MODEL_LAST] = { static const char * const alc262_models[ALC262_MODEL_LAST] = {
[ALC262_BASIC] = "basic", [ALC262_BASIC] = "basic",
[ALC262_HIPPO] = "hippo", [ALC262_HIPPO] = "hippo",
[ALC262_HIPPO_1] = "hippo_1", [ALC262_HIPPO_1] = "hippo_1",
@ -12895,8 +12948,10 @@ static int patch_alc262(struct hda_codec *codec)
board_config = ALC262_AUTO; board_config = ALC262_AUTO;
} }
if (board_config == ALC262_AUTO) if (board_config == ALC262_AUTO) {
alc_pick_fixup(codec, alc262_fixup_tbl, alc262_fixups, 1); alc_pick_fixup(codec, NULL, alc262_fixup_tbl, alc262_fixups);
alc_apply_fixup(codec, ALC_FIXUP_ACT_PRE_PROBE);
}
if (board_config == ALC262_AUTO) { if (board_config == ALC262_AUTO) {
/* automatic parse from the BIOS config */ /* automatic parse from the BIOS config */
@ -12966,8 +13021,7 @@ static int patch_alc262(struct hda_codec *codec)
if (!spec->no_analog && has_cdefine_beep(codec)) if (!spec->no_analog && has_cdefine_beep(codec))
set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT); set_beep_amp(spec, 0x0b, 0x05, HDA_INPUT);
if (board_config == ALC262_AUTO) alc_apply_fixup(codec, ALC_FIXUP_ACT_PROBE);
alc_pick_fixup(codec, alc262_fixup_tbl, alc262_fixups, 0);
spec->vmaster_nid = 0x0c; spec->vmaster_nid = 0x0c;
@ -13741,7 +13795,7 @@ static void alc268_auto_init(struct hda_codec *codec)
/* /*
* configuration and preset * configuration and preset
*/ */
static const char *alc268_models[ALC268_MODEL_LAST] = { static const char * const alc268_models[ALC268_MODEL_LAST] = {
[ALC267_QUANTA_IL1] = "quanta-il1", [ALC267_QUANTA_IL1] = "quanta-il1",
[ALC268_3ST] = "3stack", [ALC268_3ST] = "3stack",
[ALC268_TOSHIBA] = "toshiba", [ALC268_TOSHIBA] = "toshiba",
@ -14822,17 +14876,19 @@ static int alc269_resume(struct hda_codec *codec)
#endif /* SND_HDA_NEEDS_RESUME */ #endif /* SND_HDA_NEEDS_RESUME */
static void alc269_fixup_hweq(struct hda_codec *codec, static void alc269_fixup_hweq(struct hda_codec *codec,
const struct alc_fixup *fix, int pre_init) const struct alc_fixup *fix, int action)
{ {
int coef; int coef;
if (action != ALC_FIXUP_ACT_INIT)
return;
coef = alc_read_coef_idx(codec, 0x1e); coef = alc_read_coef_idx(codec, 0x1e);
alc_write_coef_idx(codec, 0x1e, coef | 0x80); alc_write_coef_idx(codec, 0x1e, coef | 0x80);
} }
enum { enum {
ALC269_FIXUP_SONY_VAIO, ALC269_FIXUP_SONY_VAIO,
ALC275_FIX_SONY_VAIO_GPIO2, ALC275_FIXUP_SONY_VAIO_GPIO2,
ALC269_FIXUP_DELL_M101Z, ALC269_FIXUP_DELL_M101Z,
ALC269_FIXUP_SKU_IGNORE, ALC269_FIXUP_SKU_IGNORE,
ALC269_FIXUP_ASUS_G73JW, ALC269_FIXUP_ASUS_G73JW,
@ -14842,22 +14898,26 @@ enum {
static const struct alc_fixup alc269_fixups[] = { static const struct alc_fixup alc269_fixups[] = {
[ALC269_FIXUP_SONY_VAIO] = { [ALC269_FIXUP_SONY_VAIO] = {
.verbs = (const struct hda_verb[]) { .type = ALC_FIXUP_VERBS,
.v.verbs = (const struct hda_verb[]) {
{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREFGRD}, {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREFGRD},
{} {}
} }
}, },
[ALC275_FIX_SONY_VAIO_GPIO2] = { [ALC275_FIXUP_SONY_VAIO_GPIO2] = {
.verbs = (const struct hda_verb[]) { .type = ALC_FIXUP_VERBS,
.v.verbs = (const struct hda_verb[]) {
{0x01, AC_VERB_SET_GPIO_MASK, 0x04}, {0x01, AC_VERB_SET_GPIO_MASK, 0x04},
{0x01, AC_VERB_SET_GPIO_DIRECTION, 0x04}, {0x01, AC_VERB_SET_GPIO_DIRECTION, 0x04},
{0x01, AC_VERB_SET_GPIO_DATA, 0x00}, {0x01, AC_VERB_SET_GPIO_DATA, 0x00},
{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREFGRD},
{ } { }
} },
.chained = true,
.chain_id = ALC269_FIXUP_SONY_VAIO
}, },
[ALC269_FIXUP_DELL_M101Z] = { [ALC269_FIXUP_DELL_M101Z] = {
.verbs = (const struct hda_verb[]) { .type = ALC_FIXUP_VERBS,
.v.verbs = (const struct hda_verb[]) {
/* Enables internal speaker */ /* Enables internal speaker */
{0x20, AC_VERB_SET_COEF_INDEX, 13}, {0x20, AC_VERB_SET_COEF_INDEX, 13},
{0x20, AC_VERB_SET_PROC_COEF, 0x4040}, {0x20, AC_VERB_SET_PROC_COEF, 0x4040},
@ -14865,34 +14925,33 @@ static const struct alc_fixup alc269_fixups[] = {
} }
}, },
[ALC269_FIXUP_SKU_IGNORE] = { [ALC269_FIXUP_SKU_IGNORE] = {
.sku = ALC_FIXUP_SKU_IGNORE, .type = ALC_FIXUP_SKU,
.v.sku = ALC_FIXUP_SKU_IGNORE,
}, },
[ALC269_FIXUP_ASUS_G73JW] = { [ALC269_FIXUP_ASUS_G73JW] = {
.pins = (const struct alc_pincfg[]) { .type = ALC_FIXUP_PINS,
.v.pins = (const struct alc_pincfg[]) {
{ 0x17, 0x99130111 }, /* subwoofer */ { 0x17, 0x99130111 }, /* subwoofer */
{ } { }
} }
}, },
[ALC269_FIXUP_LENOVO_EAPD] = { [ALC269_FIXUP_LENOVO_EAPD] = {
.verbs = (const struct hda_verb[]) { .type = ALC_FIXUP_VERBS,
.v.verbs = (const struct hda_verb[]) {
{0x14, AC_VERB_SET_EAPD_BTLENABLE, 0}, {0x14, AC_VERB_SET_EAPD_BTLENABLE, 0},
{} {}
} }
}, },
[ALC275_FIXUP_SONY_HWEQ] = { [ALC275_FIXUP_SONY_HWEQ] = {
.func = alc269_fixup_hweq, .type = ALC_FIXUP_FUNC,
.verbs = (const struct hda_verb[]) { .v.func = alc269_fixup_hweq,
{0x01, AC_VERB_SET_GPIO_MASK, 0x04}, .chained = true,
{0x01, AC_VERB_SET_GPIO_DIRECTION, 0x04}, .chain_id = ALC275_FIXUP_SONY_VAIO_GPIO2
{0x01, AC_VERB_SET_GPIO_DATA, 0x00},
{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREFGRD},
{ }
}
} }
}; };
static struct snd_pci_quirk alc269_fixup_tbl[] = { static struct snd_pci_quirk alc269_fixup_tbl[] = {
SND_PCI_QUIRK(0x104d, 0x9073, "Sony VAIO", ALC275_FIX_SONY_VAIO_GPIO2), SND_PCI_QUIRK(0x104d, 0x9073, "Sony VAIO", ALC275_FIXUP_SONY_VAIO_GPIO2),
SND_PCI_QUIRK(0x104d, 0x907b, "Sony VAIO", ALC275_FIXUP_SONY_HWEQ), SND_PCI_QUIRK(0x104d, 0x907b, "Sony VAIO", ALC275_FIXUP_SONY_HWEQ),
SND_PCI_QUIRK(0x104d, 0x9084, "Sony VAIO", ALC275_FIXUP_SONY_HWEQ), SND_PCI_QUIRK(0x104d, 0x9084, "Sony VAIO", ALC275_FIXUP_SONY_HWEQ),
SND_PCI_QUIRK_VENDOR(0x104d, "Sony VAIO", ALC269_FIXUP_SONY_VAIO), SND_PCI_QUIRK_VENDOR(0x104d, "Sony VAIO", ALC269_FIXUP_SONY_VAIO),
@ -14908,7 +14967,7 @@ static struct snd_pci_quirk alc269_fixup_tbl[] = {
/* /*
* configuration and preset * configuration and preset
*/ */
static const char *alc269_models[ALC269_MODEL_LAST] = { static const char * const alc269_models[ALC269_MODEL_LAST] = {
[ALC269_BASIC] = "basic", [ALC269_BASIC] = "basic",
[ALC269_QUANTA_FL1] = "quanta", [ALC269_QUANTA_FL1] = "quanta",
[ALC269_AMIC] = "laptop-amic", [ALC269_AMIC] = "laptop-amic",
@ -15184,8 +15243,10 @@ static int patch_alc269(struct hda_codec *codec)
board_config = ALC269_AUTO; board_config = ALC269_AUTO;
} }
if (board_config == ALC269_AUTO) if (board_config == ALC269_AUTO) {
alc_pick_fixup(codec, alc269_fixup_tbl, alc269_fixups, 1); alc_pick_fixup(codec, NULL, alc269_fixup_tbl, alc269_fixups);
alc_apply_fixup(codec, ALC_FIXUP_ACT_PRE_PROBE);
}
if (board_config == ALC269_AUTO) { if (board_config == ALC269_AUTO) {
/* automatic parse from the BIOS config */ /* automatic parse from the BIOS config */
@ -15246,8 +15307,7 @@ static int patch_alc269(struct hda_codec *codec)
if (has_cdefine_beep(codec)) if (has_cdefine_beep(codec))
set_beep_amp(spec, 0x0b, 0x04, HDA_INPUT); set_beep_amp(spec, 0x0b, 0x04, HDA_INPUT);
if (board_config == ALC269_AUTO) alc_apply_fixup(codec, ALC_FIXUP_ACT_PROBE);
alc_pick_fixup(codec, alc269_fixup_tbl, alc269_fixups, 0);
spec->vmaster_nid = 0x02; spec->vmaster_nid = 0x02;
@ -15950,7 +16010,7 @@ static int alc861_auto_create_multi_out_ctls(struct hda_codec *codec,
const struct auto_pin_cfg *cfg) const struct auto_pin_cfg *cfg)
{ {
struct alc_spec *spec = codec->spec; struct alc_spec *spec = codec->spec;
static const char *chname[4] = { static const char * const chname[4] = {
"Front", "Surround", NULL /*CLFE*/, "Side" "Front", "Surround", NULL /*CLFE*/, "Side"
}; };
const char *pfx = alc_get_line_out_pfx(cfg, true); const char *pfx = alc_get_line_out_pfx(cfg, true);
@ -16156,7 +16216,7 @@ static struct hda_amp_list alc861_loopbacks[] = {
/* /*
* configuration and preset * configuration and preset
*/ */
static const char *alc861_models[ALC861_MODEL_LAST] = { static const char * const alc861_models[ALC861_MODEL_LAST] = {
[ALC861_3ST] = "3stack", [ALC861_3ST] = "3stack",
[ALC660_3ST] = "3stack-660", [ALC660_3ST] = "3stack-660",
[ALC861_3ST_DIG] = "3stack-dig", [ALC861_3ST_DIG] = "3stack-dig",
@ -16306,7 +16366,8 @@ enum {
static const struct alc_fixup alc861_fixups[] = { static const struct alc_fixup alc861_fixups[] = {
[PINFIX_FSC_AMILO_PI1505] = { [PINFIX_FSC_AMILO_PI1505] = {
.pins = (const struct alc_pincfg[]) { .type = ALC_FIXUP_PINS,
.v.pins = (const struct alc_pincfg[]) {
{ 0x0b, 0x0221101f }, /* HP */ { 0x0b, 0x0221101f }, /* HP */
{ 0x0f, 0x90170310 }, /* speaker */ { 0x0f, 0x90170310 }, /* speaker */
{ } { }
@ -16341,8 +16402,10 @@ static int patch_alc861(struct hda_codec *codec)
board_config = ALC861_AUTO; board_config = ALC861_AUTO;
} }
if (board_config == ALC861_AUTO) if (board_config == ALC861_AUTO) {
alc_pick_fixup(codec, alc861_fixup_tbl, alc861_fixups, 1); alc_pick_fixup(codec, NULL, alc861_fixup_tbl, alc861_fixups);
alc_apply_fixup(codec, ALC_FIXUP_ACT_PRE_PROBE);
}
if (board_config == ALC861_AUTO) { if (board_config == ALC861_AUTO) {
/* automatic parse from the BIOS config */ /* automatic parse from the BIOS config */
@ -16379,8 +16442,7 @@ static int patch_alc861(struct hda_codec *codec)
spec->vmaster_nid = 0x03; spec->vmaster_nid = 0x03;
if (board_config == ALC861_AUTO) alc_apply_fixup(codec, ALC_FIXUP_ACT_PROBE);
alc_pick_fixup(codec, alc861_fixup_tbl, alc861_fixups, 0);
codec->patch_ops = alc_patch_ops; codec->patch_ops = alc_patch_ops;
if (board_config == ALC861_AUTO) { if (board_config == ALC861_AUTO) {
@ -16857,7 +16919,7 @@ static void alc861vd_dallas_setup(struct hda_codec *codec)
/* /*
* configuration and preset * configuration and preset
*/ */
static const char *alc861vd_models[ALC861VD_MODEL_LAST] = { static const char * const alc861vd_models[ALC861VD_MODEL_LAST] = {
[ALC660VD_3ST] = "3stack-660", [ALC660VD_3ST] = "3stack-660",
[ALC660VD_3ST_DIG] = "3stack-660-digout", [ALC660VD_3ST_DIG] = "3stack-660-digout",
[ALC660VD_ASUS_V1S] = "asus-v1s", [ALC660VD_ASUS_V1S] = "asus-v1s",
@ -17077,7 +17139,9 @@ static void alc861vd_auto_init_analog_input(struct hda_codec *codec)
static int alc861vd_auto_create_multi_out_ctls(struct alc_spec *spec, static int alc861vd_auto_create_multi_out_ctls(struct alc_spec *spec,
const struct auto_pin_cfg *cfg) const struct auto_pin_cfg *cfg)
{ {
static const char *chname[4] = {"Front", "Surround", "CLFE", "Side"}; static const char * const chname[4] = {
"Front", "Surround", "CLFE", "Side"
};
const char *pfx = alc_get_line_out_pfx(cfg, true); const char *pfx = alc_get_line_out_pfx(cfg, true);
hda_nid_t nid_v, nid_s; hda_nid_t nid_v, nid_s;
int i, err; int i, err;
@ -17262,7 +17326,8 @@ enum {
/* reset GPIO1 */ /* reset GPIO1 */
static const struct alc_fixup alc861vd_fixups[] = { static const struct alc_fixup alc861vd_fixups[] = {
[ALC660VD_FIX_ASUS_GPIO1] = { [ALC660VD_FIX_ASUS_GPIO1] = {
.verbs = (const struct hda_verb[]) { .type = ALC_FIXUP_VERBS,
.v.verbs = (const struct hda_verb[]) {
{0x01, AC_VERB_SET_GPIO_MASK, 0x03}, {0x01, AC_VERB_SET_GPIO_MASK, 0x03},
{0x01, AC_VERB_SET_GPIO_DIRECTION, 0x01}, {0x01, AC_VERB_SET_GPIO_DIRECTION, 0x01},
{0x01, AC_VERB_SET_GPIO_DATA, 0x01}, {0x01, AC_VERB_SET_GPIO_DATA, 0x01},
@ -17297,8 +17362,10 @@ static int patch_alc861vd(struct hda_codec *codec)
board_config = ALC861VD_AUTO; board_config = ALC861VD_AUTO;
} }
if (board_config == ALC861VD_AUTO) if (board_config == ALC861VD_AUTO) {
alc_pick_fixup(codec, alc861vd_fixup_tbl, alc861vd_fixups, 1); alc_pick_fixup(codec, NULL, alc861vd_fixup_tbl, alc861vd_fixups);
alc_apply_fixup(codec, ALC_FIXUP_ACT_PRE_PROBE);
}
if (board_config == ALC861VD_AUTO) { if (board_config == ALC861VD_AUTO) {
/* automatic parse from the BIOS config */ /* automatic parse from the BIOS config */
@ -17346,8 +17413,7 @@ static int patch_alc861vd(struct hda_codec *codec)
spec->vmaster_nid = 0x02; spec->vmaster_nid = 0x02;
if (board_config == ALC861VD_AUTO) alc_apply_fixup(codec, ALC_FIXUP_ACT_PROBE);
alc_pick_fixup(codec, alc861vd_fixup_tbl, alc861vd_fixups, 0);
codec->patch_ops = alc_patch_ops; codec->patch_ops = alc_patch_ops;
@ -18630,7 +18696,7 @@ static struct snd_kcontrol_new alc272_nc10_mixer[] = {
/* /*
* configuration and preset * configuration and preset
*/ */
static const char *alc662_models[ALC662_MODEL_LAST] = { static const char * const alc662_models[ALC662_MODEL_LAST] = {
[ALC662_3ST_2ch_DIG] = "3stack-dig", [ALC662_3ST_2ch_DIG] = "3stack-dig",
[ALC662_3ST_6ch_DIG] = "3stack-6ch-dig", [ALC662_3ST_6ch_DIG] = "3stack-6ch-dig",
[ALC662_3ST_6ch] = "3stack-6ch", [ALC662_3ST_6ch] = "3stack-6ch",
@ -19145,7 +19211,7 @@ static int alc662_auto_create_multi_out_ctls(struct hda_codec *codec,
const struct auto_pin_cfg *cfg) const struct auto_pin_cfg *cfg)
{ {
struct alc_spec *spec = codec->spec; struct alc_spec *spec = codec->spec;
static const char *chname[4] = { static const char * const chname[4] = {
"Front", "Surround", NULL /*CLFE*/, "Side" "Front", "Surround", NULL /*CLFE*/, "Side"
}; };
const char *pfx = alc_get_line_out_pfx(cfg, true); const char *pfx = alc_get_line_out_pfx(cfg, true);
@ -19378,7 +19444,10 @@ static void alc662_auto_init(struct hda_codec *codec)
} }
static void alc272_fixup_mario(struct hda_codec *codec, static void alc272_fixup_mario(struct hda_codec *codec,
const struct alc_fixup *fix, int pre_init) { const struct alc_fixup *fix, int action)
{
if (action != ALC_FIXUP_ACT_PROBE)
return;
if (snd_hda_override_amp_caps(codec, 0x2, HDA_OUTPUT, if (snd_hda_override_amp_caps(codec, 0x2, HDA_OUTPUT,
(0x3b << AC_AMPCAP_OFFSET_SHIFT) | (0x3b << AC_AMPCAP_OFFSET_SHIFT) |
(0x3b << AC_AMPCAP_NUM_STEPS_SHIFT) | (0x3b << AC_AMPCAP_NUM_STEPS_SHIFT) |
@ -19396,19 +19465,22 @@ enum {
static const struct alc_fixup alc662_fixups[] = { static const struct alc_fixup alc662_fixups[] = {
[ALC662_FIXUP_ASPIRE] = { [ALC662_FIXUP_ASPIRE] = {
.pins = (const struct alc_pincfg[]) { .type = ALC_FIXUP_PINS,
.v.pins = (const struct alc_pincfg[]) {
{ 0x15, 0x99130112 }, /* subwoofer */ { 0x15, 0x99130112 }, /* subwoofer */
{ } { }
} }
}, },
[ALC662_FIXUP_IDEAPAD] = { [ALC662_FIXUP_IDEAPAD] = {
.pins = (const struct alc_pincfg[]) { .type = ALC_FIXUP_PINS,
.v.pins = (const struct alc_pincfg[]) {
{ 0x17, 0x99130112 }, /* subwoofer */ { 0x17, 0x99130112 }, /* subwoofer */
{ } { }
} }
}, },
[ALC272_FIXUP_MARIO] = { [ALC272_FIXUP_MARIO] = {
.func = alc272_fixup_mario, .type = ALC_FIXUP_FUNC,
.v.func = alc272_fixup_mario,
} }
}; };
@ -19462,7 +19534,9 @@ static int patch_alc662(struct hda_codec *codec)
} }
if (board_config == ALC662_AUTO) { if (board_config == ALC662_AUTO) {
alc_pick_fixup(codec, alc662_fixup_tbl, alc662_fixups, 1); alc_pick_fixup(codec, alc662_fixup_models,
alc662_fixup_tbl, alc662_fixups);
alc_apply_fixup(codec, ALC_FIXUP_ACT_PRE_PROBE);
/* automatic parse from the BIOS config */ /* automatic parse from the BIOS config */
err = alc662_parse_auto_config(codec); err = alc662_parse_auto_config(codec);
if (err < 0) { if (err < 0) {
@ -19520,12 +19594,11 @@ static int patch_alc662(struct hda_codec *codec)
} }
spec->vmaster_nid = 0x02; spec->vmaster_nid = 0x02;
alc_apply_fixup(codec, ALC_FIXUP_ACT_PROBE);
codec->patch_ops = alc_patch_ops; codec->patch_ops = alc_patch_ops;
if (board_config == ALC662_AUTO) { if (board_config == ALC662_AUTO)
spec->init_hook = alc662_auto_init; spec->init_hook = alc662_auto_init;
alc_pick_fixup_model(codec, alc662_fixup_models,
alc662_fixup_tbl, alc662_fixups, 0);
}
alc_init_jacks(codec); alc_init_jacks(codec);
@ -19913,7 +19986,7 @@ static void alc680_auto_init(struct hda_codec *codec)
/* /*
* configuration and preset * configuration and preset
*/ */
static const char *alc680_models[ALC680_MODEL_LAST] = { static const char * const alc680_models[ALC680_MODEL_LAST] = {
[ALC680_BASE] = "base", [ALC680_BASE] = "base",
[ALC680_AUTO] = "auto", [ALC680_AUTO] = "auto",
}; };

89
sound/pci/hda/patch_sigmatel.c
View File

@ -266,7 +266,7 @@ struct sigmatel_spec {
struct sigmatel_mic_route int_mic; struct sigmatel_mic_route int_mic;
struct sigmatel_mic_route dock_mic; struct sigmatel_mic_route dock_mic;
const char **spdif_labels; const char * const *spdif_labels;
hda_nid_t dig_in_nid; hda_nid_t dig_in_nid;
hda_nid_t mono_nid; hda_nid_t mono_nid;
@ -524,7 +524,7 @@ static unsigned long stac927x_capsws[] = {
HDA_COMPOSE_AMP_VAL(0x1d, 3, 0, HDA_OUTPUT), HDA_COMPOSE_AMP_VAL(0x1d, 3, 0, HDA_OUTPUT),
}; };
static const char *stac927x_spdif_labels[5] = { static const char * const stac927x_spdif_labels[5] = {
"Digital Playback", "ADAT", "Analog Mux 1", "Digital Playback", "ADAT", "Analog Mux 1",
"Analog Mux 2", "Analog Mux 3" "Analog Mux 2", "Analog Mux 3"
}; };
@ -1062,7 +1062,7 @@ static struct snd_kcontrol_new stac_smux_mixer = {
.put = stac92xx_smux_enum_put, .put = stac92xx_smux_enum_put,
}; };
static const char *slave_vols[] = { static const char * const slave_vols[] = {
"Front Playback Volume", "Front Playback Volume",
"Surround Playback Volume", "Surround Playback Volume",
"Center Playback Volume", "Center Playback Volume",
@ -1073,7 +1073,7 @@ static const char *slave_vols[] = {
NULL NULL
}; };
static const char *slave_sws[] = { static const char * const slave_sws[] = {
"Front Playback Switch", "Front Playback Switch",
"Surround Playback Switch", "Surround Playback Switch",
"Center Playback Switch", "Center Playback Switch",
@ -1354,7 +1354,7 @@ static unsigned int *stac9200_brd_tbl[STAC_9200_MODELS] = {
[STAC_9200_PANASONIC] = ref9200_pin_configs, [STAC_9200_PANASONIC] = ref9200_pin_configs,
}; };
static const char *stac9200_models[STAC_9200_MODELS] = { static const char * const stac9200_models[STAC_9200_MODELS] = {
[STAC_AUTO] = "auto", [STAC_AUTO] = "auto",
[STAC_REF] = "ref", [STAC_REF] = "ref",
[STAC_9200_OQO] = "oqo", [STAC_9200_OQO] = "oqo",
@ -1500,7 +1500,7 @@ static unsigned int *stac925x_brd_tbl[STAC_925x_MODELS] = {
[STAC_M6] = stac925xM6_pin_configs, [STAC_M6] = stac925xM6_pin_configs,
}; };
static const char *stac925x_models[STAC_925x_MODELS] = { static const char * const stac925x_models[STAC_925x_MODELS] = {
[STAC_925x_AUTO] = "auto", [STAC_925x_AUTO] = "auto",
[STAC_REF] = "ref", [STAC_REF] = "ref",
[STAC_M1] = "m1", [STAC_M1] = "m1",
@ -1574,7 +1574,7 @@ static unsigned int *stac92hd73xx_brd_tbl[STAC_92HD73XX_MODELS] = {
[STAC_92HD73XX_INTEL] = intel_dg45id_pin_configs, [STAC_92HD73XX_INTEL] = intel_dg45id_pin_configs,
}; };
static const char *stac92hd73xx_models[STAC_92HD73XX_MODELS] = { static const char * const stac92hd73xx_models[STAC_92HD73XX_MODELS] = {
[STAC_92HD73XX_AUTO] = "auto", [STAC_92HD73XX_AUTO] = "auto",
[STAC_92HD73XX_NO_JD] = "no-jd", [STAC_92HD73XX_NO_JD] = "no-jd",
[STAC_92HD73XX_REF] = "ref", [STAC_92HD73XX_REF] = "ref",
@ -1660,7 +1660,7 @@ static unsigned int *stac92hd83xxx_brd_tbl[STAC_92HD83XXX_MODELS] = {
[STAC_HP_DV7_4000] = hp_dv7_4000_pin_configs, [STAC_HP_DV7_4000] = hp_dv7_4000_pin_configs,
}; };
static const char *stac92hd83xxx_models[STAC_92HD83XXX_MODELS] = { static const char * const stac92hd83xxx_models[STAC_92HD83XXX_MODELS] = {
[STAC_92HD83XXX_AUTO] = "auto", [STAC_92HD83XXX_AUTO] = "auto",
[STAC_92HD83XXX_REF] = "ref", [STAC_92HD83XXX_REF] = "ref",
[STAC_92HD83XXX_PWR_REF] = "mic-ref", [STAC_92HD83XXX_PWR_REF] = "mic-ref",
@ -1722,7 +1722,7 @@ static unsigned int *stac92hd71bxx_brd_tbl[STAC_92HD71BXX_MODELS] = {
[STAC_HP_DV4_1222NR] = NULL, [STAC_HP_DV4_1222NR] = NULL,
}; };
static const char *stac92hd71bxx_models[STAC_92HD71BXX_MODELS] = { static const char * const stac92hd71bxx_models[STAC_92HD71BXX_MODELS] = {
[STAC_92HD71BXX_AUTO] = "auto", [STAC_92HD71BXX_AUTO] = "auto",
[STAC_92HD71BXX_REF] = "ref", [STAC_92HD71BXX_REF] = "ref",
[STAC_DELL_M4_1] = "dell-m4-1", [STAC_DELL_M4_1] = "dell-m4-1",
@ -1915,7 +1915,7 @@ static unsigned int *stac922x_brd_tbl[STAC_922X_MODELS] = {
[STAC_922X_DELL_M82] = dell_922x_m82_pin_configs, [STAC_922X_DELL_M82] = dell_922x_m82_pin_configs,
}; };
static const char *stac922x_models[STAC_922X_MODELS] = { static const char * const stac922x_models[STAC_922X_MODELS] = {
[STAC_922X_AUTO] = "auto", [STAC_922X_AUTO] = "auto",
[STAC_D945_REF] = "ref", [STAC_D945_REF] = "ref",
[STAC_D945GTP5] = "5stack", [STAC_D945GTP5] = "5stack",
@ -2077,7 +2077,7 @@ static unsigned int *stac927x_brd_tbl[STAC_927X_MODELS] = {
[STAC_927X_VOLKNOB] = NULL, [STAC_927X_VOLKNOB] = NULL,
}; };
static const char *stac927x_models[STAC_927X_MODELS] = { static const char * const stac927x_models[STAC_927X_MODELS] = {
[STAC_927X_AUTO] = "auto", [STAC_927X_AUTO] = "auto",
[STAC_D965_REF_NO_JD] = "ref-no-jd", [STAC_D965_REF_NO_JD] = "ref-no-jd",
[STAC_D965_REF] = "ref", [STAC_D965_REF] = "ref",
@ -2180,7 +2180,7 @@ static unsigned int *stac9205_brd_tbl[STAC_9205_MODELS] = {
[STAC_9205_EAPD] = NULL, [STAC_9205_EAPD] = NULL,
}; };
static const char *stac9205_models[STAC_9205_MODELS] = { static const char * const stac9205_models[STAC_9205_MODELS] = {
[STAC_9205_AUTO] = "auto", [STAC_9205_AUTO] = "auto",
[STAC_9205_REF] = "ref", [STAC_9205_REF] = "ref",
[STAC_9205_DELL_M42] = "dell-m42", [STAC_9205_DELL_M42] = "dell-m42",
@ -3123,7 +3123,7 @@ static int create_multi_out_ctls(struct hda_codec *codec, int num_outs,
int type) int type)
{ {
struct sigmatel_spec *spec = codec->spec; struct sigmatel_spec *spec = codec->spec;
static const char *chname[4] = { static const char * const chname[4] = {
"Front", "Surround", NULL /*CLFE*/, "Side" "Front", "Surround", NULL /*CLFE*/, "Side"
}; };
hda_nid_t nid; hda_nid_t nid;
@ -3256,7 +3256,7 @@ static int stac92xx_auto_create_hp_ctls(struct hda_codec *codec,
} }
/* labels for mono mux outputs */ /* labels for mono mux outputs */
static const char *stac92xx_mono_labels[4] = { static const char * const stac92xx_mono_labels[4] = {
"DAC0", "DAC1", "Mixer", "DAC2" "DAC0", "DAC1", "Mixer", "DAC2"
}; };
@ -3380,7 +3380,7 @@ static int stac92xx_auto_create_mux_input_ctls(struct hda_codec *codec)
return 0; return 0;
}; };
static const char *stac92xx_spdif_labels[3] = { static const char * const stac92xx_spdif_labels[3] = {
"Digital Playback", "Analog Mux 1", "Analog Mux 2", "Digital Playback", "Analog Mux 1", "Analog Mux 2",
}; };
@ -3388,7 +3388,7 @@ static int stac92xx_auto_create_spdif_mux_ctls(struct hda_codec *codec)
{ {
struct sigmatel_spec *spec = codec->spec; struct sigmatel_spec *spec = codec->spec;
struct hda_input_mux *spdif_mux = &spec->private_smux; struct hda_input_mux *spdif_mux = &spec->private_smux;
const char **labels = spec->spdif_labels; const char * const *labels = spec->spdif_labels;
int i, num_cons; int i, num_cons;
hda_nid_t con_lst[HDA_MAX_NUM_INPUTS]; hda_nid_t con_lst[HDA_MAX_NUM_INPUTS];
@ -3409,7 +3409,7 @@ static int stac92xx_auto_create_spdif_mux_ctls(struct hda_codec *codec)
} }
/* labels for dmic mux inputs */ /* labels for dmic mux inputs */
static const char *stac92xx_dmic_labels[5] = { static const char * const stac92xx_dmic_labels[5] = {
"Analog Inputs", "Digital Mic 1", "Digital Mic 2", "Analog Inputs", "Digital Mic 1", "Digital Mic 2",
"Digital Mic 3", "Digital Mic 4" "Digital Mic 3", "Digital Mic 4"
}; };
@ -5333,7 +5333,7 @@ again:
return 0; return 0;
} }
static int stac92hd83xxx_set_system_btl_amp(struct hda_codec *codec) static int hp_bnb2011_with_dock(struct hda_codec *codec)
{ {
if (codec->vendor_id != 0x111d7605 && if (codec->vendor_id != 0x111d7605 &&
codec->vendor_id != 0x111d76d1) codec->vendor_id != 0x111d76d1)
@ -5348,10 +5348,6 @@ static int stac92hd83xxx_set_system_btl_amp(struct hda_codec *codec)
case 0x103c161d: case 0x103c161d:
case 0x103c161e: case 0x103c161e:
case 0x103c161f: case 0x103c161f:
case 0x103c1620:
case 0x103c1621:
case 0x103c1622:
case 0x103c1623:
case 0x103c162a: case 0x103c162a:
case 0x103c162b: case 0x103c162b:
@ -5360,41 +5356,9 @@ static int stac92hd83xxx_set_system_btl_amp(struct hda_codec *codec)
case 0x103c1631: case 0x103c1631:
case 0x103c1633: case 0x103c1633:
case 0x103c1634:
case 0x103c1635: case 0x103c1635:
case 0x103c164f:
case 0x103c1676:
case 0x103c1677:
case 0x103c1678:
case 0x103c1679:
case 0x103c167a:
case 0x103c167b:
case 0x103c167c:
case 0x103c167d:
case 0x103c167e:
case 0x103c167f:
case 0x103c1680:
case 0x103c1681:
case 0x103c1682:
case 0x103c1683:
case 0x103c1684:
case 0x103c1685:
case 0x103c1686:
case 0x103c1687:
case 0x103c1688:
case 0x103c1689:
case 0x103c168a:
case 0x103c168b:
case 0x103c168c:
case 0x103c168d:
case 0x103c168e:
case 0x103c168f:
case 0x103c1690:
case 0x103c1691:
case 0x103c1692:
case 0x103c3587: case 0x103c3587:
case 0x103c3588: case 0x103c3588:
case 0x103c3589: case 0x103c3589:
@ -5402,9 +5366,9 @@ static int stac92hd83xxx_set_system_btl_amp(struct hda_codec *codec)
case 0x103c3667: case 0x103c3667:
case 0x103c3668: case 0x103c3668:
/* set BTL amp level to 13.43dB for louder speaker output */ case 0x103c3669:
return snd_hda_codec_write_cache(codec, codec->afg, 0,
0x7F4, 0x14); return 1;
} }
return 0; return 0;
} }
@ -5420,6 +5384,11 @@ static int patch_stac92hd83xxx(struct hda_codec *codec)
if (spec == NULL) if (spec == NULL)
return -ENOMEM; return -ENOMEM;
if (hp_bnb2011_with_dock(codec)) {
snd_hda_codec_set_pincfg(codec, 0xa, 0x2101201f);
snd_hda_codec_set_pincfg(codec, 0xf, 0x2181205e);
}
/* reset pin power-down; Windows may leave these bits after reboot */ /* reset pin power-down; Windows may leave these bits after reboot */
snd_hda_codec_write_cache(codec, codec->afg, 0, 0x7EC, 0); snd_hda_codec_write_cache(codec, codec->afg, 0, 0x7EC, 0);
snd_hda_codec_write_cache(codec, codec->afg, 0, 0x7ED, 0); snd_hda_codec_write_cache(codec, codec->afg, 0, 0x7ED, 0);
@ -5546,8 +5515,6 @@ again:
AC_VERB_SET_CONNECT_SEL, num_dacs); AC_VERB_SET_CONNECT_SEL, num_dacs);
} }
stac92hd83xxx_set_system_btl_amp(codec);
codec->proc_widget_hook = stac92hd_proc_hook; codec->proc_widget_hook = stac92hd_proc_hook;
return 0; return 0;
@ -6270,7 +6237,7 @@ static unsigned int stac9872_vaio_pin_configs[9] = {
0x90a7013e 0x90a7013e
}; };
static const char *stac9872_models[STAC_9872_MODELS] = { static const char * const stac9872_models[STAC_9872_MODELS] = {
[STAC_9872_AUTO] = "auto", [STAC_9872_AUTO] = "auto",
[STAC_9872_VAIO] = "vaio", [STAC_9872_VAIO] = "vaio",
}; };

28
sound/pci/hda/patch_via.c
View File

@ -2281,7 +2281,9 @@ static int vt1708_auto_create_multi_out_ctls(struct via_spec *spec,
const struct auto_pin_cfg *cfg) const struct auto_pin_cfg *cfg)
{ {
char name[32]; char name[32];
static const char *chname[4] = { "Front", "Surround", "C/LFE", "Side" }; static const char * const chname[4] = {
"Front", "Surround", "C/LFE", "Side"
};
hda_nid_t nid, nid_vol, nid_vols[] = {0x17, 0x19, 0x1a, 0x1b}; hda_nid_t nid, nid_vol, nid_vols[] = {0x17, 0x19, 0x1a, 0x1b};
int i, err; int i, err;
@ -2370,7 +2372,7 @@ static void create_hp_imux(struct via_spec *spec)
{ {
int i; int i;
struct hda_input_mux *imux = &spec->private_imux[1]; struct hda_input_mux *imux = &spec->private_imux[1];
static const char *texts[] = { "OFF", "ON", NULL}; static const char * const texts[] = { "OFF", "ON", NULL};
/* for hp mode select */ /* for hp mode select */
for (i = 0; texts[i]; i++) for (i = 0; texts[i]; i++)
@ -2890,7 +2892,9 @@ static int vt1709_auto_create_multi_out_ctls(struct via_spec *spec,
const struct auto_pin_cfg *cfg) const struct auto_pin_cfg *cfg)
{ {
char name[32]; char name[32];
static const char *chname[4] = { "Front", "Surround", "C/LFE", "Side" }; static const char * const chname[4] = {
"Front", "Surround", "C/LFE", "Side"
};
hda_nid_t nid, nid_vol, nid_vols[] = {0x18, 0x1a, 0x1b, 0x29}; hda_nid_t nid, nid_vol, nid_vols[] = {0x18, 0x1a, 0x1b, 0x29};
int i, err; int i, err;
@ -3433,7 +3437,9 @@ static int vt1708B_auto_create_multi_out_ctls(struct via_spec *spec,
const struct auto_pin_cfg *cfg) const struct auto_pin_cfg *cfg)
{ {
char name[32]; char name[32];
static const char *chname[4] = { "Front", "Surround", "C/LFE", "Side" }; static const char * const chname[4] = {
"Front", "Surround", "C/LFE", "Side"
};
hda_nid_t nid_vols[] = {0x16, 0x18, 0x26, 0x27}; hda_nid_t nid_vols[] = {0x16, 0x18, 0x26, 0x27};
hda_nid_t nid, nid_vol = 0; hda_nid_t nid, nid_vol = 0;
int i, err; int i, err;
@ -3861,7 +3867,9 @@ static int vt1708S_auto_create_multi_out_ctls(struct via_spec *spec,
const struct auto_pin_cfg *cfg) const struct auto_pin_cfg *cfg)
{ {
char name[32]; char name[32];
static const char *chname[4] = { "Front", "Surround", "C/LFE", "Side" }; static const char * const chname[4] = {
"Front", "Surround", "C/LFE", "Side"
};
hda_nid_t nid_vols[] = {0x10, 0x11, 0x24, 0x25}; hda_nid_t nid_vols[] = {0x10, 0x11, 0x24, 0x25};
hda_nid_t nid_mutes[] = {0x1C, 0x18, 0x26, 0x27}; hda_nid_t nid_mutes[] = {0x1C, 0x18, 0x26, 0x27};
hda_nid_t nid, nid_vol, nid_mute; hda_nid_t nid, nid_vol, nid_mute;
@ -4304,7 +4312,7 @@ static int vt1702_auto_create_hp_ctls(struct via_spec *spec, hda_nid_t pin)
{ {
int err, i; int err, i;
struct hda_input_mux *imux; struct hda_input_mux *imux;
static const char *texts[] = { "ON", "OFF", NULL}; static const char * const texts[] = { "ON", "OFF", NULL};
if (!pin) if (!pin)
return 0; return 0;
spec->multiout.hp_nid = 0x1D; spec->multiout.hp_nid = 0x1D;
@ -4615,7 +4623,9 @@ static int vt1718S_auto_create_multi_out_ctls(struct via_spec *spec,
const struct auto_pin_cfg *cfg) const struct auto_pin_cfg *cfg)
{ {
char name[32]; char name[32];
static const char *chname[4] = { "Front", "Surround", "C/LFE", "Side" }; static const char * const chname[4] = {
"Front", "Surround", "C/LFE", "Side"
};
hda_nid_t nid_vols[] = {0x8, 0x9, 0xa, 0xb}; hda_nid_t nid_vols[] = {0x8, 0x9, 0xa, 0xb};
hda_nid_t nid_mutes[] = {0x24, 0x25, 0x26, 0x27}; hda_nid_t nid_mutes[] = {0x24, 0x25, 0x26, 0x27};
hda_nid_t nid, nid_vol, nid_mute = 0; hda_nid_t nid, nid_vol, nid_mute = 0;
@ -5064,7 +5074,9 @@ static int vt1716S_auto_create_multi_out_ctls(struct via_spec *spec,
const struct auto_pin_cfg *cfg) const struct auto_pin_cfg *cfg)
{ {
char name[32]; char name[32];
static const char *chname[3] = { "Front", "Surround", "C/LFE" }; static const char * const chname[3] = {
"Front", "Surround", "C/LFE"
};
hda_nid_t nid_vols[] = {0x10, 0x11, 0x25}; hda_nid_t nid_vols[] = {0x10, 0x11, 0x25};
hda_nid_t nid_mutes[] = {0x1C, 0x18, 0x27}; hda_nid_t nid_mutes[] = {0x1C, 0x18, 0x27};
hda_nid_t nid, nid_vol, nid_mute; hda_nid_t nid, nid_vol, nid_mute;

2
sound/pci/oxygen/xonar_dg.c
View File

@ -75,7 +75,7 @@ static void cs4245_write(struct oxygen *chip, unsigned int reg, u8 value)
OXYGEN_SPI_CEN_LATCH_CLOCK_HI, OXYGEN_SPI_CEN_LATCH_CLOCK_HI,
CS4245_SPI_ADDRESS | CS4245_SPI_ADDRESS |
CS4245_SPI_WRITE | CS4245_SPI_WRITE |
(value << 8) | reg); (reg << 8) | value);
data->cs4245_regs[reg] = value; data->cs4245_regs[reg] = value;
} }

2
sound/soc/codecs/Kconfig
View File

@ -44,7 +44,7 @@ config SND_SOC_ALL_CODECS
select SND_SOC_TWL6040 if TWL4030_CORE select SND_SOC_TWL6040 if TWL4030_CORE
select SND_SOC_UDA134X select SND_SOC_UDA134X
select SND_SOC_UDA1380 if I2C select SND_SOC_UDA1380 if I2C
select SND_SOC_WL1273 if WL1273_CORE select SND_SOC_WL1273 if RADIO_WL1273
select SND_SOC_WM2000 if I2C select SND_SOC_WM2000 if I2C
select SND_SOC_WM8350 if MFD_WM8350 select SND_SOC_WM8350 if MFD_WM8350
select SND_SOC_WM8400 if MFD_WM8400 select SND_SOC_WM8400 if MFD_WM8400

29
sound/soc/codecs/wl1273.c
View File

@ -42,7 +42,7 @@ struct wl1273_priv {
static int snd_wl1273_fm_set_i2s_mode(struct wl1273_core *core, static int snd_wl1273_fm_set_i2s_mode(struct wl1273_core *core,
int rate, int width) int rate, int width)
{ {
struct device *dev = &core->i2c_dev->dev; struct device *dev = &core->client->dev;
int r = 0; int r = 0;
u16 mode; u16 mode;
@ -123,13 +123,13 @@ static int snd_wl1273_fm_set_i2s_mode(struct wl1273_core *core,
dev_dbg(dev, "mode: 0x%04x\n", mode); dev_dbg(dev, "mode: 0x%04x\n", mode);
if (core->i2s_mode != mode) { if (core->i2s_mode != mode) {
r = wl1273_fm_write_cmd(core, WL1273_I2S_MODE_CONFIG_SET, mode); r = core->write(core, WL1273_I2S_MODE_CONFIG_SET, mode);
if (r) if (r)
goto out; goto out;
core->i2s_mode = mode; core->i2s_mode = mode;
r = wl1273_fm_write_cmd(core, WL1273_AUDIO_ENABLE, r = core->write(core, WL1273_AUDIO_ENABLE,
WL1273_AUDIO_ENABLE_I2S); WL1273_AUDIO_ENABLE_I2S);
if (r) if (r)
goto out; goto out;
} }
@ -142,8 +142,7 @@ out:
static int snd_wl1273_fm_set_channel_number(struct wl1273_core *core, static int snd_wl1273_fm_set_channel_number(struct wl1273_core *core,
int channel_number) int channel_number)
{ {
struct i2c_client *client = core->i2c_dev; struct device *dev = &core->client->dev;
struct device *dev = &client->dev;
int r = 0; int r = 0;
dev_dbg(dev, "%s\n", __func__); dev_dbg(dev, "%s\n", __func__);
@ -154,17 +153,13 @@ static int snd_wl1273_fm_set_channel_number(struct wl1273_core *core,
goto out; goto out;
if (channel_number == 1 && core->mode == WL1273_MODE_RX) if (channel_number == 1 && core->mode == WL1273_MODE_RX)
r = wl1273_fm_write_cmd(core, WL1273_MOST_MODE_SET, r = core->write(core, WL1273_MOST_MODE_SET, WL1273_RX_MONO);
WL1273_RX_MONO);
else if (channel_number == 1 && core->mode == WL1273_MODE_TX) else if (channel_number == 1 && core->mode == WL1273_MODE_TX)
r = wl1273_fm_write_cmd(core, WL1273_MONO_SET, r = core->write(core, WL1273_MONO_SET, WL1273_TX_MONO);
WL1273_TX_MONO);
else if (channel_number == 2 && core->mode == WL1273_MODE_RX) else if (channel_number == 2 && core->mode == WL1273_MODE_RX)
r = wl1273_fm_write_cmd(core, WL1273_MOST_MODE_SET, r = core->write(core, WL1273_MOST_MODE_SET, WL1273_RX_STEREO);
WL1273_RX_STEREO);
else if (channel_number == 2 && core->mode == WL1273_MODE_TX) else if (channel_number == 2 && core->mode == WL1273_MODE_TX)
r = wl1273_fm_write_cmd(core, WL1273_MONO_SET, r = core->write(core, WL1273_MONO_SET, WL1273_TX_STEREO);
WL1273_TX_STEREO);
else else
r = -EINVAL; r = -EINVAL;
out: out:
@ -237,7 +232,7 @@ static int snd_wl1273_fm_audio_put(struct snd_kcontrol *kcontrol,
if (wl1273->core->audio_mode == val) if (wl1273->core->audio_mode == val)
return 0; return 0;
r = wl1273_fm_set_audio(wl1273->core, val); r = wl1273->core->set_audio(wl1273->core, val);
if (r < 0) if (r < 0)
return r; return r;
@ -272,8 +267,8 @@ static int snd_wl1273_fm_volume_put(struct snd_kcontrol *kcontrol,
dev_dbg(codec->dev, "%s: enter.\n", __func__); dev_dbg(codec->dev, "%s: enter.\n", __func__);
r = wl1273_fm_set_volume(wl1273->core, r = wl1273->core->set_volume(wl1273->core,
ucontrol->value.integer.value[0]); ucontrol->value.integer.value[0]);
if (r) if (r)
return r; return r;

71
sound/soc/codecs/wl1273.h
View File

@ -25,77 +25,6 @@
#ifndef __WL1273_CODEC_H__ #ifndef __WL1273_CODEC_H__
#define __WL1273_CODEC_H__ #define __WL1273_CODEC_H__
/* I2S protocol, left channel first, data width 16 bits */
#define WL1273_PCM_DEF_MODE 0x00
/* Rx */
#define WL1273_AUDIO_ENABLE_I2S (1 << 0)
#define WL1273_AUDIO_ENABLE_ANALOG (1 << 1)
/* Tx */
#define WL1273_AUDIO_IO_SET_ANALOG 0
#define WL1273_AUDIO_IO_SET_I2S 1
#define WL1273_POWER_SET_OFF 0
#define WL1273_POWER_SET_FM (1 << 0)
#define WL1273_POWER_SET_RDS (1 << 1)
#define WL1273_POWER_SET_RETENTION (1 << 4)
#define WL1273_PUPD_SET_OFF 0x00
#define WL1273_PUPD_SET_ON 0x01
#define WL1273_PUPD_SET_RETENTION 0x10
/* I2S mode */
#define WL1273_IS2_WIDTH_32 0x0
#define WL1273_IS2_WIDTH_40 0x1
#define WL1273_IS2_WIDTH_22_23 0x2
#define WL1273_IS2_WIDTH_23_22 0x3
#define WL1273_IS2_WIDTH_48 0x4
#define WL1273_IS2_WIDTH_50 0x5
#define WL1273_IS2_WIDTH_60 0x6
#define WL1273_IS2_WIDTH_64 0x7
#define WL1273_IS2_WIDTH_80 0x8
#define WL1273_IS2_WIDTH_96 0x9
#define WL1273_IS2_WIDTH_128 0xa
#define WL1273_IS2_WIDTH 0xf
#define WL1273_IS2_FORMAT_STD (0x0 << 4)
#define WL1273_IS2_FORMAT_LEFT (0x1 << 4)
#define WL1273_IS2_FORMAT_RIGHT (0x2 << 4)
#define WL1273_IS2_FORMAT_USER (0x3 << 4)
#define WL1273_IS2_MASTER (0x0 << 6)
#define WL1273_IS2_SLAVEW (0x1 << 6)
#define WL1273_IS2_TRI_AFTER_SENDING (0x0 << 7)
#define WL1273_IS2_TRI_ALWAYS_ACTIVE (0x1 << 7)
#define WL1273_IS2_SDOWS_RR (0x0 << 8)
#define WL1273_IS2_SDOWS_RF (0x1 << 8)
#define WL1273_IS2_SDOWS_FR (0x2 << 8)
#define WL1273_IS2_SDOWS_FF (0x3 << 8)
#define WL1273_IS2_TRI_OPT (0x0 << 10)
#define WL1273_IS2_TRI_ALWAYS (0x1 << 10)
#define WL1273_IS2_RATE_48K (0x0 << 12)
#define WL1273_IS2_RATE_44_1K (0x1 << 12)
#define WL1273_IS2_RATE_32K (0x2 << 12)
#define WL1273_IS2_RATE_22_05K (0x4 << 12)
#define WL1273_IS2_RATE_16K (0x5 << 12)
#define WL1273_IS2_RATE_12K (0x8 << 12)
#define WL1273_IS2_RATE_11_025 (0x9 << 12)
#define WL1273_IS2_RATE_8K (0xa << 12)
#define WL1273_IS2_RATE (0xf << 12)
#define WL1273_I2S_DEF_MODE (WL1273_IS2_WIDTH_32 | \
WL1273_IS2_FORMAT_STD | \
WL1273_IS2_MASTER | \
WL1273_IS2_TRI_AFTER_SENDING | \
WL1273_IS2_SDOWS_RR | \
WL1273_IS2_TRI_OPT | \
WL1273_IS2_RATE_48K)
int wl1273_get_format(struct snd_soc_codec *codec, unsigned int *fmt); int wl1273_get_format(struct snd_soc_codec *codec, unsigned int *fmt);
#endif /* End of __WL1273_CODEC_H__ */ #endif /* End of __WL1273_CODEC_H__ */

10
sound/soc/codecs/wm8990.c
View File

@ -1183,7 +1183,7 @@ static int wm8990_set_bias_level(struct snd_soc_codec *codec,
WM8990_VMIDTOG); WM8990_VMIDTOG);
/* Delay to allow output caps to discharge */ /* Delay to allow output caps to discharge */
msleep(msecs_to_jiffies(300)); msleep(300);
/* Disable VMIDTOG */ /* Disable VMIDTOG */
snd_soc_write(codec, WM8990_ANTIPOP2, WM8990_SOFTST | snd_soc_write(codec, WM8990_ANTIPOP2, WM8990_SOFTST |
@ -1195,17 +1195,17 @@ static int wm8990_set_bias_level(struct snd_soc_codec *codec,
/* Enable outputs */ /* Enable outputs */
snd_soc_write(codec, WM8990_POWER_MANAGEMENT_1, 0x1b00); snd_soc_write(codec, WM8990_POWER_MANAGEMENT_1, 0x1b00);
msleep(msecs_to_jiffies(50)); msleep(50);
/* Enable VMID at 2x50k */ /* Enable VMID at 2x50k */
snd_soc_write(codec, WM8990_POWER_MANAGEMENT_1, 0x1f02); snd_soc_write(codec, WM8990_POWER_MANAGEMENT_1, 0x1f02);
msleep(msecs_to_jiffies(100)); msleep(100);
/* Enable VREF */ /* Enable VREF */
snd_soc_write(codec, WM8990_POWER_MANAGEMENT_1, 0x1f03); snd_soc_write(codec, WM8990_POWER_MANAGEMENT_1, 0x1f03);
msleep(msecs_to_jiffies(600)); msleep(600);
/* Enable BUFIOEN */ /* Enable BUFIOEN */
snd_soc_write(codec, WM8990_ANTIPOP2, WM8990_SOFTST | snd_soc_write(codec, WM8990_ANTIPOP2, WM8990_SOFTST |
@ -1250,7 +1250,7 @@ static int wm8990_set_bias_level(struct snd_soc_codec *codec,
/* Disable VMID */ /* Disable VMID */
snd_soc_write(codec, WM8990_POWER_MANAGEMENT_1, 0x1f01); snd_soc_write(codec, WM8990_POWER_MANAGEMENT_1, 0x1f01);
msleep(msecs_to_jiffies(300)); msleep(300);
/* Enable all output discharge bits */ /* Enable all output discharge bits */
snd_soc_write(codec, WM8990_ANTIPOP1, WM8990_DIS_LLINE | snd_soc_write(codec, WM8990_ANTIPOP1, WM8990_DIS_LLINE |

18
sound/soc/ep93xx/ep93xx-i2s.c
View File

@ -267,14 +267,16 @@ static int ep93xx_i2s_hw_params(struct snd_pcm_substream *substream,
ep93xx_i2s_write_reg(info, EP93XX_I2S_RXWRDLEN, word_len); ep93xx_i2s_write_reg(info, EP93XX_I2S_RXWRDLEN, word_len);
/* /*
* Calculate the sdiv (bit clock) and lrdiv (left/right clock) values. * EP93xx I2S module can be setup so SCLK / LRCLK value can be
* If the lrclk is pulse length is larger than the word size, then the * 32, 64, 128. MCLK / SCLK value can be 2 and 4.
* bit clock will be gated for the unused bits. * We set LRCLK equal to `rate' and minimum SCLK / LRCLK
* value is 64, because our sample size is 32 bit * 2 channels.
* I2S standard permits us to transmit more bits than
* the codec uses.
*/ */
div = (clk_get_rate(info->mclk) / params_rate(params)) * div = clk_get_rate(info->mclk) / params_rate(params);
params_channels(params);
for (sdiv = 2; sdiv <= 4; sdiv += 2) for (sdiv = 2; sdiv <= 4; sdiv += 2)
for (lrdiv = 32; lrdiv <= 128; lrdiv <<= 1) for (lrdiv = 64; lrdiv <= 128; lrdiv <<= 1)
if (sdiv * lrdiv == div) { if (sdiv * lrdiv == div) {
found = 1; found = 1;
goto out; goto out;
@ -341,9 +343,7 @@ static struct snd_soc_dai_ops ep93xx_i2s_dai_ops = {
.set_fmt = ep93xx_i2s_set_dai_fmt, .set_fmt = ep93xx_i2s_set_dai_fmt,
}; };
#define EP93XX_I2S_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | \ #define EP93XX_I2S_FORMATS (SNDRV_PCM_FMTBIT_S32_LE)
SNDRV_PCM_FMTBIT_S24_LE | \
SNDRV_PCM_FMTBIT_S32_LE)
static struct snd_soc_dai_driver ep93xx_i2s_dai = { static struct snd_soc_dai_driver ep93xx_i2s_dai = {
.symmetric_rates= 1, .symmetric_rates= 1,