tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'fix/asoc' into for-linus

Takashi Iwai e2cd52e6 ef4b18e2

+4 -3
unified split
+1 -1
sound/soc/codecs/tlv320aic23.c
··· 265 265 #define UPPER_GROUP ((1<<8) | (1<<9) | (1<<10) | (1<<11) | (1<<15)) 266 266 static const unsigned short sr_valid_mask[] = { 267 267 LOWER_GROUP|UPPER_GROUP, /* Normal, bosr - 0*/ 268 - LOWER_GROUP|UPPER_GROUP, /* Normal, bosr - 1*/ 269 268 LOWER_GROUP, /* Usb, bosr - 0*/ 269 + LOWER_GROUP|UPPER_GROUP, /* Normal, bosr - 1*/ 270 270 UPPER_GROUP, /* Usb, bosr - 1*/ 271 271 }; 272 272 /*
+1 -1
sound/soc/omap/omap3evm.c
··· 144 144 145 145 MODULE_AUTHOR("Anuj Aggarwal <anuj.aggarwal@ti.com>"); 146 146 MODULE_DESCRIPTION("ALSA SoC OMAP3 EVM"); 147 - MODULE_LICENSE("GPLv2"); 147 + MODULE_LICENSE("GPL v2");
+2 -1
sound/soc/omap/omap3pandora.c
··· 134 134 * |P| <--- TWL4030 <--------- Line In and MICs 135 135 */ 136 136 static const struct snd_soc_dapm_widget omap3pandora_out_dapm_widgets[] = { 137 - SND_SOC_DAPM_DAC("PCM DAC", "Playback", SND_SOC_NOPM, 0, 0), 137 + SND_SOC_DAPM_DAC("PCM DAC", "HiFi Playback", SND_SOC_NOPM, 0, 0), 138 138 SND_SOC_DAPM_PGA_E("Headphone Amplifier", SND_SOC_NOPM, 139 139 0, 0, NULL, 0, omap3pandora_hp_event, 140 140 SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD), ··· 181 181 snd_soc_dapm_nc_pin(codec, "CARKITR"); 182 182 snd_soc_dapm_nc_pin(codec, "HFL"); 183 183 snd_soc_dapm_nc_pin(codec, "HFR"); 184 + snd_soc_dapm_nc_pin(codec, "VIBRA"); 184 185 185 186 ret = snd_soc_dapm_new_controls(codec, omap3pandora_out_dapm_widgets, 186 187 ARRAY_SIZE(omap3pandora_out_dapm_widgets));