From patchwork Tue Jul 24 12:52:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 142799 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp7233020ljj; Tue, 24 Jul 2018 05:53:11 -0700 (PDT) X-Google-Smtp-Source: AAOMgpe3JLjQD+MgFggqty34hYxxvLUItpa4OScBjdcnws9Fb2QAgP2KDue3RmKCCdXud6CdrbzY X-Received: by 2002:a17:902:1665:: with SMTP id g92-v6mr2528828plg.293.1532436791653; Tue, 24 Jul 2018 05:53:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532436791; cv=none; d=google.com; s=arc-20160816; b=T+rVmyBNXLJ3uqOYUvd7CWlq/cK5ZqbWj8x8R3BQG8v8bZYkxhgkDmPvnN3RvkRP06 F7YHfYK61Hx2F9bHsd/O5rW5i3BIGK2CVOqORQBYcF/DzTghICRCem2e3GUenno+mfwG c3dwqUBjvMxbzN1KCibPIrK+ljJHRZkRLxb0ImnhCKMwsrM4dD1ZR8pgnWqXwNXeOqK0 vwTZrCo0fOGn3IEYQkFwA/aiKoteBrT3scZbKqV5N3lPbhAHskAvycOw5LTw7rTBd0HK qSGEkRAGyOOj0NAq6wGBrE+G8sEORjw2TUx4xqIUo87DBHIPLW8a6pKhyOmIMC0hYZDX dHRA== 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:arc-authentication-results; bh=m+7otojvZOrjB7wl+eYuKeSajHNbshq/E51AgMXa3rk=; b=qEq2pOkuclsevxSd3L825WfIbvZOX351akkzm9z2anfFbuD+DFU9EbBxsRZRUlwCOd dx41PfW+bc2nFfZ2KnBi9fyOVpW1VjuGo2RzwpkdO7vHkq/wczDy5+BuJE2dGGDhAT8V qnNOmJSXpKfVMhqKHnxIFVsWhezD6UoFbfPIjAfL4wD6HwGOHL7SeIwWgORh/JuDmMdc zPSn9A1mujrL7E3JDurVWn2o0aMHf7C4VrOKlH4Iq0PAV58O7k03FW3BVmKCIzDWhSqX DP8y1v2OMsjt+CySrJBtP6pQc8wcyHWFFkGH/BjJGoximtwExsgZ96GjMfv3QeONlcYE e9rg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=fuH8dCAK; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s17-v6si10462264plr.120.2018.07.24.05.53.11; Tue, 24 Jul 2018 05:53:11 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=fuH8dCAK; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388625AbeGXN73 (ORCPT + 5 others); Tue, 24 Jul 2018 09:59:29 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:52116 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388642AbeGXN73 (ORCPT ); Tue, 24 Jul 2018 09:59:29 -0400 Received: by mail-wm0-f67.google.com with SMTP id y2-v6so1806278wma.1 for ; Tue, 24 Jul 2018 05:53:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=njyBULs9PWdQsY4lJgbDOmtKYIvdlYmmdmZvKuVltz0=; b=fuH8dCAK5dL4DEvbRZ5B/31dsANpfszp+xtD4biMJrnlEEZRSJu9nU4xbWWZtqV9NC mDAFkg/bJhouqSWOxlozENSPswvaTA/r/gxfbKs1mdPXpQhhmarI/NkbkxaGHolFXgou YCUM0NiiVPQZLokGV9n6xv69Rzsq1REHNjlogOCb/E1Yn4x6+dAcv43WpjzU69QUHv7M gFYohocDFGz0QPj0jJN3Rpy6PmdCRHgPB642R8GeOYw0XmZVACAGV/Oz6TAxUMG6cx0H jUolWLUC1FYSgfACdfZuH3Af59TKgVBzL+xbBuOqJp17wfcKbtr6b4O/N/6/J6JvgdFI golg== 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=njyBULs9PWdQsY4lJgbDOmtKYIvdlYmmdmZvKuVltz0=; b=MdWKYspLJ8les2AkBRq4ue1krtmnGk0/WRWPA3BlBkmJf4ZFu95DI+V3btNF6uj5Kv peyJZYKGg96bppiUiT7+jrt4IFcdbskisc/mUk9rOtWF7wk4Z42VpUedFXa0ZE8LSSn2 DRFSwYWqb7NqKyE/M/rNVjwf9zvBClLy3vEN2HEgCD31Pe67QwwTsR/P5pYEXeePDSNh M6pq9m79wO/8U1IAbIqDFWIaLmcHWhmbUbhoV015e0evz06BmT0tJlaZYewpolrZc4SF 9wYyiWXhl8821zPXB628BXDlfUSDnfYtXNC71AcFlxtvCc1SYvEYpGoQWBfWrnIXG8ME 9q8w== X-Gm-Message-State: AOUpUlGTrGhaO+BSpZq2J+KrfKElk62FCgR2crpunM31PLANf7rzVrte QgmYkjcwQlcZ/wpU+lbdvMt2mQ== X-Received: by 2002:a1c:1802:: with SMTP id 2-v6mr1824985wmy.81.1532436786436; Tue, 24 Jul 2018 05:53:06 -0700 (PDT) Received: from boomer.lan (cag06-3-82-243-161-21.fbx.proxad.net. [82.243.161.21]) by smtp.googlemail.com with ESMTPSA id e7-v6sm20834235wrm.14.2018.07.24.05.53.05 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Jul 2018 05:53:05 -0700 (PDT) From: Jerome Brunet To: Kevin Hilman , Carlo Caione Cc: Jerome Brunet , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 14/14] arm64: dts: meson-axg: add s400 sound card Date: Tue, 24 Jul 2018 14:52:38 +0200 Message-Id: <20180724125238.14567-15-jbrunet@baylibre.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180724125238.14567-1-jbrunet@baylibre.com> References: <20180724125238.14567-1-jbrunet@baylibre.com> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Add the sound card of the s400. With it the following interface should be working: * Lineout * Daugther card speaker 1 (same output as lineout) * Linein * SPDIF output Signed-off-by: Jerome Brunet --- Compared to what is actually available on the platform, the following is not provided ATM: * SPDIF input: WIP. * PDM DMICs: WIP. * TDM A - BT Codec: missing BT codec. * TDM B - Speaker analog loopback: missing tlv320adc codec. .../arm64/boot/dts/amlogic/meson-axg-s400.dts | 108 ++++++++++++++++++ 1 file changed, 108 insertions(+) -- 2.17.1 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts index 9f5d81c3ee29..1b89c2cc5414 100644 --- a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts +++ b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts @@ -204,6 +204,113 @@ status = "okay"; sound-name-prefix = "DIT"; }; + + sound { + compatible = "amlogic,axg-sound-card"; + amlogic,name = "AXG-S400"; + amlogic,aux-devs = <&tdmin_a>, <&tdmin_b>, <&tdmin_c>, + <&tdmin_lb>, <&tdmout_c>; + amlogic,widgets = "Line", "Lineout", + "Line", "Linein", + "Speaker", "Speaker1 Left", + "Speaker", "Speaker1 Right"; + amlogic,routing = "TDMOUT_C IN 0", "FRDDR_A OUT 2", + "SPDIFOUT IN 0", "FRDDR_A OUT 3", + "TDMOUT_C IN 1", "FRDDR_B OUT 2", + "SPDIFOUT IN 1", "FRDDR_B OUT 3", + "TDMOUT_C IN 2", "FRDDR_C OUT 2", + "SPDIFOUT IN 2", "FRDDR_C OUT 3", + "TDM_C Playback", "TDMOUT_C OUT", + "TDMIN_A IN 2", "TDM_C Capture", + "TDMIN_A IN 5", "TDM_C Loopback", + "TDMIN_B IN 2", "TDM_C Capture", + "TDMIN_B IN 5", "TDM_C Loopback", + "TDMIN_C IN 2", "TDM_C Capture", + "TDMIN_C IN 5", "TDM_C Loopback", + "TDMIN_LB IN 2", "TDM_C Loopback", + "TDMIN_LB IN 5", "TDM_C Capture", + "TODDR_A IN 0", "TDMIN_A OUT", + "TODDR_B IN 0", "TDMIN_A OUT", + "TODDR_C IN 0", "TDMIN_A OUT", + "TODDR_A IN 1", "TDMIN_B OUT", + "TODDR_B IN 1", "TDMIN_B OUT", + "TODDR_C IN 1", "TDMIN_B OUT", + "TODDR_A IN 2", "TDMIN_C OUT", + "TODDR_B IN 2", "TDMIN_C OUT", + "TODDR_C IN 2", "TDMIN_C OUT", + "TODDR_A IN 6", "TDMIN_LB OUT", + "TODDR_B IN 6", "TDMIN_LB OUT", + "TODDR_C IN 6", "TDMIN_LB OUT", + "Lineout", "Lineout AOUTL", + "Lineout", "Lineout AOUTR", + "Speaker1 Left", "SPK1 OUT_A", + "Speaker1 Left", "SPK1 OUT_B", + "Speaker1 Right", "SPK1 OUT_C", + "Speaker1 Right", "SPK1 OUT_D", + "Linein AINL", "Linein", + "Linein AINR", "Linein"; + assigned-clocks = <&clkc CLKID_HIFI_PLL>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <589824000>, + <270950400>, + <393216000>; + status = "okay"; + + amlogic,dai-link@0 { + sound-dai = <&frddr_a>; + }; + + amlogic,dai-link@1 { + sound-dai = <&frddr_b>; + }; + + amlogic,dai-link@2 { + sound-dai = <&frddr_c>; + }; + + amlogic,dai-link@3 { + sound-dai = <&toddr_a>; + }; + + amlogic,dai-link@4 { + sound-dai = <&toddr_b>; + }; + + amlogic,dai-link@5 { + sound-dai = <&toddr_c>; + }; + + amlogic,dai-link@6 { + sound-dai = <&tdmif_c>; + dai-format = "i2s"; + dai-tdm-slot-tx-mask-2 = <1 1>; + dai-tdm-slot-rx-mask-1 = <1 1>; + mclk-fs = <256>; + + codec@0 { + sound-dai = <&lineout>; + }; + + codec@1 { + sound-dai = <&speaker_amp1>; + }; + + codec@2 { + sound-dai = <&linein>; + }; + + }; + + amlogic,dai-link@7 { + sound-dai = <&spdifout>; + + codec { + sound-dai = <&spdif_dit>; + }; + }; + }; }; ðmac { @@ -272,6 +379,7 @@ PVDD_B-supply = <&main_12v>; PVDD_C-supply = <&main_12v>; PVDD_D-supply = <&main_12v>; + sound-name-prefix = "SPK1"; }; };