Merge branch 'for-2.6.32' into for-2.6.33
This commit is contained in:
commit
41b51dd47e
|
@ -265,8 +265,8 @@ static const int bosr_usb_divisor_table[] = {
|
|||
#define UPPER_GROUP ((1<<8) | (1<<9) | (1<<10) | (1<<11) | (1<<15))
|
||||
static const unsigned short sr_valid_mask[] = {
|
||||
LOWER_GROUP|UPPER_GROUP, /* Normal, bosr - 0*/
|
||||
LOWER_GROUP|UPPER_GROUP, /* Normal, bosr - 1*/
|
||||
LOWER_GROUP, /* Usb, bosr - 0*/
|
||||
LOWER_GROUP|UPPER_GROUP, /* Normal, bosr - 1*/
|
||||
UPPER_GROUP, /* Usb, bosr - 1*/
|
||||
};
|
||||
/*
|
||||
|
|
|
@ -151,4 +151,4 @@ module_exit(omap3evm_soc_exit);
|
|||
|
||||
MODULE_AUTHOR("Anuj Aggarwal <anuj.aggarwal@ti.com>");
|
||||
MODULE_DESCRIPTION("ALSA SoC OMAP3 EVM");
|
||||
MODULE_LICENSE("GPLv2");
|
||||
MODULE_LICENSE("GPL v2");
|
||||
|
|
|
@ -130,7 +130,7 @@ static int omap3pandora_hp_event(struct snd_soc_dapm_widget *w,
|
|||
* |P| <--- TWL4030 <--------- Line In and MICs
|
||||
*/
|
||||
static const struct snd_soc_dapm_widget omap3pandora_out_dapm_widgets[] = {
|
||||
SND_SOC_DAPM_DAC("PCM DAC", "Playback", SND_SOC_NOPM, 0, 0),
|
||||
SND_SOC_DAPM_DAC("PCM DAC", "HiFi Playback", SND_SOC_NOPM, 0, 0),
|
||||
SND_SOC_DAPM_PGA_E("Headphone Amplifier", SND_SOC_NOPM,
|
||||
0, 0, NULL, 0, omap3pandora_hp_event,
|
||||
SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
|
||||
|
@ -177,6 +177,7 @@ static int omap3pandora_out_init(struct snd_soc_codec *codec)
|
|||
snd_soc_dapm_nc_pin(codec, "CARKITR");
|
||||
snd_soc_dapm_nc_pin(codec, "HFL");
|
||||
snd_soc_dapm_nc_pin(codec, "HFR");
|
||||
snd_soc_dapm_nc_pin(codec, "VIBRA");
|
||||
|
||||
ret = snd_soc_dapm_new_controls(codec, omap3pandora_out_dapm_widgets,
|
||||
ARRAY_SIZE(omap3pandora_out_dapm_widgets));
|
||||
|
|
Loading…
Reference in New Issue