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

Commit 80e1b84f authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.38' into for-2.6.39

parents 4cfeb695 7c2de633

sound/soc/codecs/wm8994.c

+9 −1
Original line number Diff line number Diff line
@@ -1424,7 +1424,7 @@ SND_SOC_DAPM_DAC_E("DAC1R", NULL, SND_SOC_NOPM, 0, 0, 


static const struct snd_soc_dapm_widget wm8994_dac_widgets[] = {

SND_SOC_DAPM_DAC("DAC2L", NULL, WM8994_POWER_MANAGEMENT_5, 3, 0),

SND_SOC_DAPM_DAC("DAC1R", NULL, WM8994_POWER_MANAGEMENT_5, 2, 0),

SND_SOC_DAPM_DAC("DAC2R", NULL, WM8994_POWER_MANAGEMENT_5, 2, 0),

SND_SOC_DAPM_DAC("DAC1L", NULL, WM8994_POWER_MANAGEMENT_5, 1, 0),

SND_SOC_DAPM_DAC("DAC1R", NULL, WM8994_POWER_MANAGEMENT_5, 0, 0),

};
@@ -3327,6 +3327,12 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec) 
	case WM8958:

		snd_soc_add_controls(codec, wm8958_snd_controls,

				     ARRAY_SIZE(wm8958_snd_controls));

		snd_soc_dapm_new_controls(dapm, wm8994_lateclk_widgets,

					  ARRAY_SIZE(wm8994_lateclk_widgets));

		snd_soc_dapm_new_controls(dapm, wm8994_adc_widgets,

					  ARRAY_SIZE(wm8994_adc_widgets));

		snd_soc_dapm_new_controls(dapm, wm8994_dac_widgets,

					  ARRAY_SIZE(wm8994_dac_widgets));

		snd_soc_dapm_new_controls(dapm, wm8958_dapm_widgets,

					  ARRAY_SIZE(wm8958_dapm_widgets));

		break;
@@ -3352,6 +3358,8 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec) 
		}

		break;

	case WM8958:

		snd_soc_dapm_add_routes(dapm, wm8994_lateclk_intercon,

					ARRAY_SIZE(wm8994_lateclk_intercon));

		snd_soc_dapm_add_routes(dapm, wm8958_intercon,

					ARRAY_SIZE(wm8958_intercon));

		break;