Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp252537pxu; Wed, 2 Dec 2020 22:03:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJyy5X2L6nAXbLqqy03SmCunE1LZsKErXxvwoxgsG46u3IHJzNsgtAkf9KFnYWELHRED/sfv X-Received: by 2002:a17:906:3883:: with SMTP id q3mr1135022ejd.160.1606975400773; Wed, 02 Dec 2020 22:03:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606975400; cv=none; d=google.com; s=arc-20160816; b=N5F+9N3mTok2YSm7xyPoADtJIVzBCdFRqk6g6flMTFioIoXxIKKme4w9kAnX20nqej qoQm8hLFCtfyyFEbIXV6Sia4qgUQW2GGaHBUI6RRNheyXERhPVFlPQYlix3ajCpG2zMT yIMwCz1vEjwQjqSikNZ5/mDlBZ/5RGhejRb0YCr7Sor7WbyQ2SQNXj6wkr3ihF+RMc3A vRgJ3lQiGqO7+GYEaBDUo0lvRoKLfAPMgOumpiYzgFWK+OLYb2SJqK/q7ZN5Q3fdkniN iqM7LuvuJYnpTyCmUZQz17YgsiruCwWhckUa/w8OswQLEFaAjx/8msnFMEN2Snrp8ENF mvfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-signature; bh=Y6xywWA0Bg+0Yb66SGd8bpy5ReZjATNnwobMf9jnUk0=; b=05gIcx7g6hjkDDfnDHECklMROrs/D1zdYWGQg522JzPt8WOqr7ZAqRdyxIvkBL4JT2 VDkE84yKBLmyjnLji07gUHCmsrFXw0D860zTkeL2uVL7ZWhLftLOlT0c3m9Zp5ERXBcI GCMqTPhCwOOFw95+q2UJLmTD6v0qG9LJbYUS5MszUvlqfGsj6hP+qlz8VK80W4YD/2CQ 8g5ofE/81Azji8Gy5ChQP4RZopnFBMSy90FkKAzaIQxlbJAChQz1Ca1yCH8fPVHRx606 a3iT/mCe+GLZq8FdqJEK+GcckxLZYlpnzw/ULXYybxSBPI5OsbvuEjBKlPX/hnrl0FvH Klcw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=txM2XXYv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h4si371428edv.124.2020.12.02.22.02.57; Wed, 02 Dec 2020 22:03:20 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=txM2XXYv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729236AbgLCGBS (ORCPT + 99 others); Thu, 3 Dec 2020 01:01:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45918 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729010AbgLCGBS (ORCPT ); Thu, 3 Dec 2020 01:01:18 -0500 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E20C1C061A52; Wed, 2 Dec 2020 22:00:37 -0800 (PST) Received: by mail-wr1-x434.google.com with SMTP id r3so630308wrt.2; Wed, 02 Dec 2020 22:00:37 -0800 (PST) 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=Y6xywWA0Bg+0Yb66SGd8bpy5ReZjATNnwobMf9jnUk0=; b=txM2XXYv+owk/t9tGZPgZb5z+KXtTKNy9WLyz4ek8IXqPi719LgMaQE42ITTlwr199 Mq+uTy3TOa0Y6nQnzhCNcXLAgNxVdTwZfqx84XO/d8kMTxAoOcF6g4OROqWUbB9jp0mC I1x+WNlMcYFed6KGp+Xavln2XueFo5WK5HXPK+QZj7/8aNbWXfSGDj1em/QOSqdBPYba 0xzM+htnHeA+6Q64eLyYWtg+ZRMOsjr2oyWQY65JTIcMsFxXJP7iOKVAOMkZFSUOBDbk vmg5mnSrclfvSiNQ/eT12Pwz1/LsXnAg2SmtTHFJ0dCefUEzNm0MFTQV/jM/xnY+ned4 suGw== 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=Y6xywWA0Bg+0Yb66SGd8bpy5ReZjATNnwobMf9jnUk0=; b=QSCNdq5DASmWL0Ln8NnF5pJvPtYsaI4odSW90R1/JOWVCGXgiAHh0g9xg16rbmHSXa 5zVNJJLoLXMProGQIhz9ZC278M4jXzmRc3conIubQxPQyDm0uQJHCFPBD9P3KVjpBxyy /Q5ZBHGsaNzI4exT8gJoatHrNO3gK1vmdF35gLbnxYlTrY2OYu0fRABeuSn1AJlcab3X 473J9/2CrMv/Vzffq7BDi6pGKWrX8vTD/SI7IR37jEKiEfqrNcptup6IN86kwQOn1bc4 fSimB/G/loNixWjYuGqAyC1huMTY5bIHxiD54p0dpJN9c4riRcqKfbhem+3zMis6Ei+2 XCug== X-Gm-Message-State: AOAM533/3lOiYtumQWjDzn/aME6ytMlgWA0+xW+w39QCVnNO+dSvZQwg mV5j93u0qR3jLp+yIeT3bws= X-Received: by 2002:a5d:4046:: with SMTP id w6mr1736698wrp.51.1606975236662; Wed, 02 Dec 2020 22:00:36 -0800 (PST) Received: from localhost.localdomain ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id i11sm218439wro.85.2020.12.02.22.00.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Dec 2020 22:00:36 -0800 (PST) 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 Cc: Christian Hewitt Subject: [PATCH v4 4/7] arm64: dts: meson: add audio playback to nanopi-k2 Date: Thu, 3 Dec 2020 06:00:20 +0000 Message-Id: <20201203060023.9454-5-christianshewitt@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201203060023.9454-1-christianshewitt@gmail.com> References: <20201203060023.9454-1-christianshewitt@gmail.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add initial audio support limited to HDMI i2s. Signed-off-by: Christian Hewitt Acked-by: Jerome Brunet --- .../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts index 7be3e354093b..8e5df00b06a2 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts @@ -7,6 +7,7 @@ #include "meson-gxbb.dtsi" #include +#include / { compatible = "friendlyarm,nanopi-k2", "amlogic,meson-gxbb"; @@ -130,6 +131,45 @@ }; }; }; + + sound { + compatible = "amlogic,gx-sound-card"; + model = "GXBB-NANOPI-K2"; + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; + status = "okay"; + + dai-link-0 { + sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; + }; + + dai-link-1 { + sound-dai = <&aiu AIU_CPU CPU_I2S_ENCODER>; + dai-format = "i2s"; + mclk-fs = <256>; + + codec-0 { + sound-dai = <&aiu AIU_HDMI CTRL_I2S>; + }; + }; + + dai-link-2 { + sound-dai = <&aiu AIU_HDMI CTRL_OUT>; + + codec-0 { + sound-dai = <&hdmi_tx>; + }; + }; + }; +}; + +&aiu { + status = "okay"; }; &cec_AO { -- 2.17.1