From: Mark Brown Date: Wed, 21 May 2014 23:23:49 +0000 (+0100) Subject: Merge remote-tracking branches 'asoc/topic/cs42l56', 'asoc/topic/cs42xx8' and 'asoc... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0c5dacf2ca07a1b9a5970cd06cc5eab496860382;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git Merge remote-tracking branches 'asoc/topic/cs42l56', 'asoc/topic/cs42xx8' and 'asoc/topic/davinci' into asoc-next --- 0c5dacf2ca07a1b9a5970cd06cc5eab496860382 diff --cc sound/soc/omap/ams-delta.c index 44ae4561adcd,56a5219c0a00,56a5219c0a00,2ac0a0c3b570..669f84d9b76e --- a/sound/soc/omap/ams-delta.c +++ b/sound/soc/omap/ams-delta.c @@@@@ -520,27 -520,29 -520,29 -518,10 +518,8 @@@@@ static int ams_delta_cx20442_init(struc return 0; } --- /* Add board specific DAPM widgets and routes */ --- ret = snd_soc_dapm_new_controls(dapm, ams_delta_dapm_widgets, --- ARRAY_SIZE(ams_delta_dapm_widgets)); --- if (ret) { --- dev_warn(card->dev, --- "Failed to register DAPM controls, " --- "will continue without any.\n"); --- return 0; --- } --- --- ret = snd_soc_dapm_add_routes(dapm, ams_delta_audio_map, --- ARRAY_SIZE(ams_delta_audio_map)); --- if (ret) { --- dev_warn(card->dev, --- "Failed to set up DAPM routes, " --- "will continue with codec default map.\n"); --- return 0; --- } --- /* Set up initial pin constellation */ snd_soc_dapm_disable_pin(dapm, "Mouthpiece"); --- snd_soc_dapm_enable_pin(dapm, "Earpiece"); --- snd_soc_dapm_enable_pin(dapm, "Microphone"); snd_soc_dapm_disable_pin(dapm, "Speaker"); snd_soc_dapm_disable_pin(dapm, "AGCIN"); snd_soc_dapm_disable_pin(dapm, "AGCOUT");