From patchwork Sat Jul 4 11:38:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= X-Patchwork-Id: 11643555 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A38F8618 for ; Sat, 4 Jul 2020 11:42:07 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 79A2D2084C for ; Sat, 4 Jul 2020 11:42:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="eTqGraDm"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KCEglnpy" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 79A2D2084C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc: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:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=a8jqpQrrc/zEDQxbzSoyy/un1pdKBziBfaR7XoWM/nY=; b=eTqGraDmllvWj42EhcXUUDMXt 6g9SBfkN3D2HUXbszy8cmOIKmzJ74RlptqbGdBjzV/Gin2s1VCInd31XyeU6Tqy/RXVfnCG8awm6d EEXtSX3IDZ2eA2IYtZxANdnXZAt+uE4BDXSlUZboHqtgVicvdNBu1ckqkwaW1pWDLu5eMGjviblvT mZPLRxU5IL29kiEFspBGF1yfv1Mo10IYP5qEQvzT3BDxncSNcSZr97qO+o3W1mB/2iPQt5VgQz5j1 9DseZx9CE+QW+GcuFEQUoP0FKdPJc/H5fT6/lKIAaTpgIqYB0dLAZe7jvEKEKFAtDIktA9bd4L0F8 adhusvK0Q==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jrgWg-0005ld-Az; Sat, 04 Jul 2020 11:40:10 +0000 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jrgVu-0005OB-Dn for linux-arm-kernel@lists.infradead.org; Sat, 04 Jul 2020 11:39:23 +0000 Received: by mail-wm1-x341.google.com with SMTP id j18so34356557wmi.3 for ; Sat, 04 Jul 2020 04:39:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GZa7juvxCNraX7yvPBOLr2zonCmAlaBXMRvkitzcE1A=; b=KCEglnpyhNmWqNqkJ/+JquXUQEMFiqvGsTWMUc+p4Dxgp4TE1emyB3jY012MFGoj0d L+aLNL2/GkMTeFM/7qX6AQScuaQShpdM3wOy1NUYQKPxaASltMFZfVP+v02PTpXPqTyy dsNRT1nVSAbwQ7jPLS3X2Z0n+oxRQAMQM9hmM1pFaXRlyuTDYLY0woO6j8WEUQwqCpXP qIdBVbUbyOJtjfvyth01DnHE6oobgdVuu38o6MtaOQDPSvqcPNQvdXTUyfHC0nC9eVSY P7+ojJIqNe9KxAEIqbG3Ck3UGr4+XOhewTkczhTOWaWG39ECeAk23r1PCOVFc7QRx4Rp qVRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GZa7juvxCNraX7yvPBOLr2zonCmAlaBXMRvkitzcE1A=; b=E8cXanJCrQQGExrzsH59ks/tX5H8Lo1cmYrutICxYIrPg2/7lCsQtym53S6iyKgOjY H1UjEl9YaOUhm0wIkE+u1yXgjI3wtBfIiTaLALUjzF/QBMm8CJCkn/njCWKf4WNKMO9J /h7jzniP9bzNGcoX0o2ZMspC2f9TG093mE1nE1ksa9R8IT7eH5B5mPsTtB1g4pUK0s3c XWU7yQ8cCPiQuGtjKR+7uGty28HnpG3Md+lsoVEi4XHualOabO139Gp2XaZOK8m2TK1U 1bthhEhUk6noe4w0K3WFm5EEjDvKdo+yUlG6/1sbetXcyJ3av5TBK+dR1z8ERniL5a3G LjOg== X-Gm-Message-State: AOAM5332m4n3CEPZM35ISUpyGJkm7fjLSUQBh8YbxctHViO4ALIbHoa7 CKHtQOHd5d5Kw/h0FVXd4Ac= X-Google-Smtp-Source: ABdhPJxfcQdS+Umj/CHeClbECFuBf+fW1U4N3FItKLlj7UmAWRunzK5YIbAPJzh+k2FYo5STu5fXKg== X-Received: by 2002:a1c:9d0c:: with SMTP id g12mr34791236wme.107.1593862761215; Sat, 04 Jul 2020 04:39:21 -0700 (PDT) Received: from clement-Latitude-7490.numericable.fr (213-245-241-245.rev.numericable.fr. [213.245.241.245]) by smtp.gmail.com with ESMTPSA id j24sm18657373wrd.43.2020.07.04.04.39.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Jul 2020 04:39:20 -0700 (PDT) From: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= To: Maxime Ripard , Chen-Yu Tsai , Rob Herring , Mark Brown , Liam Girdwood Subject: [PATCH 13/16] arm64: dts: allwinner: a64: Add HDMI audio Date: Sat, 4 Jul 2020 13:38:59 +0200 Message-Id: <20200704113902.336911-14-peron.clem@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200704113902.336911-1-peron.clem@gmail.com> References: <20200704113902.336911-1-peron.clem@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200704_073922_541287_F77B8654 X-CRM114-Status: GOOD ( 10.65 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:341 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [peron.clem[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Jernej Skrabec , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Takashi Iwai , Jaroslav Kysela , Marcus Cooper , linux-sunxi@googlegroups.com, =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Marcus Cooper Add a simple-soundcard to link audio between HDMI and I2S. Signed-off-by: Jernej Skrabec Signed-off-by: Marcus Cooper Signed-off-by: Clément Péron --- arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi index c662f6a170ce..6a321fdc8e90 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi @@ -102,6 +102,25 @@ de: display-engine { status = "disabled"; }; + hdmi_sound: hdmi-sound { + compatible = "simple-audio-card"; + simple-audio-card,format = "i2s"; + simple-audio-card,name = "sun50i-a64-hdmi"; + simple-audio-card,mclk-fs = <128>; + simple-audio-card,frame-inversion; + status = "disabled"; + + simple-audio-card,codec { + sound-dai = <&hdmi>; + }; + + simple-audio-card,cpu { + sound-dai = <&i2s2>; + dai-tdm-slot-num = <2>; + dai-tdm-slot-width = <32>; + }; + }; + osc24M: osc24M_clk { #clock-cells = <0>; compatible = "fixed-clock"; @@ -856,6 +875,7 @@ i2s2: i2s@1c22800 { resets = <&ccu RST_BUS_I2S2>; dma-names = "tx"; dmas = <&dma 27>; + allwinner,playback-channels = <8>; status = "disabled"; }; @@ -1155,6 +1175,7 @@ deinterlace: deinterlace@1e00000 { }; hdmi: hdmi@1ee0000 { + #sound-dai-cells = <0>; compatible = "allwinner,sun50i-a64-dw-hdmi", "allwinner,sun8i-a83t-dw-hdmi"; reg = <0x01ee0000 0x10000>;