From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753724AbcH0MYX (ORCPT ); Sat, 27 Aug 2016 08:24:23 -0400 Received: from mirror2.csie.ntu.edu.tw ([140.112.30.76]:49764 "EHLO wens.csie.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751195AbcH0MX4 (ORCPT ); Sat, 27 Aug 2016 08:23:56 -0400 From: Chen-Yu Tsai To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai Cc: Chen-Yu Tsai , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/4] ASoC: dapm: Give error when adding hardware backed controls for PGA widgets Date: Sat, 27 Aug 2016 19:28:01 +0800 Message-Id: <20160827112801.31010-5-wens@csie.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20160827112801.31010-1-wens@csie.org> References: <20160827112801.31010-1-wens@csie.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit 19a2557b76d6 ("ASoC: dapm: Add kcontrol support for PGAs") added kcontrol support for PGA widgets, but did not add necessary changes to snd_soc_dapm_put_volsw or soc_dapm_mixer_update_power to have hardware register updates actually happen. As this is a little used feature, this patch just adds an error message when someone tries to use hardware backed controls with PGA or output driver widgets. Fixes: 19a2557b76d6 ("ASoC: dapm: Add kcontrol support for PGAs") Signed-off-by: Chen-Yu Tsai --- sound/soc/soc-dapm.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index ed6b707cc7ce..f681a251d766 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -984,6 +984,14 @@ static int dapm_new_pga(struct snd_soc_dapm_widget *w) int i, ret; for (i = 0; i < w->num_kcontrols; i++) { + const struct soc_mixer_control *mc = + (struct soc_mixer_control *)w->kcontrol_news[i].private_value; + + if (mc->reg != SND_SOC_NOPM) + dev_err(w->dapm->dev, + "ASoC: hardware backed PGA controls not supported: '%s'\n", + w->name); + ret = dapm_create_or_share_kcontrol(w, i); if (ret < 0) return ret; -- 2.9.3