Received: by 2002:a25:e74b:0:0:0:0:0 with SMTP id e72csp179377ybh; Sat, 18 Jul 2020 00:00:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyuw5GPIYGY0cUb1043XYb+X7nQUQh4FmlnTn/ctaN42pYA6TCOVCxbFux57Y553PXp3ZTq X-Received: by 2002:a17:906:1b0a:: with SMTP id o10mr11978678ejg.463.1595055621088; Sat, 18 Jul 2020 00:00:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595055621; cv=none; d=google.com; s=arc-20160816; b=v44OYW6sP/yOeMPpoXQOCTcypXxyu/8lKnncz6sBkqghnNlI4jLe6alEFtAJz48JFp Tc/G6ZAh7isp0gHp1xUcEeVw2KXnvXfCiV63ZzezbrKAOOLlRKqSDIkx7Oo+jyHiX8el P4bNeFWPCj5LKbgTZerzS+m/T3S6l3tV/g2UAqyQdS3JwEM/x1Y2TTX4tp3hnvRhn8NJ XGeIOAKFEdxMvZQtK+mSJutMy0+sIIokuI/RGNNmnCxtAmgWDGLVqgl4SRV0rA8+Vws6 LR+23nyCDJ1qQXP9x7imEqfdpKWHuQFDYkZceFVw1KAoMLI6QtHWEhaxWXFLwZ/PxwGo kQhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=0aTKJ5HZFsSQ+eCcPAw4QelVRGYoHt0VsuUcLv/a/yw=; b=AtEVEk0/cYnugOaEm8DdS3aT0gLlfa0WJDnRUsbgoBc+JwJvjPnZMM+Mm0fjsUcRVG 5JyNxXkfqE4U+dGytRdvLnjuFlEXChZw5xy2uLiD/f2CgnJd2FCnYOMbW+ewa29YzgWs +mu396b6fpNDo9fPv7wAFeD5RgIWUIMWgspJtkZtiBSvd+3RjzP6hkTbup3vii22eiDq 9xekybgW5uvuWril/HGxnJH/DKZPK5n6BShMIF+kqw+RmJ64aPr0x+1lZM3x5m06Fj8q ZdIRJ6I9tozFjc4W/BdggBOxNoZT2NbSnzQc/RFOZzkww2pAKTMrOu1vBTUud3g/6IGJ PmMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b="caYg/F1C"; 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 ox25si6735936ejb.408.2020.07.17.23.59.58; Sat, 18 Jul 2020 00:00:21 -0700 (PDT) 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="caYg/F1C"; 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 S1729006AbgGRG5y (ORCPT + 99 others); Sat, 18 Jul 2020 02:57:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54810 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728957AbgGRG5w (ORCPT ); Sat, 18 Jul 2020 02:57:52 -0400 Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 45B63C0619D2; Fri, 17 Jul 2020 23:57:52 -0700 (PDT) Received: by mail-wm1-x342.google.com with SMTP id f18so20467373wml.3; Fri, 17 Jul 2020 23:57:52 -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=0aTKJ5HZFsSQ+eCcPAw4QelVRGYoHt0VsuUcLv/a/yw=; b=caYg/F1CiwwGkHeQR/B4qjCLeL6H2OxPLCrC64xVRKZ5qK692K0AEr6GJgBw6r16zd 9n1fNjzLqULafFSRpHgpPBmvwQ1xWACjR7Ml10/v6S+2XTAJ7bok15B/jllJYgmL2PLi NiAl0QriTi6R5ak+hJaTtj45aMicNAJP8WQaWNaLNm4T00Q0ZXuFfvNcu6/eRGQYD37i XsMR7dQ5SHUKS2GfXlK8lE0p3Xrynm4nxpt2cYvKs2118gAWngDJVdOhmDk8vaEX4hxz /0pO8GfJiXUed2NNCcdpaWUBXjkhuqTAdn27VpUygM8J6az8Wx3QpyTtcx9oJ/Vx3aZz rPNQ== 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=0aTKJ5HZFsSQ+eCcPAw4QelVRGYoHt0VsuUcLv/a/yw=; b=oeDGaaQn/gwOK1qnqQx2rh3AYHi/lqulHqPronNJR4B8dtFKzLt0MjOLiu0DrlEHLr UTpg443TbimnGprZJOgNnogTUFN1niw3DlaAmfLYohyEJdS7w21stIuKso3w++lFI5y0 Jy+8QZ8qhsQEyT6tmveXTj7sfQepBaIU8a3qw6MjT7E6lHJlpfG6TQKV16x50OpvQ90G DWulqAfEVUSjcL8WPXTUH4AH/ouWzWK4URgQE+LZETJ3Y1hFJXLaQXVqzlUwhMiXpvcN gdUUdt8DQcc1y7Hu9aX71crgPSKmCFsd4ORPiAOcpIm0LCCn+kZ5A9ZQF/fBnq0erPBx pQBg== X-Gm-Message-State: AOAM533ekVULKIay4rgWgw/7DaufKR7GKJhH1ZUO7ftTgcKbpWm4qv6t cumgeSpaA2s3YPD0d8mvBVg= X-Received: by 2002:a7b:c956:: with SMTP id i22mr13218592wml.95.1595055471013; Fri, 17 Jul 2020 23:57:51 -0700 (PDT) Received: from localhost.localdomain ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id x5sm18749191wmg.2.2020.07.17.23.57.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jul 2020 23:57:50 -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 Cc: Christian Hewitt Subject: [PATCH 03/12] arm64: dts: meson: add audio playback to nanopi-k2 Date: Sat, 18 Jul 2020 06:57:30 +0000 Message-Id: <20200718065739.7802-4-christianshewitt@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200718065739.7802-1-christianshewitt@gmail.com> References: <20200718065739.7802-1-christianshewitt@gmail.com> Sender: linux-kernel-owner@vger.kernel.org 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 --- .../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