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 'for-2.6.38' into for-2.6.39

Mark Brown 80e1b84f 4cfeb695

+9 -1
unified split
+9 -1
sound/soc/codecs/wm8994.c
··· 1424 1425 static const struct snd_soc_dapm_widget wm8994_dac_widgets[] = { 1426 SND_SOC_DAPM_DAC("DAC2L", NULL, WM8994_POWER_MANAGEMENT_5, 3, 0), 1427 - SND_SOC_DAPM_DAC("DAC1R", NULL, WM8994_POWER_MANAGEMENT_5, 2, 0), 1428 SND_SOC_DAPM_DAC("DAC1L", NULL, WM8994_POWER_MANAGEMENT_5, 1, 0), 1429 SND_SOC_DAPM_DAC("DAC1R", NULL, WM8994_POWER_MANAGEMENT_5, 0, 0), 1430 }; ··· 3327 case WM8958: 3328 snd_soc_add_controls(codec, wm8958_snd_controls, 3329 ARRAY_SIZE(wm8958_snd_controls)); 3330 snd_soc_dapm_new_controls(dapm, wm8958_dapm_widgets, 3331 ARRAY_SIZE(wm8958_dapm_widgets)); 3332 break; ··· 3358 } 3359 break; 3360 case WM8958: 3361 snd_soc_dapm_add_routes(dapm, wm8958_intercon, 3362 ARRAY_SIZE(wm8958_intercon)); 3363 break;
··· 1424 1425 static const struct snd_soc_dapm_widget wm8994_dac_widgets[] = { 1426 SND_SOC_DAPM_DAC("DAC2L", NULL, WM8994_POWER_MANAGEMENT_5, 3, 0), 1427 + SND_SOC_DAPM_DAC("DAC2R", NULL, WM8994_POWER_MANAGEMENT_5, 2, 0), 1428 SND_SOC_DAPM_DAC("DAC1L", NULL, WM8994_POWER_MANAGEMENT_5, 1, 0), 1429 SND_SOC_DAPM_DAC("DAC1R", NULL, WM8994_POWER_MANAGEMENT_5, 0, 0), 1430 }; ··· 3327 case WM8958: 3328 snd_soc_add_controls(codec, wm8958_snd_controls, 3329 ARRAY_SIZE(wm8958_snd_controls)); 3330 + snd_soc_dapm_new_controls(dapm, wm8994_lateclk_widgets, 3331 + ARRAY_SIZE(wm8994_lateclk_widgets)); 3332 + snd_soc_dapm_new_controls(dapm, wm8994_adc_widgets, 3333 + ARRAY_SIZE(wm8994_adc_widgets)); 3334 + snd_soc_dapm_new_controls(dapm, wm8994_dac_widgets, 3335 + ARRAY_SIZE(wm8994_dac_widgets)); 3336 snd_soc_dapm_new_controls(dapm, wm8958_dapm_widgets, 3337 ARRAY_SIZE(wm8958_dapm_widgets)); 3338 break; ··· 3352 } 3353 break; 3354 case WM8958: 3355 + snd_soc_dapm_add_routes(dapm, wm8994_lateclk_intercon, 3356 + ARRAY_SIZE(wm8994_lateclk_intercon)); 3357 snd_soc_dapm_add_routes(dapm, wm8958_intercon, 3358 ARRAY_SIZE(wm8958_intercon)); 3359 break;