From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754471AbcDTNar (ORCPT ); Wed, 20 Apr 2016 09:30:47 -0400 Received: from mail-wm0-f50.google.com ([74.125.82.50]:35982 "EHLO mail-wm0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751380AbcDTNaq (ORCPT ); Wed, 20 Apr 2016 09:30:46 -0400 Subject: Re: [PATCH 2/2 v6] ASoC: mediatek: Add second I2S on mt8173-rt5650 machine driver To: PC Liao , broonie@kernel.org, tiwai@suse.de References: <1461134447-42001-1-git-send-email-pc.liao@mediatek.com> <1461134447-42001-3-git-send-email-pc.liao@mediatek.com> Cc: alsa-devel@alsa-project.org, srv_heupstream@mediatek.com, s.hauer@pengutronix.de, linux-kernel@vger.kernel.org, koro.chen@mediatek.com, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org From: Matthias Brugger Message-ID: <57178482.9090705@gmail.com> Date: Wed, 20 Apr 2016 15:30:42 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.7.0 MIME-Version: 1.0 In-Reply-To: <1461134447-42001-3-git-send-email-pc.liao@mediatek.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 20/04/16 08:40, PC Liao wrote: > This patch adds second I2S connection to rt5650 codec for capture path on > mt8173-rt5650 machine driver. > > Signed-off-by: PC Liao > --- > .../devicetree/bindings/sound/mt8173-rt5650.txt | 6 +++ > sound/soc/mediatek/mt8173-rt5650.c | 44 ++++++++++++++++++-- > 2 files changed, 47 insertions(+), 3 deletions(-) > > diff --git a/Documentation/devicetree/bindings/sound/mt8173-rt5650.txt b/Documentation/devicetree/bindings/sound/mt8173-rt5650.txt > index fe5a5ef..802dd1b 100644 > --- a/Documentation/devicetree/bindings/sound/mt8173-rt5650.txt > +++ b/Documentation/devicetree/bindings/sound/mt8173-rt5650.txt > @@ -5,11 +5,17 @@ Required properties: > - mediatek,audio-codec: the phandles of rt5650 codecs > - mediatek,platform: the phandle of MT8173 ASoC platform > > +Optional properties: > +- capture-dai: audio codec dai on capture path > + <&rt5650 0> : Default setting. Connect rt5650 I2S1 for capture. (dai_name = rt5645-aif1) > + <&rt5650 1> : Connect rt5650 I2S2 for capture. (dai_name = rt5645-aif2) > + > Example: > > sound { > compatible = "mediatek,mt8173-rt5650"; > mediatek,audio-codec = <&rt5650>; > mediatek,platform = <&afe>; > + capture-dai = <&rt5650 1>; > }; > > diff --git a/sound/soc/mediatek/mt8173-rt5650.c b/sound/soc/mediatek/mt8173-rt5650.c > index bb09bb1..45dea22 100644 > --- a/sound/soc/mediatek/mt8173-rt5650.c > +++ b/sound/soc/mediatek/mt8173-rt5650.c > @@ -85,12 +85,26 @@ static int mt8173_rt5650_init(struct snd_soc_pcm_runtime *runtime) > { > struct snd_soc_card *card = runtime->card; > struct snd_soc_codec *codec = runtime->codec_dais[0]->codec; > + const char *codec_dai_capture = runtime->codec_dais[1]->name; > int ret; > > rt5645_sel_asrc_clk_src(codec, > - RT5645_DA_STEREO_FILTER | > - RT5645_AD_STEREO_FILTER, > + RT5645_DA_STEREO_FILTER, > RT5645_CLK_SEL_I2S1_ASRC); > + > + if (!strcmp(codec_dai_capture, "rt5645-aif1")) { > + rt5645_sel_asrc_clk_src(codec, > + RT5645_AD_STEREO_FILTER, > + RT5645_CLK_SEL_I2S1_ASRC); > + } else if (!strcmp(codec_dai_capture, "rt5645-aif2")) { > + rt5645_sel_asrc_clk_src(codec, > + RT5645_AD_STEREO_FILTER, > + RT5645_CLK_SEL_I2S2_ASRC); > + } else { For compatibility you should change this to something like: dev_warn(card->dev, "Only one dai codec found in DTS, enabled rt5645 AD filter\n"); rt5645_sel_asrc_clk_src(codec, RT5645_AD_STEREO_FILTER, RT5645_CLK_SEL_I2S1_ASRC); } Regards, Matthias