From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752505AbdBJJoF (ORCPT ); Fri, 10 Feb 2017 04:44:05 -0500 Received: from mail.free-electrons.com ([62.4.15.54]:35682 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752052AbdBJJni (ORCPT ); Fri, 10 Feb 2017 04:43:38 -0500 From: =?UTF-8?q?Myl=C3=A8ne=20Josserand?= To: lgirdwood@gmail.com, broonie@kernel.org, robh+dt@kernel.org, mark.rutland@arm.com, maxime.ripard@free-electrons.com, wens@csie.org, perex@perex.cz, tiwai@suse.com Cc: alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, thomas.petazzoni@free-electrons.com, mylene.josserand@free-electrons.com, alexandre.belloni@free-electrons.com Subject: [PATCH 4/4] ASoC: sun8i-codec: Convert to use SND_SOC_DAPM_AIF_IN Date: Fri, 10 Feb 2017 10:41:33 +0100 Message-Id: <20170210094133.11382-5-mylene.josserand@free-electrons.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170210094133.11382-1-mylene.josserand@free-electrons.com> References: <20170210094133.11382-1-mylene.josserand@free-electrons.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Update the driver to use SND_SOC_DAPM_AIF_IN instead of SND_SOC_DAPM_DAC. Set the route names so it must be updated on the device tree too. Signed-off-by: Mylène Josserand --- arch/arm/boot/dts/sun8i-a33.dtsi | 4 ++-- sound/soc/sunxi/sun8i-codec.c | 20 +++++++++++--------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/arch/arm/boot/dts/sun8i-a33.dtsi b/arch/arm/boot/dts/sun8i-a33.dtsi index 4e34ec6613a0..e9e2e7312460 100644 --- a/arch/arm/boot/dts/sun8i-a33.dtsi +++ b/arch/arm/boot/dts/sun8i-a33.dtsi @@ -78,8 +78,8 @@ simple-audio-card,mclk-fs = <512>; simple-audio-card,aux-devs = <&codec_analog>; simple-audio-card,routing = - "Left DAC", "Digital Left DAC", - "Right DAC", "Digital Right DAC"; + "Left DAC", "AIF1 Slot 0 Left", + "Right DAC", "AIF1 Slot 0 Right"; status = "disabled"; simple-audio-card,cpu { diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c index a75a983974d9..9b15a5ee235f 100644 --- a/sound/soc/sunxi/sun8i-codec.c +++ b/sound/soc/sunxi/sun8i-codec.c @@ -281,11 +281,13 @@ static const struct snd_soc_dapm_widget sun8i_codec_dapm_widgets[] = { SND_SOC_DAPM_SUPPLY("DAC", SUN8I_DAC_DIG_CTRL, SUN8I_DAC_DIG_CTRL_ENDA, 0, NULL, 0), - /* Analog DAC */ - SND_SOC_DAPM_DAC("Digital Left DAC", "Playback", SUN8I_AIF1_DACDAT_CTRL, - SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0L_ENA, 0), - SND_SOC_DAPM_DAC("Digital Right DAC", "Playback", SUN8I_AIF1_DACDAT_CTRL, - SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0R_ENA, 0), + /* Analog DAC AIF */ + SND_SOC_DAPM_AIF_IN("AIF1 Slot 0 Left", "Playback", 0, + SUN8I_AIF1_DACDAT_CTRL, + SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0L_ENA, 0), + SND_SOC_DAPM_AIF_IN("AIF1 Slot 0 Right", "Playback", 0, + SUN8I_AIF1_DACDAT_CTRL, + SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0R_ENA, 0), /* DAC Mixers */ SOC_MIXER_ARRAY("Left Digital DAC Mixer", SND_SOC_NOPM, 0, 0, @@ -329,14 +331,14 @@ static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = { { "DAC", NULL, "MODCLK DAC" }, /* DAC Routes */ - { "Digital Left DAC", NULL, "DAC" }, - { "Digital Right DAC", NULL, "DAC" }, + { "AIF1 Slot 0 Right", NULL, "DAC" }, + { "AIF1 Slot 0 Left", NULL, "DAC" }, /* DAC Mixer Routes */ { "Left Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch", - "Digital Left DAC"}, + "AIF1 Slot 0 Left"}, { "Right Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch ", - "Digital Right DAC"}, + "AIF1 Slot 0 Right"}, }; static struct snd_soc_dai_ops sun8i_codec_dai_ops = { -- 2.11.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Myl=C3=A8ne=20Josserand?= Subject: [PATCH 4/4] ASoC: sun8i-codec: Convert to use SND_SOC_DAPM_AIF_IN Date: Fri, 10 Feb 2017 10:41:33 +0100 Message-ID: <20170210094133.11382-5-mylene.josserand@free-electrons.com> References: <20170210094133.11382-1-mylene.josserand@free-electrons.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170210094133.11382-1-mylene.josserand@free-electrons.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org To: lgirdwood@gmail.com, broonie@kernel.org, robh+dt@kernel.org, mark.rutland@arm.com, maxime.ripard@free-electrons.com, wens@csie.org, perex@perex.cz, tiwai@suse.com Cc: thomas.petazzoni@free-electrons.com, devicetree@vger.kernel.org, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, alexandre.belloni@free-electrons.com, mylene.josserand@free-electrons.com, linux-arm-kernel@lists.infradead.org List-Id: devicetree@vger.kernel.org VXBkYXRlIHRoZSBkcml2ZXIgdG8gdXNlIFNORF9TT0NfREFQTV9BSUZfSU4gaW5zdGVhZCBvZgpT TkRfU09DX0RBUE1fREFDLgoKU2V0IHRoZSByb3V0ZSBuYW1lcyBzbyBpdCBtdXN0IGJlIHVwZGF0 ZWQgb24gdGhlIGRldmljZSB0cmVlIHRvby4KClNpZ25lZC1vZmYtYnk6IE15bMOobmUgSm9zc2Vy YW5kIDxteWxlbmUuam9zc2VyYW5kQGZyZWUtZWxlY3Ryb25zLmNvbT4KLS0tCiBhcmNoL2FybS9i b290L2R0cy9zdW44aS1hMzMuZHRzaSB8ICA0ICsrLS0KIHNvdW5kL3NvYy9zdW54aS9zdW44aS1j b2RlYy5jICAgIHwgMjAgKysrKysrKysrKystLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMTMg aW5zZXJ0aW9ucygrKSwgMTEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvYXJjaC9hcm0vYm9v dC9kdHMvc3VuOGktYTMzLmR0c2kgYi9hcmNoL2FybS9ib290L2R0cy9zdW44aS1hMzMuZHRzaQpp bmRleCA0ZTM0ZWM2NjEzYTAuLmU5ZTJlNzMxMjQ2MCAxMDA2NDQKLS0tIGEvYXJjaC9hcm0vYm9v dC9kdHMvc3VuOGktYTMzLmR0c2kKKysrIGIvYXJjaC9hcm0vYm9vdC9kdHMvc3VuOGktYTMzLmR0 c2kKQEAgLTc4LDggKzc4LDggQEAKIAkJc2ltcGxlLWF1ZGlvLWNhcmQsbWNsay1mcyA9IDw1MTI+ OwogCQlzaW1wbGUtYXVkaW8tY2FyZCxhdXgtZGV2cyA9IDwmY29kZWNfYW5hbG9nPjsKIAkJc2lt cGxlLWF1ZGlvLWNhcmQscm91dGluZyA9Ci0JCQkiTGVmdCBEQUMiLCAiRGlnaXRhbCBMZWZ0IERB QyIsCi0JCQkiUmlnaHQgREFDIiwgIkRpZ2l0YWwgUmlnaHQgREFDIjsKKwkJCSJMZWZ0IERBQyIs ICJBSUYxIFNsb3QgMCBMZWZ0IiwKKwkJCSJSaWdodCBEQUMiLCAiQUlGMSBTbG90IDAgUmlnaHQi OwogCQlzdGF0dXMgPSAiZGlzYWJsZWQiOwogCiAJCXNpbXBsZS1hdWRpby1jYXJkLGNwdSB7CmRp ZmYgLS1naXQgYS9zb3VuZC9zb2Mvc3VueGkvc3VuOGktY29kZWMuYyBiL3NvdW5kL3NvYy9zdW54 aS9zdW44aS1jb2RlYy5jCmluZGV4IGE3NWE5ODM5NzRkOS4uOWIxNWE1ZWUyMzVmIDEwMDY0NAot LS0gYS9zb3VuZC9zb2Mvc3VueGkvc3VuOGktY29kZWMuYworKysgYi9zb3VuZC9zb2Mvc3VueGkv c3VuOGktY29kZWMuYwpAQCAtMjgxLDExICsyODEsMTMgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBz bmRfc29jX2RhcG1fd2lkZ2V0IHN1bjhpX2NvZGVjX2RhcG1fd2lkZ2V0c1tdID0gewogCVNORF9T T0NfREFQTV9TVVBQTFkoIkRBQyIsIFNVTjhJX0RBQ19ESUdfQ1RSTCwgU1VOOElfREFDX0RJR19D VFJMX0VOREEsCiAJCQkgICAgMCwgTlVMTCwgMCksCiAKLQkvKiBBbmFsb2cgREFDICovCi0JU05E X1NPQ19EQVBNX0RBQygiRGlnaXRhbCBMZWZ0IERBQyIsICJQbGF5YmFjayIsIFNVTjhJX0FJRjFf REFDREFUX0NUUkwsCi0JCQkgU1VOOElfQUlGMV9EQUNEQVRfQ1RSTF9BSUYxX0RBMExfRU5BLCAw KSwKLQlTTkRfU09DX0RBUE1fREFDKCJEaWdpdGFsIFJpZ2h0IERBQyIsICJQbGF5YmFjayIsIFNV TjhJX0FJRjFfREFDREFUX0NUUkwsCi0JCQkgU1VOOElfQUlGMV9EQUNEQVRfQ1RSTF9BSUYxX0RB MFJfRU5BLCAwKSwKKwkvKiBBbmFsb2cgREFDIEFJRiAqLworCVNORF9TT0NfREFQTV9BSUZfSU4o IkFJRjEgU2xvdCAwIExlZnQiLCAiUGxheWJhY2siLCAwLAorCQkJICAgIFNVTjhJX0FJRjFfREFD REFUX0NUUkwsCisJCQkgICAgU1VOOElfQUlGMV9EQUNEQVRfQ1RSTF9BSUYxX0RBMExfRU5BLCAw KSwKKwlTTkRfU09DX0RBUE1fQUlGX0lOKCJBSUYxIFNsb3QgMCBSaWdodCIsICJQbGF5YmFjayIs IDAsCisJCQkgICAgU1VOOElfQUlGMV9EQUNEQVRfQ1RSTCwKKwkJCSAgICBTVU44SV9BSUYxX0RB Q0RBVF9DVFJMX0FJRjFfREEwUl9FTkEsIDApLAogCiAJLyogREFDIE1peGVycyAqLwogCVNPQ19N SVhFUl9BUlJBWSgiTGVmdCBEaWdpdGFsIERBQyBNaXhlciIsIFNORF9TT0NfTk9QTSwgMCwgMCwK QEAgLTMyOSwxNCArMzMxLDE0IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3Qgc25kX3NvY19kYXBtX3Jv dXRlIHN1bjhpX2NvZGVjX2RhcG1fcm91dGVzW10gPSB7CiAJeyAiREFDIiwgTlVMTCwgIk1PRENM SyBEQUMiIH0sCiAKIAkvKiBEQUMgUm91dGVzICovCi0JeyAiRGlnaXRhbCBMZWZ0IERBQyIsIE5V TEwsICJEQUMiIH0sCi0JeyAiRGlnaXRhbCBSaWdodCBEQUMiLCBOVUxMLCAiREFDIiB9LAorCXsg IkFJRjEgU2xvdCAwIFJpZ2h0IiwgTlVMTCwgIkRBQyIgfSwKKwl7ICJBSUYxIFNsb3QgMCBMZWZ0 IiwgTlVMTCwgIkRBQyIgfSwKIAogCS8qIERBQyBNaXhlciBSb3V0ZXMgKi8KIAl7ICJMZWZ0IERp Z2l0YWwgREFDIE1peGVyIiwgIkFJRjEgU2xvdCAwIERpZ2l0YWwgREFDIFBsYXliYWNrIFN3aXRj aCIsCi0JICAiRGlnaXRhbCBMZWZ0IERBQyJ9LAorCSAgIkFJRjEgU2xvdCAwIExlZnQifSwKIAl7 ICJSaWdodCBEaWdpdGFsIERBQyBNaXhlciIsICJBSUYxIFNsb3QgMCBEaWdpdGFsIERBQyBQbGF5 YmFjayBTd2l0Y2ggIiwKLQkgICJEaWdpdGFsIFJpZ2h0IERBQyJ9LAorCSAgIkFJRjEgU2xvdCAw IFJpZ2h0In0sCiB9OwogCiBzdGF0aWMgc3RydWN0IHNuZF9zb2NfZGFpX29wcyBzdW44aV9jb2Rl Y19kYWlfb3BzID0gewotLSAKMi4xMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpBbHNhLWRldmVsIG1haWxpbmcgbGlzdApBbHNhLWRldmVsQGFsc2Et cHJvamVjdC5vcmcKaHR0cDovL21haWxtYW4uYWxzYS1wcm9qZWN0Lm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2Fsc2EtZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 From: mylene.josserand@free-electrons.com (=?UTF-8?q?Myl=C3=A8ne=20Josserand?=) Date: Fri, 10 Feb 2017 10:41:33 +0100 Subject: [PATCH 4/4] ASoC: sun8i-codec: Convert to use SND_SOC_DAPM_AIF_IN In-Reply-To: <20170210094133.11382-1-mylene.josserand@free-electrons.com> References: <20170210094133.11382-1-mylene.josserand@free-electrons.com> Message-ID: <20170210094133.11382-5-mylene.josserand@free-electrons.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Update the driver to use SND_SOC_DAPM_AIF_IN instead of SND_SOC_DAPM_DAC. Set the route names so it must be updated on the device tree too. Signed-off-by: Myl?ne Josserand --- arch/arm/boot/dts/sun8i-a33.dtsi | 4 ++-- sound/soc/sunxi/sun8i-codec.c | 20 +++++++++++--------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/arch/arm/boot/dts/sun8i-a33.dtsi b/arch/arm/boot/dts/sun8i-a33.dtsi index 4e34ec6613a0..e9e2e7312460 100644 --- a/arch/arm/boot/dts/sun8i-a33.dtsi +++ b/arch/arm/boot/dts/sun8i-a33.dtsi @@ -78,8 +78,8 @@ simple-audio-card,mclk-fs = <512>; simple-audio-card,aux-devs = <&codec_analog>; simple-audio-card,routing = - "Left DAC", "Digital Left DAC", - "Right DAC", "Digital Right DAC"; + "Left DAC", "AIF1 Slot 0 Left", + "Right DAC", "AIF1 Slot 0 Right"; status = "disabled"; simple-audio-card,cpu { diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c index a75a983974d9..9b15a5ee235f 100644 --- a/sound/soc/sunxi/sun8i-codec.c +++ b/sound/soc/sunxi/sun8i-codec.c @@ -281,11 +281,13 @@ static const struct snd_soc_dapm_widget sun8i_codec_dapm_widgets[] = { SND_SOC_DAPM_SUPPLY("DAC", SUN8I_DAC_DIG_CTRL, SUN8I_DAC_DIG_CTRL_ENDA, 0, NULL, 0), - /* Analog DAC */ - SND_SOC_DAPM_DAC("Digital Left DAC", "Playback", SUN8I_AIF1_DACDAT_CTRL, - SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0L_ENA, 0), - SND_SOC_DAPM_DAC("Digital Right DAC", "Playback", SUN8I_AIF1_DACDAT_CTRL, - SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0R_ENA, 0), + /* Analog DAC AIF */ + SND_SOC_DAPM_AIF_IN("AIF1 Slot 0 Left", "Playback", 0, + SUN8I_AIF1_DACDAT_CTRL, + SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0L_ENA, 0), + SND_SOC_DAPM_AIF_IN("AIF1 Slot 0 Right", "Playback", 0, + SUN8I_AIF1_DACDAT_CTRL, + SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0R_ENA, 0), /* DAC Mixers */ SOC_MIXER_ARRAY("Left Digital DAC Mixer", SND_SOC_NOPM, 0, 0, @@ -329,14 +331,14 @@ static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = { { "DAC", NULL, "MODCLK DAC" }, /* DAC Routes */ - { "Digital Left DAC", NULL, "DAC" }, - { "Digital Right DAC", NULL, "DAC" }, + { "AIF1 Slot 0 Right", NULL, "DAC" }, + { "AIF1 Slot 0 Left", NULL, "DAC" }, /* DAC Mixer Routes */ { "Left Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch", - "Digital Left DAC"}, + "AIF1 Slot 0 Left"}, { "Right Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch ", - "Digital Right DAC"}, + "AIF1 Slot 0 Right"}, }; static struct snd_soc_dai_ops sun8i_codec_dai_ops = { -- 2.11.0