Received: by 2002:a25:e74b:0:0:0:0:0 with SMTP id e72csp178695ybh; Fri, 17 Jul 2020 23:58:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy1Rga61m7a07dc1ccf/74olk8QwCy1By+cqyOixnQ8edn4Z69MUBZpXd9Votoa151m4KI3 X-Received: by 2002:a17:906:cd19:: with SMTP id oz25mr11784067ejb.36.1595055516408; Fri, 17 Jul 2020 23:58:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595055516; cv=none; d=google.com; s=arc-20160816; b=kJauUWI8dj2PADeYFrDiG82liCNBIw1qLyy0BpcAJTnmnXvsDotnPnZFCwlGwlC96U DFp484UjqAC0Q5Y90QScHu4nP3jsE6EcStBlro49oEEwAgaN+ZWjUjGYCJdEj5xE4++a LIcqwIKwXZV6IolRO6ZIirb5NAjiWZ6KCVx43tMuRx0VcKtxkPoi7zmfWbDSOGwEZXAB qyDonWrAzqwz0aanmUHA5Lvyb+HwrhL+SuRSIMUl+adW0HYi+ec3frHTrJkdh1igjntF pQ1YDqC01A/1VQdUVEcSl5mjPTMa2Bp6Rj4FnZMUzBc3yrZJ1n0DPYloZeehwqxf0BxB Hhyg== 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=1krktBPS100MfXZ+pc+c++ZJjlsjSR2xUu8yCpuZMDY=; b=N+SrN2nVnD6r1hqaMnaZ05LcU9WyEzmT9VZxunQ6HaDZFcxJpRvZ1uQ5V+MyBz7OdW JhSB4tujU5doTYwVlfXZkvKacIpKI8K2BXo34pMdZY4vqybmnbpASgFzRD2avRbG8Ngy WIkcezzcUmcBNu6U8MFOnk7Ah/lzD5rShybPjChijF7CjnK2yzwvCmRj4Du5k2SyviJz WbUTJ9PMcmXripWlGdfa6gtonOzBXeA4/ockyFsU9kn9NLcWIq5ivwePXHM3mhRdEes0 rdo7MOLVHDXcy9r4fh5JxAquH2kk/YKYE6BE1mBSizjK4l+Vc3eFVugwILSb26viIMIc +sXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=MxnpCgiu; 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 c11si7149759edv.140.2020.07.17.23.58.13; Fri, 17 Jul 2020 23:58:36 -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=MxnpCgiu; 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 S1729031AbgGRG54 (ORCPT + 99 others); Sat, 18 Jul 2020 02:57:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54816 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729010AbgGRG5y (ORCPT ); Sat, 18 Jul 2020 02:57:54 -0400 Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 61102C0619D2; Fri, 17 Jul 2020 23:57:54 -0700 (PDT) Received: by mail-wm1-x343.google.com with SMTP id q15so17758976wmj.2; Fri, 17 Jul 2020 23:57:54 -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=1krktBPS100MfXZ+pc+c++ZJjlsjSR2xUu8yCpuZMDY=; b=MxnpCgiutKDScYhaBSLciizrJAJTJFBr/z8JYY0P+RZ9GzgwghrgNFNaK07MDeEVIO go4TQe+V7RxkyR8z14sUvYAvDojXvhpsKSm9bCl01e305F4dSK2ORKh4vT781h5YU9cj fbQgwezKw96kyZ2O+6mrFEh/UgB1rW1NM8ioBXzfbtxQrE59TCdrcR2A5YN/QOWx/6hL fDDWUPFnWETz9S1Anlrno57q/ch+Bef82ry89P26ZxR8ZWiZvz7jTdy+xyPA8eWqSQQd mneR/5ai/AVUPC3PDw2PZEg95Fuo6fOeCmrhq6+lXSbXGTI9J/qAN96LnBS+nXKmJQCo XKMQ== 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=1krktBPS100MfXZ+pc+c++ZJjlsjSR2xUu8yCpuZMDY=; b=MB12HM0lmqgtWkiO2anh0NKzpZA4+lkU13VXY0K8K6VtDNW0p9QSUHXMYEIrrrEjft Mj6gd2Ux8MZ+BpWvzp2oJNYPGc2UfQVHWPH7l2B3Q5xxbkWx5w+7s7JxkrHJ5+u+D8Cq wboib8ZaDIRGDnnI10+Qw/LGm1X2wXlABRNDlVJaVlTjTmRZUZC7nJfD0nKJRBilYvgi 2sDfbOSMQyeHOdbFaWviaN/furfuIszOiq3/gDO1xwdVMwpinlJ1xFsWNMrM8bi6uir+ ahCK4g17PTBHbdAuvxfOXrxiscbpET3FvWIkuzglTN88Fh+OzxxIP9QWBw/1rKAz2xIC jk9g== X-Gm-Message-State: AOAM531Gq9kMZwjQnkTYCGIPNX99Y0PX5Z99B74csC1r69xJ8nJVlwm2 Urj7YMNnzpbK6IVPxVd0FpKhs1Fn X-Received: by 2002:a1c:e90d:: with SMTP id q13mr12857564wmc.187.1595055473119; Fri, 17 Jul 2020 23:57:53 -0700 (PDT) Received: from localhost.localdomain ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id x5sm18749191wmg.2.2020.07.17.23.57.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jul 2020 23:57:52 -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 04/12] arm64: dts: meson: add audio playback to nexbox-a1 Date: Sat, 18 Jul 2020 06:57:31 +0000 Message-Id: <20200718065739.7802-5-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 support is limited to HDMI i2s and SPDIF (LPCM). Signed-off-by: Christian Hewitt --- .../boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 80 +++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts index 83eca3af44ce..faca6fafc164 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts @@ -10,6 +10,7 @@ /dts-v1/; #include "meson-gxm.dtsi" +#include / { compatible = "nexbox,a1", "amlogic,s912", "amlogic,meson-gxm"; @@ -24,11 +25,37 @@ stdout-path = "serial0:115200n8"; }; + spdif_dit: audio-codec-0 { + #sound-dai-cells = <0>; + compatible = "linux,spdif-dit"; + status = "okay"; + sound-name-prefix = "DIT"; + }; + memory@0 { device_type = "memory"; reg = <0x0 0x0 0x0 0x80000000>; }; + vddio_ao18: regulator-vddio_ao18 { + compatible = "regulator-fixed"; + regulator-name = "VDDIO_AO18"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + hdmi_5v: regulator-hdmi-5v { + compatible = "regulator-fixed"; + + regulator-name = "HDMI_5V"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + + gpio = <&gpio GPIOH_3 GPIO_ACTIVE_HIGH>; + enable-active-high; + regulator-always-on; + }; + vddio_boot: regulator-vddio-boot { compatible = "regulator-fixed"; regulator-name = "VDDIO_BOOT"; @@ -75,6 +102,59 @@ }; }; }; + + sound { + compatible = "amlogic,gx-sound-card"; + model = "GXM-NEXBOX-A1"; + 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_SPDIF_FIFO>; + }; + + dai-link-2 { + 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-3 { + sound-dai = <&aiu AIU_CPU CPU_SPDIF_ENCODER>; + + codec-0 { + sound-dai = <&spdif_dit>; + }; + }; + + dai-link-4 { + sound-dai = <&aiu AIU_HDMI CTRL_OUT>; + + codec-0 { + sound-dai = <&hdmi_tx>; + }; + }; + }; +}; + +&aiu { + status = "okay"; + pinctrl-0 = <&spdif_out_h_pins>; + pinctrl-names = "default"; }; &cec_AO { -- 2.17.1