From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752761AbdCIIXM (ORCPT ); Thu, 9 Mar 2017 03:23:12 -0500 Received: from mail.free-electrons.com ([62.4.15.54]:56696 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750784AbdCIIXL (ORCPT ); Thu, 9 Mar 2017 03:23:11 -0500 From: Mylene Josserand Subject: Re: [PATCH 4/4] ASoC: sun8i-codec: Convert to use SND_SOC_DAPM_AIF_IN To: Chen-Yu Tsai , Maxime Ripard References: <20170210094133.11382-1-mylene.josserand@free-electrons.com> <20170210094133.11382-5-mylene.josserand@free-electrons.com> Cc: Liam Girdwood , Mark Brown , Rob Herring , Mark Rutland , Jaroslav Kysela , Takashi Iwai , Linux-ALSA , devicetree , linux-kernel , linux-arm-kernel , Thomas Petazzoni , Alexandre Belloni Message-ID: <21d377a3-8e9d-34fa-b5c7-da6456bf31e8@free-electrons.com> Date: Thu, 9 Mar 2017 09:20:54 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Chen-Yu, Thank you for the review. On 06/03/2017 10:56, Chen-Yu Tsai wrote: > On Fri, Feb 10, 2017 at 5:41 PM, Mylène Josserand > wrote: >> 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 ++-- > > This patch looks OK, but having the DTS changes in the same patch > probably isn't a good idea. I would really like to see this series > merged for 4.11, so we can expose a good mixer interface to userspace > during the first kernel release supporting the A33 codec. That likely > means some breakage between when the asoc bits and the dts bits land > though. Yes, as it means some breakage, I did not know if 2 patches will be fine or not. > > Maxime, any ideas? > I asked him directly and he agrees. It is fine for me so I will send a v2 with this patch split. Best regards, -- Mylène Josserand, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com > > Regards > ChenYu > >> 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: Mylene Josserand Subject: Re: [PATCH 4/4] ASoC: sun8i-codec: Convert to use SND_SOC_DAPM_AIF_IN Date: Thu, 9 Mar 2017 09:20:54 +0100 Message-ID: <21d377a3-8e9d-34fa-b5c7-da6456bf31e8@free-electrons.com> References: <20170210094133.11382-1-mylene.josserand@free-electrons.com> <20170210094133.11382-5-mylene.josserand@free-electrons.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: 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: Chen-Yu Tsai , Maxime Ripard Cc: Mark Rutland , devicetree , Linux-ALSA , linux-kernel , Takashi Iwai , Rob Herring , Liam Girdwood , Mark Brown , Alexandre Belloni , Thomas Petazzoni , linux-arm-kernel List-Id: devicetree@vger.kernel.org SGkgQ2hlbi1ZdSwKClRoYW5rIHlvdSBmb3IgdGhlIHJldmlldy4KCk9uIDA2LzAzLzIwMTcgMTA6 NTYsIENoZW4tWXUgVHNhaSB3cm90ZToKPiBPbiBGcmksIEZlYiAxMCwgMjAxNyBhdCA1OjQxIFBN LCBNeWzDqG5lIEpvc3NlcmFuZAo+IDxteWxlbmUuam9zc2VyYW5kQGZyZWUtZWxlY3Ryb25zLmNv bT4gd3JvdGU6Cj4+IFVwZGF0ZSB0aGUgZHJpdmVyIHRvIHVzZSBTTkRfU09DX0RBUE1fQUlGX0lO IGluc3RlYWQgb2YKPj4gU05EX1NPQ19EQVBNX0RBQy4KPj4KPj4gU2V0IHRoZSByb3V0ZSBuYW1l cyBzbyBpdCBtdXN0IGJlIHVwZGF0ZWQgb24gdGhlIGRldmljZSB0cmVlIHRvby4KPj4KPj4gU2ln bmVkLW9mZi1ieTogTXlsw6huZSBKb3NzZXJhbmQgPG15bGVuZS5qb3NzZXJhbmRAZnJlZS1lbGVj dHJvbnMuY29tPgo+PiAtLS0KPj4gIGFyY2gvYXJtL2Jvb3QvZHRzL3N1bjhpLWEzMy5kdHNpIHwg IDQgKystLQo+Cj4gVGhpcyBwYXRjaCBsb29rcyBPSywgYnV0IGhhdmluZyB0aGUgRFRTIGNoYW5n ZXMgaW4gdGhlIHNhbWUgcGF0Y2gKPiBwcm9iYWJseSBpc24ndCBhIGdvb2QgaWRlYS4gSSB3b3Vs ZCByZWFsbHkgbGlrZSB0byBzZWUgdGhpcyBzZXJpZXMKPiBtZXJnZWQgZm9yIDQuMTEsIHNvIHdl IGNhbiBleHBvc2UgYSBnb29kIG1peGVyIGludGVyZmFjZSB0byB1c2Vyc3BhY2UKPiBkdXJpbmcg dGhlIGZpcnN0IGtlcm5lbCByZWxlYXNlIHN1cHBvcnRpbmcgdGhlIEEzMyBjb2RlYy4gVGhhdCBs aWtlbHkKPiBtZWFucyBzb21lIGJyZWFrYWdlIGJldHdlZW4gd2hlbiB0aGUgYXNvYyBiaXRzIGFu ZCB0aGUgZHRzIGJpdHMgbGFuZAo+IHRob3VnaC4KClllcywgYXMgaXQgbWVhbnMgc29tZSBicmVh a2FnZSwgSSBkaWQgbm90IGtub3cgaWYgMiBwYXRjaGVzIHdpbGwgYmUgZmluZSAKb3Igbm90LgoK Pgo+IE1heGltZSwgYW55IGlkZWFzPwo+CgpJIGFza2VkIGhpbSBkaXJlY3RseSBhbmQgaGUgYWdy ZWVzLgoKSXQgaXMgZmluZSBmb3IgbWUgc28gSSB3aWxsIHNlbmQgYSB2MiB3aXRoIHRoaXMgcGF0 Y2ggc3BsaXQuCgpCZXN0IHJlZ2FyZHMsCgotLSAKTXlsw6huZSBKb3NzZXJhbmQsIEZyZWUgRWxl Y3Ryb25zCkVtYmVkZGVkIExpbnV4IGFuZCBLZXJuZWwgZW5naW5lZXJpbmcKaHR0cDovL2ZyZWUt ZWxlY3Ryb25zLmNvbQoKPgo+IFJlZ2FyZHMKPiBDaGVuWXUKPgo+PiAgc291bmQvc29jL3N1bnhp L3N1bjhpLWNvZGVjLmMgICAgfCAyMCArKysrKysrKysrKy0tLS0tLS0tLQo+PiAgMiBmaWxlcyBj aGFuZ2VkLCAxMyBpbnNlcnRpb25zKCspLCAxMSBkZWxldGlvbnMoLSkKPj4KPj4gZGlmZiAtLWdp dCBhL2FyY2gvYXJtL2Jvb3QvZHRzL3N1bjhpLWEzMy5kdHNpIGIvYXJjaC9hcm0vYm9vdC9kdHMv c3VuOGktYTMzLmR0c2kKPj4gaW5kZXggNGUzNGVjNjYxM2EwLi5lOWUyZTczMTI0NjAgMTAwNjQ0 Cj4+IC0tLSBhL2FyY2gvYXJtL2Jvb3QvZHRzL3N1bjhpLWEzMy5kdHNpCj4+ICsrKyBiL2FyY2gv YXJtL2Jvb3QvZHRzL3N1bjhpLWEzMy5kdHNpCj4+IEBAIC03OCw4ICs3OCw4IEBACj4+ICAgICAg ICAgICAgICAgICBzaW1wbGUtYXVkaW8tY2FyZCxtY2xrLWZzID0gPDUxMj47Cj4+ICAgICAgICAg ICAgICAgICBzaW1wbGUtYXVkaW8tY2FyZCxhdXgtZGV2cyA9IDwmY29kZWNfYW5hbG9nPjsKPj4g ICAgICAgICAgICAgICAgIHNpbXBsZS1hdWRpby1jYXJkLHJvdXRpbmcgPQo+PiAtICAgICAgICAg ICAgICAgICAgICAgICAiTGVmdCBEQUMiLCAiRGlnaXRhbCBMZWZ0IERBQyIsCj4+IC0gICAgICAg ICAgICAgICAgICAgICAgICJSaWdodCBEQUMiLCAiRGlnaXRhbCBSaWdodCBEQUMiOwo+PiArICAg ICAgICAgICAgICAgICAgICAgICAiTGVmdCBEQUMiLCAiQUlGMSBTbG90IDAgTGVmdCIsCj4+ICsg ICAgICAgICAgICAgICAgICAgICAgICJSaWdodCBEQUMiLCAiQUlGMSBTbG90IDAgUmlnaHQiOwo+ PiAgICAgICAgICAgICAgICAgc3RhdHVzID0gImRpc2FibGVkIjsKPj4KPj4gICAgICAgICAgICAg ICAgIHNpbXBsZS1hdWRpby1jYXJkLGNwdSB7Cj4+IGRpZmYgLS1naXQgYS9zb3VuZC9zb2Mvc3Vu eGkvc3VuOGktY29kZWMuYyBiL3NvdW5kL3NvYy9zdW54aS9zdW44aS1jb2RlYy5jCj4+IGluZGV4 IGE3NWE5ODM5NzRkOS4uOWIxNWE1ZWUyMzVmIDEwMDY0NAo+PiAtLS0gYS9zb3VuZC9zb2Mvc3Vu eGkvc3VuOGktY29kZWMuYwo+PiArKysgYi9zb3VuZC9zb2Mvc3VueGkvc3VuOGktY29kZWMuYwo+ PiBAQCAtMjgxLDExICsyODEsMTMgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBzbmRfc29jX2RhcG1f d2lkZ2V0IHN1bjhpX2NvZGVjX2RhcG1fd2lkZ2V0c1tdID0gewo+PiAgICAgICAgIFNORF9TT0Nf REFQTV9TVVBQTFkoIkRBQyIsIFNVTjhJX0RBQ19ESUdfQ1RSTCwgU1VOOElfREFDX0RJR19DVFJM X0VOREEsCj4+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAwLCBOVUxMLCAwKSwKPj4KPj4g LSAgICAgICAvKiBBbmFsb2cgREFDICovCj4+IC0gICAgICAgU05EX1NPQ19EQVBNX0RBQygiRGln aXRhbCBMZWZ0IERBQyIsICJQbGF5YmFjayIsIFNVTjhJX0FJRjFfREFDREFUX0NUUkwsCj4+IC0g ICAgICAgICAgICAgICAgICAgICAgICBTVU44SV9BSUYxX0RBQ0RBVF9DVFJMX0FJRjFfREEwTF9F TkEsIDApLAo+PiAtICAgICAgIFNORF9TT0NfREFQTV9EQUMoIkRpZ2l0YWwgUmlnaHQgREFDIiwg IlBsYXliYWNrIiwgU1VOOElfQUlGMV9EQUNEQVRfQ1RSTCwKPj4gLSAgICAgICAgICAgICAgICAg ICAgICAgIFNVTjhJX0FJRjFfREFDREFUX0NUUkxfQUlGMV9EQTBSX0VOQSwgMCksCj4+ICsgICAg ICAgLyogQW5hbG9nIERBQyBBSUYgKi8KPj4gKyAgICAgICBTTkRfU09DX0RBUE1fQUlGX0lOKCJB SUYxIFNsb3QgMCBMZWZ0IiwgIlBsYXliYWNrIiwgMCwKPj4gKyAgICAgICAgICAgICAgICAgICAg ICAgICAgIFNVTjhJX0FJRjFfREFDREFUX0NUUkwsCj4+ICsgICAgICAgICAgICAgICAgICAgICAg ICAgICBTVU44SV9BSUYxX0RBQ0RBVF9DVFJMX0FJRjFfREEwTF9FTkEsIDApLAo+PiArICAgICAg IFNORF9TT0NfREFQTV9BSUZfSU4oIkFJRjEgU2xvdCAwIFJpZ2h0IiwgIlBsYXliYWNrIiwgMCwK Pj4gKyAgICAgICAgICAgICAgICAgICAgICAgICAgIFNVTjhJX0FJRjFfREFDREFUX0NUUkwsCj4+ ICsgICAgICAgICAgICAgICAgICAgICAgICAgICBTVU44SV9BSUYxX0RBQ0RBVF9DVFJMX0FJRjFf REEwUl9FTkEsIDApLAo+Pgo+PiAgICAgICAgIC8qIERBQyBNaXhlcnMgKi8KPj4gICAgICAgICBT T0NfTUlYRVJfQVJSQVkoIkxlZnQgRGlnaXRhbCBEQUMgTWl4ZXIiLCBTTkRfU09DX05PUE0sIDAs IDAsCj4+IEBAIC0zMjksMTQgKzMzMSwxNCBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IHNuZF9zb2Nf ZGFwbV9yb3V0ZSBzdW44aV9jb2RlY19kYXBtX3JvdXRlc1tdID0gewo+PiAgICAgICAgIHsgIkRB QyIsIE5VTEwsICJNT0RDTEsgREFDIiB9LAo+Pgo+PiAgICAgICAgIC8qIERBQyBSb3V0ZXMgKi8K Pj4gLSAgICAgICB7ICJEaWdpdGFsIExlZnQgREFDIiwgTlVMTCwgIkRBQyIgfSwKPj4gLSAgICAg ICB7ICJEaWdpdGFsIFJpZ2h0IERBQyIsIE5VTEwsICJEQUMiIH0sCj4+ICsgICAgICAgeyAiQUlG MSBTbG90IDAgUmlnaHQiLCBOVUxMLCAiREFDIiB9LAo+PiArICAgICAgIHsgIkFJRjEgU2xvdCAw IExlZnQiLCBOVUxMLCAiREFDIiB9LAo+Pgo+PiAgICAgICAgIC8qIERBQyBNaXhlciBSb3V0ZXMg Ki8KPj4gICAgICAgICB7ICJMZWZ0IERpZ2l0YWwgREFDIE1peGVyIiwgIkFJRjEgU2xvdCAwIERp Z2l0YWwgREFDIFBsYXliYWNrIFN3aXRjaCIsCj4+IC0gICAgICAgICAiRGlnaXRhbCBMZWZ0IERB QyJ9LAo+PiArICAgICAgICAgIkFJRjEgU2xvdCAwIExlZnQifSwKPj4gICAgICAgICB7ICJSaWdo dCBEaWdpdGFsIERBQyBNaXhlciIsICJBSUYxIFNsb3QgMCBEaWdpdGFsIERBQyBQbGF5YmFjayBT d2l0Y2ggIiwKPj4gLSAgICAgICAgICJEaWdpdGFsIFJpZ2h0IERBQyJ9LAo+PiArICAgICAgICAg IkFJRjEgU2xvdCAwIFJpZ2h0In0sCj4+ICB9Owo+Pgo+PiAgc3RhdGljIHN0cnVjdCBzbmRfc29j X2RhaV9vcHMgc3VuOGlfY29kZWNfZGFpX29wcyA9IHsKPj4gLS0KPj4gMi4xMS4wCj4+Cl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkFsc2EtZGV2ZWwgbWFp bGluZyBsaXN0CkFsc2EtZGV2ZWxAYWxzYS1wcm9qZWN0Lm9yZwpodHRwOi8vbWFpbG1hbi5hbHNh LXByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8vYWxzYS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: mylene.josserand@free-electrons.com (Mylene Josserand) Date: Thu, 9 Mar 2017 09:20:54 +0100 Subject: [PATCH 4/4] ASoC: sun8i-codec: Convert to use SND_SOC_DAPM_AIF_IN In-Reply-To: References: <20170210094133.11382-1-mylene.josserand@free-electrons.com> <20170210094133.11382-5-mylene.josserand@free-electrons.com> Message-ID: <21d377a3-8e9d-34fa-b5c7-da6456bf31e8@free-electrons.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi Chen-Yu, Thank you for the review. On 06/03/2017 10:56, Chen-Yu Tsai wrote: > On Fri, Feb 10, 2017 at 5:41 PM, Myl?ne Josserand > wrote: >> 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 ++-- > > This patch looks OK, but having the DTS changes in the same patch > probably isn't a good idea. I would really like to see this series > merged for 4.11, so we can expose a good mixer interface to userspace > during the first kernel release supporting the A33 codec. That likely > means some breakage between when the asoc bits and the dts bits land > though. Yes, as it means some breakage, I did not know if 2 patches will be fine or not. > > Maxime, any ideas? > I asked him directly and he agrees. It is fine for me so I will send a v2 with this patch split. Best regards, -- Myl?ne Josserand, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com > > Regards > ChenYu > >> 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 >>