Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2cd52e6 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/asoc' into for-linus

parents ef4b18e2 bab02124

sound/soc/codecs/tlv320aic23.c

+1 −1
Original line number Diff line number Diff line
@@ -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*/

};

/*

sound/soc/omap/omap3pandora.c

+2 −1
Original line number Diff line number Diff line
@@ -134,7 +134,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),
@@ -181,6 +181,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));

sound/soc/omap/omap3evm.c

+1 −1

File changed.

Contains only whitespace changes.