From patchwork Sun Jul 19 02:45:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hewitt X-Patchwork-Id: 11672119 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 053A5913 for ; Sun, 19 Jul 2020 02:46:25 +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 C77E320738 for ; Sun, 19 Jul 2020 02:46:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="erovtgKR"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="LyELbglL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C77E320738 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-amlogic-bounces+patchwork-linux-amlogic=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:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id: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=PE2TMngjc6raj7A3y/sSqcz5YTVUXrKqhDtdsH46/MI=; b=erovtgKR0LQyW8M3ZtBB3k+nD0 Vfpn1oPIJEgp+yGN2GeN/vPqKWd9Tle5IQtyTBtU0Cp4CVBLxHz4DB+KjylHmrsdkio4raQqU43mN CP4y7yWgkkB+7s7fsWfBBZBxdObkyAh5T375mF3mFaljmBFz/ZIY4AGuL5ZGol5WO6awiNf2n7O9i ot2/Sv9j5m3/K8tTlqKQzwwyFnelvud2qHukkT33DMqXuUPBlnbtNnzzOgRV/f3Gk/sMTpZlvP75d sAvXzpp+YOzoCs6Zo0LvUQ7f/ZHxcKn9HcS2OpZyqpCoXjekHzd5vWxLgqBFKF/m5UrKfCN2kbOB1 AlUKjQ0Q==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jwzL5-00039h-Tc; Sun, 19 Jul 2020 02:46:07 +0000 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jwzKu-00037D-4B; Sun, 19 Jul 2020 02:45:58 +0000 Received: by mail-wr1-x442.google.com with SMTP id f18so14694415wrs.0; Sat, 18 Jul 2020 19:45:55 -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; bh=a0raR8kuawAw4Zwd1EY7iQ1XE5SS8HIOS1kFKtesceU=; b=LyELbglLP8QhhXUc6DClCstA2/Gl4Fw2P+jtTbqaZKiEZBK2V/sBjXTjXgqqmDw2S0 7iX9qAjlBro9G3o6MV3gWDPj2WEvXyoPPIlpHH0SKZl9cNvZpxqbtjM8ao9+lt77Cszy 2VbVwsIyhu96SgQaaIyzUCCXoo+VFdlztCNYJOTNgNppApub2UqTRARsJwavqz7ridkx 7T/OdlGwO6RZfRhJ1uQDrN/szSdbsTcANu5pp7JyVadRXgAyv7y4FhMpXWdUot7HgYWh /WMrZNce6YG6XRl++1HsnQrd6IDmvA5W+MyVYEFE+yJ1+1LgGD77aJCgMChSN3mJtzPK CDfg== 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; bh=a0raR8kuawAw4Zwd1EY7iQ1XE5SS8HIOS1kFKtesceU=; b=i+Y8v+ueUrl/7cj5ba40l/axrsdiNuZOi510qDg1QdLsp+ZQ1YrhM0CXfGPFauy51K rNcsbYNgMq+Nvf5n1FG9/cyKZH6K7F2uIGsAubLBu82YhsjvKDqgaeu0eB3oEHFqZNQq Gr+DOlHLMScN8DMVUND7kRfih2M+NYgn7458iS/sKYSrot764hqhjhnjNoQ1N/Dtbm4/ 1NBNNEd2lb37lcXbeibGtMDLsWmvPauo6vMA3KcNboq3/83iVcSj0sLZ3hQ/L4oz8sge qMZ8VMhNVwxG31sJybWLpXdA7Kd43Bj0LsFhpy3fRop6bU8Hzucf74BW+QaSecQRUdP2 ZReA== X-Gm-Message-State: AOAM533M6CxXqUjg6wqKKi5yUT2fBRjPhrkyC/6eo62ty04Up7n/vjvR ekGmxhAEzUiigXzuxdePITU= X-Google-Smtp-Source: ABdhPJyEGk/A6JStVM7UM5LerwPOyjrqVVF/olwEii2vfNdRomVwi2MB5UhM1cUhy6QYIirt0TAaLw== X-Received: by 2002:adf:ab46:: with SMTP id r6mr16648219wrc.260.1595126755054; Sat, 18 Jul 2020 19:45:55 -0700 (PDT) Received: from localhost.localdomain ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id e5sm5176242wrc.37.2020.07.18.19.45.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jul 2020 19:45:54 -0700 (PDT) From: Christian Hewitt To: Rob Herring , Mark Rutland , Kevin Hilman , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/3] arm64: dts: meson: add audio playback to odroid-c4 Date: Sun, 19 Jul 2020 02:45:46 +0000 Message-Id: <20200719024548.8940-2-christianshewitt@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200719024548.8940-1-christianshewitt@gmail.com> References: <20200719024548.8940-1-christianshewitt@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200718_224557_071483_293F5F8A X-CRM114-Status: GOOD ( 12.73 ) 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:442 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [christianshewitt[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -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 X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Christian Hewitt MIME-Version: 1.0 Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org Add initial audio support limited to HDMI i2s. Signed-off-by: Christian Hewitt --- .../boot/dts/amlogic/meson-sm1-odroid-c4.dts | 88 +++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts index 00d90b30f8b4..cf5a98f0e47c 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts @@ -8,6 +8,7 @@ #include "meson-sm1.dtsi" #include #include +#include / { compatible = "hardkernel,odroid-c4", "amlogic,sm1"; @@ -186,6 +187,69 @@ }; }; }; + + sound { + compatible = "amlogic,axg-sound-card"; + model = "SM1-ODROID-C4"; + audio-aux-devs = <&tdmout_b>; + audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1", + "TDMOUT_B IN 1", "FRDDR_B OUT 1", + "TDMOUT_B IN 2", "FRDDR_C OUT 1", + "TDM_B Playback", "TDMOUT_B OUT"; + + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; + status = "okay"; + + dai-link-0 { + sound-dai = <&frddr_a>; + }; + + dai-link-1 { + sound-dai = <&frddr_b>; + }; + + dai-link-2 { + sound-dai = <&frddr_c>; + }; + + /* 8ch hdmi interface */ + dai-link-3 { + sound-dai = <&tdmif_b>; + dai-format = "i2s"; + dai-tdm-slot-tx-mask-0 = <1 1>; + dai-tdm-slot-tx-mask-1 = <1 1>; + dai-tdm-slot-tx-mask-2 = <1 1>; + dai-tdm-slot-tx-mask-3 = <1 1>; + mclk-fs = <256>; + + codec { + sound-dai = <&tohdmitx TOHDMITX_I2S_IN_B>; + }; + }; + + /* hdmi glue */ + dai-link-4 { + sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>; + + codec { + sound-dai = <&hdmi_tx>; + }; + }; + }; +}; + +&arb { + status = "okay"; +}; + +&clkc_audio { + status = "okay"; }; &cpu0 { @@ -237,6 +301,18 @@ amlogic,tx-delay-ns = <2>; }; +&frddr_a { + status = "okay"; +}; + +&frddr_b { + status = "okay"; +}; + +&frddr_c { + status = "okay"; +}; + &gpio { gpio-line-names = /* GPIOZ */ @@ -381,6 +457,18 @@ vqmmc-supply = <&flash_1v8>; }; +&tdmif_b { + status = "okay"; +}; + +&tdmout_b { + status = "okay"; +}; + +&tohdmitx { + status = "okay"; +}; + &uart_AO { status = "okay"; pinctrl-0 = <&uart_ao_a_pins>;