From patchwork Sun Aug 6 21:36:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Jarzmik X-Patchwork-Id: 9884143 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id AA508602B6 for ; Sun, 6 Aug 2017 21:40:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 99EAA2018F for ; Sun, 6 Aug 2017 21:40:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8E42E28563; Sun, 6 Aug 2017 21:40:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 171BA2018F for ; Sun, 6 Aug 2017 21:40:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=J0c/v/LRGJS2DO/SaNNsNtt3ywWNcFg5DXVEV26ngBA=; b=FdLmRqBea2XBoSvil+1zxQLjCn 58jFklvTQVtXGkqbWP336j/VvOLGLCS6IcRqjKDPH2xk6vzt9N+H65z0lRGchTczscC1ZmaxMUTvq AqdtIyOxNFb4TvJ3qQCPwGO5fcL7p9jmUl58LTA0fEDoqUAUgeNBhbKrkMN81Zt8gv1psp8JOe5p4 1gl4ClvvhahxD6zuM2RhmyJiwqfbtHOHnyn8PFceflH8EsElIdwFMc5/cQJ4Qz78UxAdgc5BAPTPj h9GG0CHyzmPMpLdqCyYN578+bgyZf0RK64xK3A6R2sLqwSej5eOHyoKHKTlMoHDYH6iXuuMlj+A1/ a5XHYUeA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1deTI1-00079P-Ef; Sun, 06 Aug 2017 21:40:49 +0000 Received: from casper.infradead.org ([85.118.1.10]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1deTEK-0002rv-1M for linux-arm-kernel@bombadil.infradead.org; Sun, 06 Aug 2017 21:37:00 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=1R9JGtygQa1KyLUnHph8PDMJWuUEHnmFj+08z3bYDl8=; b=eeQSg+xrCMo3M8s9Ed//ephH5 wMN74ZgnqZLVVSV1AkbS+zubtEBOLpP+37mPWjqFq/nA/X3aOPOsw1W2FUMOOP2f9IAEOWkRn9F6I 1sTsglLIANWSWpUfZfJrNWMeKggxWY4ngidJIymIxyf3FuaPa7iDKpH6uK1JI/cjsr1TX3OXzPpJu ZvBdzDZcLdqBugmxFYZTLIvNwVeCZnqKr/fvrzcX/YyPe1gzAOWRgIPou0cZoiw1WfD3OvpWst56q TsunCBDGVUbRyDS+f9UQ2MRqu30RYy5wew1j8hH2gd7feCTvSGHCdo1H63vhQe4vuT13Zt18/EQwn dsn7mYqzg==; Received: from smtp02.smtpout.orange.fr ([80.12.242.124] helo=smtp.smtpout.orange.fr) by casper.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1deTEG-0008KF-12 for linux-arm-kernel@lists.infradead.org; Sun, 06 Aug 2017 21:36:58 +0000 Received: from belgarion.home ([90.55.206.157]) by mwinf5d78 with ME id txcE1v0093QH74y03xcZNE; Sun, 06 Aug 2017 23:36:34 +0200 X-ME-Helo: belgarion.home X-ME-Date: Sun, 06 Aug 2017 23:36:34 +0200 X-ME-IP: 90.55.206.157 From: Robert Jarzmik To: Dmitry Torokhov , Lee Jones , Jaroslav Kysela , Takashi Iwai , Daniel Mack , Haojian Zhuang , Robert Jarzmik , Liam Girdwood , Mark Brown , Lars-Peter Clausen , Charles Keepax Subject: [PATCH v5 11/12] ASoC: wm9705: add ac97 new bus support Date: Sun, 6 Aug 2017 23:36:12 +0200 Message-Id: <20170806213613.5600-12-robert.jarzmik@free.fr> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170806213613.5600-1-robert.jarzmik@free.fr> References: <20170806213613.5600-1-robert.jarzmik@free.fr> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170806_223656_133426_FE705131 X-CRM114-Status: GOOD ( 20.06 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alsa-devel@alsa-project.org, patches@opensource.wolfsonmicro.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-input@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Add support for the new ac97 bus model, where devices are automatically discovered on AC-Links. Signed-off-by: Robert Jarzmik Acked-by: Charles Keepax --- Since v4: - added #ifdef spotted by Charles - tentatively kept Charles's ack --- sound/soc/codecs/Kconfig | 3 ++- sound/soc/codecs/wm9705.c | 37 +++++++++++++++++++++++++------------ 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index f17af3592785..1d69a1c1f896 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -205,7 +205,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_WM8998 if MFD_WM8998 select SND_SOC_WM9081 if I2C select SND_SOC_WM9090 if I2C - select SND_SOC_WM9705 if SND_SOC_AC97_BUS + select SND_SOC_WM9705 if (SND_SOC_AC97_BUS || SND_SOC_AC97_BUS_NEW) select SND_SOC_WM9712 if (SND_SOC_AC97_BUS || SND_SOC_AC97_BUS_NEW) select SND_SOC_WM9713 if (SND_SOC_AC97_BUS || SND_SOC_AC97_BUS_NEW) help @@ -1083,6 +1083,7 @@ config SND_SOC_WM9090 config SND_SOC_WM9705 tristate select REGMAP_AC97 + select AC97_BUS_COMPAT if AC97_BUS_NEW config SND_SOC_WM9712 tristate diff --git a/sound/soc/codecs/wm9705.c b/sound/soc/codecs/wm9705.c index 08477d040028..46b5a77c53e4 100644 --- a/sound/soc/codecs/wm9705.c +++ b/sound/soc/codecs/wm9705.c @@ -11,6 +11,7 @@ #include #include +#include #include #include #include @@ -18,6 +19,8 @@ #include #include #include +#include +#include #include #include @@ -26,6 +29,7 @@ struct wm9705_priv { struct snd_ac97 *ac97; + struct wm97xx_platform_data *mfd_pdata; }; static const struct reg_default wm9705_reg_defaults[] = { @@ -319,17 +323,24 @@ static int wm9705_soc_probe(struct snd_soc_codec *codec) struct regmap *regmap; int ret; - wm9705->ac97 = snd_soc_new_ac97_codec(codec, WM9705_VENDOR_ID, - WM9705_VENDOR_ID_MASK); - if (IS_ERR(wm9705->ac97)) { - dev_err(codec->dev, "Failed to register AC97 codec\n"); - return PTR_ERR(wm9705->ac97); - } - - regmap = regmap_init_ac97(wm9705->ac97, &wm9705_regmap_config); - if (IS_ERR(regmap)) { - ret = PTR_ERR(regmap); - goto err_free_ac97_codec; + if (wm9705->mfd_pdata) { + wm9705->ac97 = wm9705->mfd_pdata->ac97; + regmap = wm9705->mfd_pdata->regmap; + } else { +#ifdef CONFIG_SND_SOC_AC97_BUS + wm9705->ac97 = snd_soc_new_ac97_codec(codec, WM9705_VENDOR_ID, + WM9705_VENDOR_ID_MASK); + if (IS_ERR(wm9705->ac97)) { + dev_err(codec->dev, "Failed to register AC97 codec\n"); + return PTR_ERR(wm9705->ac97); + } + + regmap = regmap_init_ac97(wm9705->ac97, &wm9705_regmap_config); + if (IS_ERR(regmap)) { + ret = PTR_ERR(regmap); + goto err_free_ac97_codec; + } +#endif } snd_soc_codec_set_drvdata(codec, wm9705->ac97); @@ -346,7 +357,8 @@ static int wm9705_soc_remove(struct snd_soc_codec *codec) struct wm9705_priv *wm9705 = snd_soc_codec_get_drvdata(codec); snd_soc_codec_exit_regmap(codec); - snd_soc_free_ac97_codec(wm9705->ac97); + if (!wm9705->mfd_pdata) + snd_soc_free_ac97_codec(wm9705->ac97); return 0; } @@ -374,6 +386,7 @@ static int wm9705_probe(struct platform_device *pdev) if (wm9705 == NULL) return -ENOMEM; + wm9705->mfd_pdata = dev_get_platdata(&pdev->dev); platform_set_drvdata(pdev, wm9705); return snd_soc_register_codec(&pdev->dev,