From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1054BC43463 for ; Mon, 21 Sep 2020 10:33:42 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (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 4F80B20EDD for ; Mon, 21 Sep 2020 10:33:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alsa-project.org header.i=@alsa-project.org header.b="f9BAUj1x"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="RvDq5ACJ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4F80B20EDD Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id C3C8E16EA; Mon, 21 Sep 2020 12:32:49 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz C3C8E16EA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1600684419; bh=pOUDdxF+ORCxoCN1LCBGXRN4UlT3CfIWSSGkMvcrhLc=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=f9BAUj1xvG17Am9z72u4EoE2ger9LPFC2F1g1Ug/QKnnaQSBPbSaEr9K5KyahxhU2 P3Urqg5Nc+Ln82SMHaGHMNDXf+twMUB3jbhgD52ggAWHsagMOCoUEWYGL/suyzvYF0 OFOUzBxtobaV+EbpwL6zOZjAJMHw6qtFgska5itE= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 55BF2F802EC; Mon, 21 Sep 2020 12:28:31 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 53C9FF800B2; Mon, 21 Sep 2020 12:28:07 +0200 (CEST) Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id C5CA3F800B2 for ; Mon, 21 Sep 2020 12:27:47 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz C5CA3F800B2 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="RvDq5ACJ" Received: by mail-wr1-x442.google.com with SMTP id j2so12147834wrx.7 for ; Mon, 21 Sep 2020 03:27:47 -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=JkdfxrLwBdjddup+rntjfNSMSYQlzu1HAdo40yPe7r0=; b=RvDq5ACJPtcSlqQgNrS9a3nOGhIsFdBgxLfrl9P56YbGTStq55a6p52GECOAedqyy6 gMzeOiMhfAAkyD/nxfsATltAVGFWBJgowmuHCg55dvJZsRffi2zdA12KmUko1g3Qp1SX ldXtluqJWmnRhJxX2W8IcIGn1tuSgwXJEYuta/HXu6wbAceQagBGidUQzmkWqMPnjg8t xPRcG6WBUZmwtL+ER3Ktd7IOHQol7NXZ85ztiwPCoWpMmkzu7f+dszG5Os71mmvDQXb4 l4b+H3lTLectvTOx+hp/GkJzxBSwV9fkONw3EcPMvqpw2EeR4znqu+WZcC7qRhGMvT40 sbyg== 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=JkdfxrLwBdjddup+rntjfNSMSYQlzu1HAdo40yPe7r0=; b=YhQuC6p7Ak38vNEyhU9BpGtQA+jxBYHQRHwu1t1KxbIs+0JPFkjIgepjUQLg0+JN4w Q2+1+zzvi44iZp6RgTmKkHITfVaKpFDQ9Vsb3dCeU2WkK2IPdjzIAEX1As6xQpq3bpO7 IKY3NYfcwkwZosc+5unxZiZ9EWUHyZKrmGgpv18ZAEJd0p+oEMNdUD24/Ri7Lg1qj7I0 5GAQibpG0VONoL40KFDx4CK3ujSLkCwfb+9jye5NuWNroP2RLPxz1WHutLY5lpCu3Q/S au6B8hbJQdZmwTdvJXH0HleLK7ULI6vkSGarQCzwHFPi1HCc8+BpscpyvfTdPltj6KR4 C2fQ== X-Gm-Message-State: AOAM532mpoY2rZBnlqH8Zz/T77YfbDmPnY69+woDGZtBAzQG5UyFOok8 PqgYyX+HOxFucI2TddwF/VI= X-Google-Smtp-Source: ABdhPJzWiop5gOEboJyVl9N3SYa7aUJaakgTHf38lUDH0hociHufJWzfPObOk+9i3qTV7iU2vHQmKg== X-Received: by 2002:adf:e385:: with SMTP id e5mr50763021wrm.129.1600684066825; Mon, 21 Sep 2020 03:27:46 -0700 (PDT) Received: from localhost.localdomain (lputeaux-656-1-11-33.w82-127.abo.wanadoo.fr. [82.127.142.33]) by smtp.gmail.com with ESMTPSA id h2sm20713774wrp.69.2020.09.21.03.27.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Sep 2020 03:27:45 -0700 (PDT) From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= To: Maxime Ripard , Chen-Yu Tsai , Rob Herring , Mark Brown , Liam Girdwood Subject: [PATCH v4 09/22] arm64: dts: allwinner: h6: Add HDMI audio node Date: Mon, 21 Sep 2020 12:27:18 +0200 Message-Id: <20200921102731.747736-10-peron.clem@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200921102731.747736-1-peron.clem@gmail.com> References: <20200921102731.747736-1-peron.clem@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: devicetree@vger.kernel.org, Jernej Skrabec , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Takashi Iwai , Marcus Cooper , linux-sunxi@googlegroups.com, =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= , linux-arm-kernel@lists.infradead.org X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Jernej Skrabec 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-h6.dtsi | 33 ++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi index 28c77d6872f6..a8853ee7885a 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi @@ -67,6 +67,25 @@ de: display-engine { status = "disabled"; }; + hdmi_sound: hdmi-sound { + compatible = "simple-audio-card"; + simple-audio-card,format = "i2s"; + simple-audio-card,name = "sun50i-h6-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 = <&i2s1>; + dai-tdm-slot-num = <2>; + dai-tdm-slot-width = <32>; + }; + }; + osc24M: osc24M_clk { #clock-cells = <0>; compatible = "fixed-clock"; @@ -609,6 +628,19 @@ mdio: mdio { }; }; + i2s1: i2s@5091000 { + #sound-dai-cells = <0>; + compatible = "allwinner,sun50i-h6-i2s"; + reg = <0x05091000 0x1000>; + interrupts = ; + clocks = <&ccu CLK_BUS_I2S1>, <&ccu CLK_I2S1>; + clock-names = "apb", "mod"; + dmas = <&dma 4>, <&dma 4>; + resets = <&ccu RST_BUS_I2S1>; + dma-names = "rx", "tx"; + status = "disabled"; + }; + spdif: spdif@5093000 { #sound-dai-cells = <0>; compatible = "allwinner,sun50i-h6-spdif"; @@ -739,6 +771,7 @@ ohci3: usb@5311400 { }; hdmi: hdmi@6000000 { + #sound-dai-cells = <0>; compatible = "allwinner,sun50i-h6-dw-hdmi"; reg = <0x06000000 0x10000>; reg-io-width = <1>; -- 2.25.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 376A6C43464 for ; Mon, 21 Sep 2020 10:31:27 +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 DEA4420EDD for ; Mon, 21 Sep 2020 10:31:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="utjiWEox"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="RvDq5ACJ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DEA4420EDD 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+linux-arm-kernel=archiver.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=5EMh1FuHv1JKnNxxamEr5g9gk/c34bpgmEukWVmqDkU=; b=utjiWEoxFzxD22m9MSKSKUXvl uSC5VKy5lEakQgzqGcj9xvsFM+g22pgTw6OObGe95yTBRbyFoXwVfnvb/YFiNiJnbAgiP8otjep3o ocqdNIafCsQsE9o4/wkLdGtGi1vEVGl4G9QPn3a1sa+XhrWVjkZzpW8jwXU8yl+jGnLfjnXgjeOZm uUl1nomhsiGr4CrqHnJ2r8sp8WRnwKNFUkIuw35ftj4Pazum+efbbB7J8yKRChDKBjjevUHm+bImz Nthp3MjNiZ6m4LRbkkaa+Fpoo4LMWspnp66CxKKSJyOafb58IGjsT0zMFfkMZ66WqP1BHHGYN1PCY QqHgLJQeQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kKJ4b-0008Mq-Kd; Mon, 21 Sep 2020 10:29:29 +0000 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kKJ2y-0007i3-1y for linux-arm-kernel@lists.infradead.org; Mon, 21 Sep 2020 10:27:49 +0000 Received: by mail-wr1-x444.google.com with SMTP id o5so12126620wrn.13 for ; Mon, 21 Sep 2020 03:27:47 -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=JkdfxrLwBdjddup+rntjfNSMSYQlzu1HAdo40yPe7r0=; b=RvDq5ACJPtcSlqQgNrS9a3nOGhIsFdBgxLfrl9P56YbGTStq55a6p52GECOAedqyy6 gMzeOiMhfAAkyD/nxfsATltAVGFWBJgowmuHCg55dvJZsRffi2zdA12KmUko1g3Qp1SX ldXtluqJWmnRhJxX2W8IcIGn1tuSgwXJEYuta/HXu6wbAceQagBGidUQzmkWqMPnjg8t xPRcG6WBUZmwtL+ER3Ktd7IOHQol7NXZ85ztiwPCoWpMmkzu7f+dszG5Os71mmvDQXb4 l4b+H3lTLectvTOx+hp/GkJzxBSwV9fkONw3EcPMvqpw2EeR4znqu+WZcC7qRhGMvT40 sbyg== 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=JkdfxrLwBdjddup+rntjfNSMSYQlzu1HAdo40yPe7r0=; b=IURxnPVrq0Ybd29qYPFTZsYhMQWyE1nq/n1mGcCpXy/O7E3yAqNTSrZMARpXCAHN2t uF2gYuG8xU7DqgZFinA4gFOgmKgrrV3iXiNDneyd869iLMMboqIbQ7qmA63+O29CxL20 9JPKWzhlvUkq1ju8JphNb3qjsutFgRq9XEQLOBjGQjM+jaNh03zrKjr0YmOoyHkm4m+9 5P7oYxx7mwrh3i4Zq/Ms91q+kt9rN+QsIk2VBGabh9BdYqxUJ9t7BvJqb99Mh4w0VJT9 Q1ctlNEfOWLe2y/bQGVUTZSqvLKy3AOg6GCTSwYzpTEd91WfAKkOLJdA6wRwMcIv+D3L 5WVQ== X-Gm-Message-State: AOAM532+o1a/V1T4BffvD5/Rs9V0EOxvtPjXABH8frqQ3nnn96kkW1p/ lQRN0Mi8KbRh2crktrAOwRo= X-Google-Smtp-Source: ABdhPJzWiop5gOEboJyVl9N3SYa7aUJaakgTHf38lUDH0hociHufJWzfPObOk+9i3qTV7iU2vHQmKg== X-Received: by 2002:adf:e385:: with SMTP id e5mr50763021wrm.129.1600684066825; Mon, 21 Sep 2020 03:27:46 -0700 (PDT) Received: from localhost.localdomain (lputeaux-656-1-11-33.w82-127.abo.wanadoo.fr. [82.127.142.33]) by smtp.gmail.com with ESMTPSA id h2sm20713774wrp.69.2020.09.21.03.27.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Sep 2020 03:27:45 -0700 (PDT) From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= To: Maxime Ripard , Chen-Yu Tsai , Rob Herring , Mark Brown , Liam Girdwood Subject: [PATCH v4 09/22] arm64: dts: allwinner: h6: Add HDMI audio node Date: Mon, 21 Sep 2020 12:27:18 +0200 Message-Id: <20200921102731.747736-10-peron.clem@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200921102731.747736-1-peron.clem@gmail.com> References: <20200921102731.747736-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-20200921_062748_125434_84AAFD3E X-CRM114-Status: GOOD ( 13.56 ) 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?q?Cl=C3=A9ment=20P=C3=A9ron?= , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org RnJvbTogSmVybmVqIFNrcmFiZWMgPGplcm5lai5za3JhYmVjQHNpb2wubmV0PgoKQWRkIGEgc2lt cGxlLXNvdW5kY2FyZCB0byBsaW5rIGF1ZGlvIGJldHdlZW4gSERNSSBhbmQgSTJTLgoKU2lnbmVk LW9mZi1ieTogSmVybmVqIFNrcmFiZWMgPGplcm5lai5za3JhYmVjQHNpb2wubmV0PgpTaWduZWQt b2ZmLWJ5OiBNYXJjdXMgQ29vcGVyIDxjb2Rla2lwcGVyQGdtYWlsLmNvbT4KU2lnbmVkLW9mZi1i eTogQ2zDqW1lbnQgUMOpcm9uIDxwZXJvbi5jbGVtQGdtYWlsLmNvbT4KLS0tCiBhcmNoL2FybTY0 L2Jvb3QvZHRzL2FsbHdpbm5lci9zdW41MGktaDYuZHRzaSB8IDMzICsrKysrKysrKysrKysrKysr KysrCiAxIGZpbGUgY2hhbmdlZCwgMzMgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2FyY2gv YXJtNjQvYm9vdC9kdHMvYWxsd2lubmVyL3N1bjUwaS1oNi5kdHNpIGIvYXJjaC9hcm02NC9ib290 L2R0cy9hbGx3aW5uZXIvc3VuNTBpLWg2LmR0c2kKaW5kZXggMjhjNzdkNjg3MmY2Li5hODg1M2Vl Nzg4NWEgMTAwNjQ0Ci0tLSBhL2FyY2gvYXJtNjQvYm9vdC9kdHMvYWxsd2lubmVyL3N1bjUwaS1o Ni5kdHNpCisrKyBiL2FyY2gvYXJtNjQvYm9vdC9kdHMvYWxsd2lubmVyL3N1bjUwaS1oNi5kdHNp CkBAIC02Nyw2ICs2NywyNSBAQCBkZTogZGlzcGxheS1lbmdpbmUgewogCQlzdGF0dXMgPSAiZGlz YWJsZWQiOwogCX07CiAKKwloZG1pX3NvdW5kOiBoZG1pLXNvdW5kIHsKKwkJY29tcGF0aWJsZSA9 ICJzaW1wbGUtYXVkaW8tY2FyZCI7CisJCXNpbXBsZS1hdWRpby1jYXJkLGZvcm1hdCA9ICJpMnMi OworCQlzaW1wbGUtYXVkaW8tY2FyZCxuYW1lID0gInN1bjUwaS1oNi1oZG1pIjsKKwkJc2ltcGxl LWF1ZGlvLWNhcmQsbWNsay1mcyA9IDwxMjg+OworCQlzaW1wbGUtYXVkaW8tY2FyZCxmcmFtZS1p bnZlcnNpb247CisJCXN0YXR1cyA9ICJkaXNhYmxlZCI7CisKKwkJc2ltcGxlLWF1ZGlvLWNhcmQs Y29kZWMgeworCQkJc291bmQtZGFpID0gPCZoZG1pPjsKKwkJfTsKKworCQlzaW1wbGUtYXVkaW8t Y2FyZCxjcHUgeworCQkJc291bmQtZGFpID0gPCZpMnMxPjsKKwkJCWRhaS10ZG0tc2xvdC1udW0g PSA8Mj47CisJCQlkYWktdGRtLXNsb3Qtd2lkdGggPSA8MzI+OworCQl9OworCX07CisKIAlvc2My NE06IG9zYzI0TV9jbGsgewogCQkjY2xvY2stY2VsbHMgPSA8MD47CiAJCWNvbXBhdGlibGUgPSAi Zml4ZWQtY2xvY2siOwpAQCAtNjA5LDYgKzYyOCwxOSBAQCBtZGlvOiBtZGlvIHsKIAkJCX07CiAJ CX07CiAKKwkJaTJzMTogaTJzQDUwOTEwMDAgeworCQkJI3NvdW5kLWRhaS1jZWxscyA9IDwwPjsK KwkJCWNvbXBhdGlibGUgPSAiYWxsd2lubmVyLHN1bjUwaS1oNi1pMnMiOworCQkJcmVnID0gPDB4 MDUwOTEwMDAgMHgxMDAwPjsKKwkJCWludGVycnVwdHMgPSA8R0lDX1NQSSAxOSBJUlFfVFlQRV9M RVZFTF9ISUdIPjsKKwkJCWNsb2NrcyA9IDwmY2N1IENMS19CVVNfSTJTMT4sIDwmY2N1IENMS19J MlMxPjsKKwkJCWNsb2NrLW5hbWVzID0gImFwYiIsICJtb2QiOworCQkJZG1hcyA9IDwmZG1hIDQ+ LCA8JmRtYSA0PjsKKwkJCXJlc2V0cyA9IDwmY2N1IFJTVF9CVVNfSTJTMT47CisJCQlkbWEtbmFt ZXMgPSAicngiLCAidHgiOworCQkJc3RhdHVzID0gImRpc2FibGVkIjsKKwkJfTsKKwogCQlzcGRp Zjogc3BkaWZANTA5MzAwMCB7CiAJCQkjc291bmQtZGFpLWNlbGxzID0gPDA+OwogCQkJY29tcGF0 aWJsZSA9ICJhbGx3aW5uZXIsc3VuNTBpLWg2LXNwZGlmIjsKQEAgLTczOSw2ICs3NzEsNyBAQCBv aGNpMzogdXNiQDUzMTE0MDAgewogCQl9OwogCiAJCWhkbWk6IGhkbWlANjAwMDAwMCB7CisJCQkj c291bmQtZGFpLWNlbGxzID0gPDA+OwogCQkJY29tcGF0aWJsZSA9ICJhbGx3aW5uZXIsc3VuNTBp LWg2LWR3LWhkbWkiOwogCQkJcmVnID0gPDB4MDYwMDAwMDAgMHgxMDAwMD47CiAJCQlyZWctaW8t d2lkdGggPSA8MT47Ci0tIAoyLjI1LjEKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpsaW51eC1hcm0ta2VybmVsIG1haWxpbmcgbGlzdApsaW51eC1hcm0t a2VybmVsQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJhZGVhZC5vcmcvbWFp bG1hbi9saXN0aW5mby9saW51eC1hcm0ta2VybmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 71158C43468 for ; Mon, 21 Sep 2020 10:28:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3822E20EDD for ; Mon, 21 Sep 2020 10:28:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="RvDq5ACJ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726617AbgIUK2q (ORCPT ); Mon, 21 Sep 2020 06:28:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60266 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726814AbgIUK1s (ORCPT ); Mon, 21 Sep 2020 06:27:48 -0400 Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 43728C0613D2; Mon, 21 Sep 2020 03:27:48 -0700 (PDT) Received: by mail-wr1-x442.google.com with SMTP id g4so12138396wrs.5; Mon, 21 Sep 2020 03:27:48 -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=JkdfxrLwBdjddup+rntjfNSMSYQlzu1HAdo40yPe7r0=; b=RvDq5ACJPtcSlqQgNrS9a3nOGhIsFdBgxLfrl9P56YbGTStq55a6p52GECOAedqyy6 gMzeOiMhfAAkyD/nxfsATltAVGFWBJgowmuHCg55dvJZsRffi2zdA12KmUko1g3Qp1SX ldXtluqJWmnRhJxX2W8IcIGn1tuSgwXJEYuta/HXu6wbAceQagBGidUQzmkWqMPnjg8t xPRcG6WBUZmwtL+ER3Ktd7IOHQol7NXZ85ztiwPCoWpMmkzu7f+dszG5Os71mmvDQXb4 l4b+H3lTLectvTOx+hp/GkJzxBSwV9fkONw3EcPMvqpw2EeR4znqu+WZcC7qRhGMvT40 sbyg== 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=JkdfxrLwBdjddup+rntjfNSMSYQlzu1HAdo40yPe7r0=; b=NkkbgBnMY/yl3Xt0GE1f1nvjNukHhjx6JFobfcREVv84U9MXasUM63kYZ4tmX7vXdF 3byMzR3CtGGk1UW6/tP9plxA7//nSz94jUZtZm8gvIwJow1Svn1fXpM91ZYbSof8mRFw sjo1BFw3d8JJHDgfNOU7QED0xg/QBpjvBwKaAj4U0vGTzFVf+wYXdn0MyycUSaDX+tvl mP/1NoGYpM6GZ5P1iAy/Hi0ZuFuOfeIKAFFnvhnEof1wZCzMgFXF6pBOlPXFHNNwZK3p DQxIUBw4TvOwV5cLvy5BJL7OY3Oi20unPy9QHPkYDhaYVXbbB5jdB8ulM5PHvmE09DUZ KtJg== X-Gm-Message-State: AOAM531/H8scs6sb1D51uMw0bPGyvqqmtH9IY0XmZzwj8IiFT4gYQrp2 Gxkn0jl1XWQPD5/ThHxnDXk= X-Google-Smtp-Source: ABdhPJzWiop5gOEboJyVl9N3SYa7aUJaakgTHf38lUDH0hociHufJWzfPObOk+9i3qTV7iU2vHQmKg== X-Received: by 2002:adf:e385:: with SMTP id e5mr50763021wrm.129.1600684066825; Mon, 21 Sep 2020 03:27:46 -0700 (PDT) Received: from localhost.localdomain (lputeaux-656-1-11-33.w82-127.abo.wanadoo.fr. [82.127.142.33]) by smtp.gmail.com with ESMTPSA id h2sm20713774wrp.69.2020.09.21.03.27.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Sep 2020 03:27:45 -0700 (PDT) From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= To: Maxime Ripard , Chen-Yu Tsai , Rob Herring , Mark Brown , Liam Girdwood Cc: Jaroslav Kysela , Takashi Iwai , Marcus Cooper , Jernej Skrabec , alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com, =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= Subject: [PATCH v4 09/22] arm64: dts: allwinner: h6: Add HDMI audio node Date: Mon, 21 Sep 2020 12:27:18 +0200 Message-Id: <20200921102731.747736-10-peron.clem@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200921102731.747736-1-peron.clem@gmail.com> References: <20200921102731.747736-1-peron.clem@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Jernej Skrabec 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-h6.dtsi | 33 ++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi index 28c77d6872f6..a8853ee7885a 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi @@ -67,6 +67,25 @@ de: display-engine { status = "disabled"; }; + hdmi_sound: hdmi-sound { + compatible = "simple-audio-card"; + simple-audio-card,format = "i2s"; + simple-audio-card,name = "sun50i-h6-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 = <&i2s1>; + dai-tdm-slot-num = <2>; + dai-tdm-slot-width = <32>; + }; + }; + osc24M: osc24M_clk { #clock-cells = <0>; compatible = "fixed-clock"; @@ -609,6 +628,19 @@ mdio: mdio { }; }; + i2s1: i2s@5091000 { + #sound-dai-cells = <0>; + compatible = "allwinner,sun50i-h6-i2s"; + reg = <0x05091000 0x1000>; + interrupts = ; + clocks = <&ccu CLK_BUS_I2S1>, <&ccu CLK_I2S1>; + clock-names = "apb", "mod"; + dmas = <&dma 4>, <&dma 4>; + resets = <&ccu RST_BUS_I2S1>; + dma-names = "rx", "tx"; + status = "disabled"; + }; + spdif: spdif@5093000 { #sound-dai-cells = <0>; compatible = "allwinner,sun50i-h6-spdif"; @@ -739,6 +771,7 @@ ohci3: usb@5311400 { }; hdmi: hdmi@6000000 { + #sound-dai-cells = <0>; compatible = "allwinner,sun50i-h6-dw-hdmi"; reg = <0x06000000 0x10000>; reg-io-width = <1>; -- 2.25.1