From patchwork Fri Nov 9 04:24:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasily Khoruzhick X-Patchwork-Id: 10675287 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 40B5013B0 for ; Fri, 9 Nov 2018 04:25:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2B4642DE49 for ; Fri, 9 Nov 2018 04:25:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1AF632E202; Fri, 9 Nov 2018 04:25:04 +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=-3.6 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 9D0AE2DE49 for ; Fri, 9 Nov 2018 04:25:03 +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:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=7A0sVVw+WBU+vVWb8q2tVwtCX7Zg1Yet16tMPGSc5Fg=; b=vEMOoII/eVWoje vINLqSaQDMfji1T8q7Uda0CRO8BqwChClCr12pSLhIBhP/LlG+shtbe3Snwt9oJ4coJZlJxDQytIm CgLo/HB4/DRF2LMxBeo6JKy/l904di8+kXH4Ad2ECJg/oF1mDkzN9CECmB06tJgpRCXnMlnv93Q1y ikLhmFsC7U4Xec6zkmQliIe0/7e4F51sXynLf/nzvT26+Vp0XJvsq+1QtQJbSLmlGSn0UfgAkvlHh 4cCJeBQX90E0BdEHdzNWHCfm1bSyrO+mCV5U9OgllbgxZG5SEdpavrtWHK+sdGyavkdZ073QxlVeq IwOOdH5aRBQyEwWGDq6g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gKyLr-0006Q5-4Y; Fri, 09 Nov 2018 04:24:59 +0000 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gKyLh-0006H6-4t for linux-arm-kernel@lists.infradead.org; Fri, 09 Nov 2018 04:24:50 +0000 Received: by mail-pg1-x541.google.com with SMTP id 32-v6so313434pgu.2 for ; Thu, 08 Nov 2018 20:24:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=nWShLaaMlEgOpO/eWbfUGsExi+ZoGFlzVp7knPLJTns=; b=ulYoL+IkcizWfl7vJEfO3/ut4eVxYJ07awIvXnZK31gE11Zjy5B8RvuicQPmg5Gt36 giSIGNPzqrKkzYKnHvQCWlxZPOlmSwoKMa56TszZ/tUbrGo3vVWgAWXpl7Q57lHP4/dc jY2hsW6tULsRc8fcjYL8iZBPnkOR5VaYLO+wOnQ2zHClu1Cu9FGeYnifkatQOWkbDO6P jazc4gpAstsBXqBrgFmTh5qG+/+Wx6GZTr1sfT99TpWaiF2zSBvYIOAelVUYiWZt4cid EuyNZrG9nfHUKSUZUx8IZyf83EPZKoI5qUQ1PssYxlAMsTR1EZhHUsXPWuPivbEaTC8M bdKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nWShLaaMlEgOpO/eWbfUGsExi+ZoGFlzVp7knPLJTns=; b=Ylt8OS8+NvdQNVuwL8N1cSlWbGCv/+sar2E3GGh3jMma0LpeUtXAMetbp0gyIQYxH0 UV9Zgbt0IvT407DSNLDC/RkyUGX2GgQOMwyx2OTe5HL+OTT94SYApCg6npN5ULMst/7h U3wuxU5RFIF5OwjVv2t1L3tnA/XLyg+s2DuyWWR2QdXeJWWQsDkoNRSECxBg+0F8iVq1 kJXtowTScVWi3vVf4suJpFAcDuDUbtWqIcWeb7RE65RozOJd7hTeAAXmKv9Dy/stTQmF jvSvDW0czfAxe5RlwFwNI9zpvijLAe8pN9Ijix88kadKaNR1tM5B3yRKPlwmmGny0kEx eJ2g== X-Gm-Message-State: AGRZ1gLj/6SaBZGF1WE2KHvSOv5GqSu9h8i19KNXcUkk3+pMXtK9/TtF EECe6N06j3sTD89PqY5uDGc= X-Google-Smtp-Source: AJdET5cZ1uflPmTyFwBb+T2MQMus9vTHq6GggZWXLkAuXwvCTO1IxxKsqzJUUORSDiAs/OiZBX/EIA== X-Received: by 2002:a62:ce8e:: with SMTP id y136-v6mr7467294pfg.201.1541737473866; Thu, 08 Nov 2018 20:24:33 -0800 (PST) Received: from anarsoul-thinkpad.lan (216-71-193-140.dyn.novuscom.net. [216.71.193.140]) by smtp.gmail.com with ESMTPSA id f22-v6sm6018442pff.29.2018.11.08.20.24.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Nov 2018 20:24:33 -0800 (PST) From: Vasily Khoruzhick To: Maxime Ripard , Chen-Yu Tsai , Rob Herring , Mark Rutland , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Vasily Khoruzhick , Mylene JOSSERAND , Kuninori Morimoto , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, alsa-devel@alsa-project.org Subject: [PATCH v7 1/4] ASoC: sun8i-codec: add missing route for ADC Date: Thu, 8 Nov 2018 20:24:19 -0800 Message-Id: <20181109042422.25653-2-anarsoul@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181109042422.25653-1-anarsoul@gmail.com> References: <20181109042422.25653-1-anarsoul@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181108_202449_185256_62BFAD02 X-CRM114-Status: GOOD ( 13.90 ) 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: , 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 sun8i-codec misses a route from ADC to AIF1 Slot 0 ADC. Add it to the driver to avoid adding it to every dts. Fixes: eda85d1fee05d ("ASoC: sun8i-codec: Add ADC support for a33") Signed-off-by: Vasily Khoruzhick --- sound/soc/sunxi/sun8i-codec.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c index c4196d4e5915..92c5de026c43 100644 --- a/sound/soc/sunxi/sun8i-codec.c +++ b/sound/soc/sunxi/sun8i-codec.c @@ -481,7 +481,11 @@ static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = { { "Right Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch", "AIF1 Slot 0 Right"}, - /* ADC routes */ + /* ADC Routes */ + { "AIF1 Slot 0 Right ADC", NULL, "ADC" }, + { "AIF1 Slot 0 Left ADC", NULL, "ADC" }, + + /* ADC Mixer Routes */ { "Left Digital ADC Mixer", "AIF1 Data Digital ADC Capture Switch", "AIF1 Slot 0 Left ADC" }, { "Right Digital ADC Mixer", "AIF1 Data Digital ADC Capture Switch", From patchwork Fri Nov 9 04:24:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasily Khoruzhick X-Patchwork-Id: 10675295 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8F06F13B0 for ; Fri, 9 Nov 2018 04:25:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7D80C2DE49 for ; Fri, 9 Nov 2018 04:25:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 71B572DE75; Fri, 9 Nov 2018 04:25:35 +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=-3.6 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 270F72DE49 for ; Fri, 9 Nov 2018 04:25:35 +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:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Ta3OH1ioGoHMEC0uTCU1PXUokHf5WdNcz8L3VSyyfSo=; b=jhEHGLBLiQ0lEp D12RW87ju5qBlR+nUW3KwdFzQv/vYBWwC76qcIw0k/QZpr78bpCLrl6wKeHPoNCWs3wxlelnfHzw/ 3wwsN27eIo9sUTJW9eanAoJ81zH29NDp5gSxS/XMfFan7IBWk94gtjaEfx09GFF+MGTEbi1u0Mgo4 tvZblQaytM4YMYEVF2Cwdz3xzY8RkCw6OdQd+8aEJM9qCvQrzraKFqfj2C3d/26+D7XInzXj9y4Sx G1xzeA8usaz30RYCgzcsk3bTYoVdoQH5tbzwW1pAA/1DFWeEVS3CJAAPC33HQ2TyQvSpgdr3nxfO3 D3wYGLI3SLcccbCyGFvg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gKyMN-0008CH-3w; Fri, 09 Nov 2018 04:25:31 +0000 Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gKyLh-0006H7-6H for linux-arm-kernel@lists.infradead.org; Fri, 09 Nov 2018 04:24:50 +0000 Received: by mail-pf1-x441.google.com with SMTP id v68-v6so349914pfk.0 for ; Thu, 08 Nov 2018 20:24:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=TJVj0t1/lNAAl/JOt325TKbL+DY+y6viaeyeHZgGOEk=; b=tbw8n7lvU/YDSP+5S8FgjqXvuPX4bWm6eMjivJa87E6N2qtYL6dCrelHfBlILNLQ9k BN3eF7V3kdLdC3zN+/BZACy6QoiT6UvcKWBbYpmiuddTxl6smlMxUOOj0IylIbVnx+fc r0iilMa0PSa0s4ORuwp34Dxx0ku6WIcOwNUl6XKADnPGbZxraQIsHcTmuUaZUScU46DI NsayG2h/gEW0P8i1hNJqqjaZfMy8CWW8UpDtwX/R8RJ5zxjAscFjaemN1fo1qFV1e6rr priiGwDOfsHxJCL94iJkHgZS382nsjP5+xkUC7dil7cAY8hA1NQXsOidpvFDGXvpbcc2 QcRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=TJVj0t1/lNAAl/JOt325TKbL+DY+y6viaeyeHZgGOEk=; b=PDhnahwIX5vqLmrS4P7DugV+vySHHPb/RDtSvrGd2zhjQceLQkS/Gx4VHBS7h/qsnB o3vXtXi9IPdRlFl1oUGQLtjuPue2z2OhETsVOLTGWh9chnPVtNEKLvtT8IlEUZoLJZpH ocad4PVdb00P+orHvaImIiTqe/UGlK4LujeNwrqF910AHOUtPNlk+zRD1WpRD9+Y9b+m 4t2c7QaIYFOdNBWnaHKbQYkhDAgX9ZZUBHtKtanmu4H1s7vnFhSWWZW9wQFA6m4C7+Fq E+6zLh58rRJFa8B2BKY7LcQ/UeOZ207w9PAppNwTV91RC04adZUd3UkUoJeBBYPbIjln Cbpw== X-Gm-Message-State: AGRZ1gKpRzVVtRBIZUvkhc3SbMquz7j5Mq/wkxTmKlGy0T35IwR+fBVN A1y4314S7i83s+yVx1G9d9s= X-Google-Smtp-Source: AJdET5fPm01zSrfV/8U8Gb/22+3v906UNRsad5HsmV99e4Xo7KrHQQeDGWHF3DyxmXIoTouGEnoruQ== X-Received: by 2002:a62:43cd:: with SMTP id l74-v6mr7683948pfi.240.1541737474848; Thu, 08 Nov 2018 20:24:34 -0800 (PST) Received: from anarsoul-thinkpad.lan (216-71-193-140.dyn.novuscom.net. [216.71.193.140]) by smtp.gmail.com with ESMTPSA id f22-v6sm6018442pff.29.2018.11.08.20.24.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Nov 2018 20:24:34 -0800 (PST) From: Vasily Khoruzhick To: Maxime Ripard , Chen-Yu Tsai , Rob Herring , Mark Rutland , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Vasily Khoruzhick , Mylene JOSSERAND , Kuninori Morimoto , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, alsa-devel@alsa-project.org Subject: [PATCH v7 2/4] arm64: dts: allwinner: a64: add nodes necessary for analog sound support Date: Thu, 8 Nov 2018 20:24:20 -0800 Message-Id: <20181109042422.25653-3-anarsoul@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181109042422.25653-1-anarsoul@gmail.com> References: <20181109042422.25653-1-anarsoul@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181108_202449_243634_F477021E X-CRM114-Status: GOOD ( 13.23 ) 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: , 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 nodes for i2s, digital and analog parts of audiocodec on A64 Signed-off-by: Vasily Khoruzhick --- arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi index f3a66f888205..5c52eb6148a6 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi @@ -173,6 +173,30 @@ compatible = "linux,spdif-dit"; }; + sound: sound { + compatible = "simple-audio-card"; + simple-audio-card,name = "sun50i-a64-audio"; + simple-audio-card,format = "i2s"; + simple-audio-card,frame-master = <&cpudai>; + simple-audio-card,bitclock-master = <&cpudai>; + simple-audio-card,mclk-fs = <512>; + simple-audio-card,aux-devs = <&codec_analog>; + simple-audio-card,routing = + "Left DAC", "AIF1 Slot 0 Left", + "Right DAC", "AIF1 Slot 0 Right", + "AIF1 Slot 0 Left ADC", "Left ADC", + "AIF1 Slot 0 Right ADC", "Right ADC"; + status = "disabled"; + + cpudai: simple-audio-card,cpu { + sound-dai = <&dai>; + }; + + link_codec: simple-audio-card,codec { + sound-dai = <&codec>; + }; + }; + timer { compatible = "arm,armv8-timer"; interrupts = ; + compatible = "allwinner,sun50i-a64-codec-i2s"; + reg = <0x01c22c00 0x200>; + interrupts = ; + clocks = <&ccu CLK_BUS_CODEC>, <&ccu CLK_AC_DIG>; + clock-names = "apb", "mod"; + resets = <&ccu RST_BUS_CODEC>; + reset-names = "rst"; + dmas = <&dma 15>, <&dma 15>; + dma-names = "rx", "tx"; + status = "disabled"; + }; + + codec: codec@1c22e00 { + #sound-dai-cells = <0>; + compatible = "allwinner,sun8i-a33-codec"; + reg = <0x01c22e00 0x600>; + interrupts = ; + clocks = <&ccu CLK_BUS_CODEC>, <&ccu CLK_AC_DIG>; + clock-names = "bus", "mod"; + status = "disabled"; + }; + uart0: serial@1c28000 { compatible = "snps,dw-apb-uart"; reg = <0x01c28000 0x400>; @@ -902,6 +950,12 @@ #reset-cells = <1>; }; + codec_analog: codec-analog@1f015c0 { + compatible = "allwinner,sun50i-a64-codec-analog"; + reg = <0x01f015c0 0x4>; + status = "disabled"; + }; + r_i2c: i2c@1f02400 { compatible = "allwinner,sun50i-a64-i2c", "allwinner,sun6i-a31-i2c"; From patchwork Fri Nov 9 04:24:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasily Khoruzhick X-Patchwork-Id: 10675297 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A922813BF for ; Fri, 9 Nov 2018 04:25:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 966B82DE49 for ; Fri, 9 Nov 2018 04:25:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8A69F2E659; Fri, 9 Nov 2018 04:25:50 +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=-3.6 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 0E6E92DE49 for ; Fri, 9 Nov 2018 04:25:49 +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:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=V4AatvgLvqAqr5hjqixQK5eoJAB9ewPFn/78qxJoSrA=; b=GHHb2wNqGaajq9 +mjTfy9x/i6B+zKRQC4WX70n/BTxFH4ulZwIGtpjTexkTNiJThJI28zjXdzl6ybu/Ny6A8RzUcPqt 2P9FyfS0MtQcQ0j9A/su4sOAWH6nnxYxQ97IyToWWK9+zz87uQ+1Cdf4ufDpBfyMfHLJlE2ZA1z9w NTovsQyu3zhdkohZ85iD6NI/wwIfCL4XUFS7IMTIJvq0jmi8tRgl8nK0VUQLxnkiHHfmnn1IW2iee JVBqsNukWdC9A5r2pVQdGi+E5tX6LFhDuiGbNv24MdDwE4i5oNBQxspghteYcTj0jh960K4RPfBv3 ZQQ7anzUaRHBromvZCAw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gKyMd-0008Sg-3v; Fri, 09 Nov 2018 04:25:47 +0000 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gKyLi-0006H8-44 for linux-arm-kernel@lists.infradead.org; Fri, 09 Nov 2018 04:24:51 +0000 Received: by mail-pf1-x444.google.com with SMTP id u10-v6so329575pfn.9 for ; Thu, 08 Nov 2018 20:24:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=XsI6liqRm0Icct1UwElzJzz0WL5cnOhqGHow0nya2E8=; b=a4d7VFXDruYnIo5HJVbxmT7ILPu3YeAaGoJPAvudGws/g8fc+x1PHvfOAPkfpGRuNc xFL+X+3JO/SLdzrADSdNLKM6ym5gBE+FaBNzmP7Mc8OMZCXbjlEoWjT0NOAaFj9RBEP9 3vKpIRxN8xzzqelNf+ukab6PawW8Ym2bwTQWn5W0zdOw5o8iVQx2hKTsUmnEQGNh4sYk WjsWwGOpnhtOK4DOMxybXutBkI4tCyEAg0kOLY8vlQPxPp4lknFmu9NU0hSchSifAPUA DpYGvvGwm/1Jom2wzcmarU7avBw+BiNFvYhQOGH2wXNk54lNlUeqxHi6NGUe/E4U0rZu 02tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XsI6liqRm0Icct1UwElzJzz0WL5cnOhqGHow0nya2E8=; b=s4o5bZCOeHGt0bEZ0TpKfbbrzYV2n6iXyWPNJZQCIw6LqvmRT/nVPIMbu0Bh8BrdoX ZetwLfOarsymXBWZuAXg88lGGaE4UBnFY/0/grRjWBtBuzL1juMvlgzOD1NMLeKjJcMG k4Zw0wJ9JRn6YN1U5zpaPJ1CLQ6ojr03iqeJfH5FD05Ot01egRwWgJn6YwdvDQgjaNOI 6w/olr9xX6Hp3p5zU2tsYdnGlRxzM04zRxY9EZQwL/DhdKARcPGv8btL+l7eNU/es1Fz beZkr/YpRiAR52RMnGu7e98GsYQi9b3DTWhURM8skLHm1AW/B3uETb/qFj5u+3HUOGTR rKcw== X-Gm-Message-State: AGRZ1gJOcWCUe2XbFAy8Qt0g9tmsGM4MpFI2E9iAXCRCyPBqG7Vhg5S4 gMhRmzJR3oxXhUXd5SiLhN0= X-Google-Smtp-Source: AJdET5cij+BKCciv+ccpu9ON8gl/yfrvnxxVpu6ENBt8RSmX1+nHQ5yrpPeuIEJXspaF2QuJFTNb6g== X-Received: by 2002:a62:5210:: with SMTP id g16-v6mr7418806pfb.256.1541737475757; Thu, 08 Nov 2018 20:24:35 -0800 (PST) Received: from anarsoul-thinkpad.lan (216-71-193-140.dyn.novuscom.net. [216.71.193.140]) by smtp.gmail.com with ESMTPSA id f22-v6sm6018442pff.29.2018.11.08.20.24.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Nov 2018 20:24:35 -0800 (PST) From: Vasily Khoruzhick To: Maxime Ripard , Chen-Yu Tsai , Rob Herring , Mark Rutland , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Vasily Khoruzhick , Mylene JOSSERAND , Kuninori Morimoto , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, alsa-devel@alsa-project.org Subject: [PATCH v7 3/4] arm64: dts: allwinner: a64: enable sound on Pine64 and SoPine Date: Thu, 8 Nov 2018 20:24:21 -0800 Message-Id: <20181109042422.25653-4-anarsoul@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181109042422.25653-1-anarsoul@gmail.com> References: <20181109042422.25653-1-anarsoul@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181108_202450_159074_437FDA5F X-CRM114-Status: GOOD ( 13.15 ) 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: , 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 This commit enables I2S, digital and analog parts of audiocodec on Pine64 and SoPine boards. Signed-off-by: Vasily Khoruzhick --- .../boot/dts/allwinner/sun50i-a64-pine64.dts | 25 +++++++++++++++++++ .../allwinner/sun50i-a64-sopine-baseboard.dts | 25 +++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts index c077b6c1f458..aba40b4c5216 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts @@ -75,6 +75,18 @@ }; }; +&codec { + status = "okay"; +}; + +&codec_analog { + status = "okay"; +}; + +&dai { + status = "okay"; +}; + &de { status = "okay"; }; @@ -264,6 +276,19 @@ status = "disabled"; }; +&sound { + status = "okay"; + simple-audio-card,widgets = "Microphone", "Microphone Jack", + "Headphone", "Headphone Jack"; + simple-audio-card,routing = + "Left DAC", "AIF1 Slot 0 Left", + "Right DAC", "AIF1 Slot 0 Right", + "Headphone Jack", "HP", + "AIF1 Slot 0 Left ADC", "Left ADC", + "AIF1 Slot 0 Right ADC", "Right ADC", + "MIC2", "Microphone Jack"; +}; + /* On Exp and Euler connectors */ &uart0 { pinctrl-names = "default"; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts index 53fcc9098df3..be45e2a287e1 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts @@ -80,6 +80,18 @@ }; }; +&codec { + status = "okay"; +}; + +&codec_analog { + status = "okay"; +}; + +&dai { + status = "okay"; +}; + &de { status = "okay"; }; @@ -164,6 +176,19 @@ vcc-hdmi-supply = <®_dldo1>; }; +&sound { + status = "okay"; + simple-audio-card,widgets = "Microphone", "Microphone Jack", + "Headphone", "Headphone Jack"; + simple-audio-card,routing = + "Left DAC", "AIF1 Slot 0 Left", + "Right DAC", "AIF1 Slot 0 Right", + "Headphone Jack", "HP", + "AIF1 Slot 0 Left ADC", "Left ADC", + "AIF1 Slot 0 Right ADC", "Right ADC", + "MIC2", "Microphone Jack"; +}; + &uart0 { pinctrl-names = "default"; pinctrl-0 = <&uart0_pb_pins>; From patchwork Fri Nov 9 04:24:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasily Khoruzhick X-Patchwork-Id: 10675293 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7479613BF for ; Fri, 9 Nov 2018 04:25:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 62E972DE49 for ; Fri, 9 Nov 2018 04:25:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 56BB62DE75; Fri, 9 Nov 2018 04:25:27 +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=-3.6 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 E44862DE49 for ; Fri, 9 Nov 2018 04:25:26 +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:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=g9W+vLYIDTsq0TYnWSoGpuMPWPUJ6CRJMjimFmNPBrE=; b=hsxHf5KoIMHSXS g36a8uGjdW4LwpdNXXCq2eEfdqFOvZxvzqXcUC/RD4MXx3YP0c02dPovT6vgsNw1x4m83kVHRe+3a 7ylUE0zRbrZ5No+84OnO2wpnC9dEkt38UXlZ+E/UmJKpUzdl562N9y6nx7lHfvivuAZJNRLO5LsK0 Tqx/AJOiD8v9BZ53SERLwAUG/7eQ/z2HSxhFKaLeJCqC3Cu73NUR5zKMJWSChLHFAxNYH1XZFbV33 QfGeZO/QAEUdh75vD4n6utq0dNaNpxch7eDpnQxQLqpFLLR3NqqjjgF1Cxwqer08eVmJeLL6sPmV4 f+/2oJfTEfV5sp4IUb8Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gKyM9-0007yQ-T5; Fri, 09 Nov 2018 04:25:17 +0000 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gKyLh-0006H9-4s for linux-arm-kernel@lists.infradead.org; Fri, 09 Nov 2018 04:24:50 +0000 Received: by mail-pg1-x541.google.com with SMTP id w7so291872pgp.13 for ; Thu, 08 Nov 2018 20:24:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=G+RX/XTDnH8SuA0piGZ4cLJUbmY7TC6rn7MVdOwvqE4=; b=EqvvyFifydwDlvfI3oOMZh8dznvsUXcLb+uSgx8yc0PhFd4WPK9kGnGiAqjB+gnwEA mtQzvd2s4K4PgtYSeK4El4C3gZoPIbHzBniZTWFVgoH1wK8Va/z4sRcW/hAaWvB2o/x4 nf3ICVoLx4P4fBCcNuPzbC3S3vuvniB0KJ8JXeRTa7cPwAAvJdYVsigliMZ9B+OADgu6 sgXU9NZ9wBR/YEg9tIyTFb3m/x/g5+78+pX3L7xUu8u0vX8FP9kHLE0WxCaF31vuNuHW GzLHGs8zOfCXksQEe3ZEjxwoAn0RtKguwnFNV6wlgSYASJXSLvANz+IXyr6nCtBg9Uy0 QaLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=G+RX/XTDnH8SuA0piGZ4cLJUbmY7TC6rn7MVdOwvqE4=; b=qVrpWvjPb+/aa4qnCZlSE8w6X+YylI36yr2ZntJpctx8s/XiGNrDKprx1etx6KF/pI GwCrOpTC4Y0t7BueczS1gDi6Zmg6C+pTcK8q1VdEUlvxxI94TVp9Em/PdZoIjLzoOO5h ly+RBsI/FS1PmPMR+JOD/j11dQYiSUTqAdIzT35YTjLryz9bGy795valGCX46SmuRRss 6pk0WmjuDwr5GtADGBPtrwbWGY/QBp1bp0ZNJV4l6KYBscr2WMpNIBUnlyjTbcTeUKNG vQ34YNaa80VJlYng8nimWnvE1Ew4edxHdYzj6neuRMPafQA65bwP5RQN4PevRCXgvzTR qBKw== X-Gm-Message-State: AGRZ1gJtVbCbxBNLv9RHFtCzejqmvgu1BFqjt4Kmh5DL0DvfTrvHCiQL cVgTwWwAFZBM+b052JMbKSw= X-Google-Smtp-Source: AJdET5d0GOscQFdQ6vC6TCI4eTIoCyW4kBhlQLskdHTiefNG4NGOrJdcT5dHn3KeqNJFqM4R9XJy1Q== X-Received: by 2002:a62:db44:: with SMTP id f65-v6mr7462806pfg.94.1541737476761; Thu, 08 Nov 2018 20:24:36 -0800 (PST) Received: from anarsoul-thinkpad.lan (216-71-193-140.dyn.novuscom.net. [216.71.193.140]) by smtp.gmail.com with ESMTPSA id f22-v6sm6018442pff.29.2018.11.08.20.24.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Nov 2018 20:24:36 -0800 (PST) From: Vasily Khoruzhick To: Maxime Ripard , Chen-Yu Tsai , Rob Herring , Mark Rutland , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Vasily Khoruzhick , Mylene JOSSERAND , Kuninori Morimoto , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, alsa-devel@alsa-project.org Subject: [PATCH v7 4/4] arm64: dts: allwinner: a64: enable sound on Pinebook Date: Thu, 8 Nov 2018 20:24:22 -0800 Message-Id: <20181109042422.25653-5-anarsoul@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181109042422.25653-1-anarsoul@gmail.com> References: <20181109042422.25653-1-anarsoul@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181108_202449_185771_F0B3322F X-CRM114-Status: GOOD ( 12.84 ) 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: , 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 This commit enables I2S, digital and analog parts of audiocodec on Pinebook Signed-off-by: Vasily Khoruzhick --- .../dts/allwinner/sun50i-a64-pinebook.dts | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts index 77fac84797e9..ec4dd9877355 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts @@ -64,6 +64,23 @@ compatible = "mmc-pwrseq-simple"; reset-gpios = <&r_pio 0 2 GPIO_ACTIVE_LOW>; /* PL2 */ }; + + speaker_amp: speaker_amp { + compatible = "simple-audio-amplifier"; + enable-gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>; /* PH7 */ + }; +}; + +&codec { + status = "okay"; +}; + +&codec_analog { + status = "okay"; +}; + +&dai { + status = "okay"; }; &ehci0 { @@ -267,6 +284,29 @@ vcc-hdmi-supply = <®_dldo1>; }; +&sound { + status = "okay"; + simple-audio-card,widgets = "Microphone", "Internal Microphone Left", + "Microphone", "Internal Microphone Right", + "Headphone", "Headphone Jack", + "Speaker", "Internal Speaker"; + simple-audio-card,aux-devs = <&codec_analog>, <&speaker_amp>; + simple-audio-card,routing = + "Left DAC", "AIF1 Slot 0 Left", + "Right DAC", "AIF1 Slot 0 Right", + "INL", "LINEOUT", + "INR", "LINEOUT", + "Internal Speaker", "OUTL", + "Internal Speaker", "OUTR", + "Headphone Jack", "HP", + "AIF1 Slot 0 Left ADC", "Left ADC", + "AIF1 Slot 0 Right ADC", "Right ADC", + "Internal Microphone Left", "MBIAS", + "MIC1", "Internal Microphone Left", + "Internal Microphone Right", "HBIAS", + "MIC2", "Internal Microphone Right"; +}; + &uart0 { pinctrl-names = "default"; pinctrl-0 = <&uart0_pb_pins>;