From patchwork Mon Nov 16 06:20:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hewitt X-Patchwork-Id: 324786 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F089DC63699 for ; Mon, 16 Nov 2020 06:20:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A3794222B9 for ; Mon, 16 Nov 2020 06:20:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="W+mB1NlC" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726851AbgKPGUj (ORCPT ); Mon, 16 Nov 2020 01:20:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53642 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725379AbgKPGUi (ORCPT ); Mon, 16 Nov 2020 01:20:38 -0500 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 916E3C0613CF; Sun, 15 Nov 2020 22:20:38 -0800 (PST) Received: by mail-wr1-x42f.google.com with SMTP id o15so17371658wru.6; Sun, 15 Nov 2020 22:20:38 -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=UrTzQqJfmOE3wc4LgtWfzvjavE1CxqA487snNOvdDF4=; b=W+mB1NlC2H1+vj/gVQqlYXnEWkHgsAO24vZIi9pz20IpYaV3YDCnVnm52SEtMu74ga 0prdFzLY4GzBCBdbhMTseqWN4nD1oc+NI9ivyc1E/v70v6AALE0oduJpAwXpyLQ65x/H ANSimfsx1NIZZhGDXF679gmF39FrgbbjFaCh/CjL0rNkmTAf6ydFE+9+0/QI43rpv/Xd 9yLu07nVfpJYPcaB1T9nqTj5Wd+gSAB0R3HFIbY2q34nEO9CSZ+DO/3tYy24Q6rxn5aO VsAZV3pbjAREiN6UXD192tyiOXQS9pVU4lsEEcJNc+fT1FrNYtlZKpH6VCAELG492UJV R/bw== 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=UrTzQqJfmOE3wc4LgtWfzvjavE1CxqA487snNOvdDF4=; b=l0UeuB+bjF1uoTvQoqxLIXTxrvsj5NHEX0nwmkdmj0yE1pwYnoaeIhlAguc4v4kfPX 9hVcicSreKgrzjVYQ/jAE0R+je6gF2FRhK3Q1N6m4ioqhCkWdS9IHGRIKCizgjJ0EXrl hFMjpXX5NqVNvBjjsZA5lsHJRlm6Vx+NXb/+gHK5mzRKtIyBMWK1HUDZi1ovUDsGeyG0 YRWlLskrVZtVt5iRv0lL/81Sc8cGITMf+eZkBnlh+USeFLcg87qJVbJQEJRpTy01Ols8 FY+xakr0WsDkle+U2esPXP0/sF1Auj6BxRsPr1GDfoEWB4wM1NrPVfZDWF22pShdXUuJ greQ== X-Gm-Message-State: AOAM532OpWYoBBJjmQ6SrO0A7w1XUnCXmSRVNoi7EX2g5hzzbA4JHi2X CL4O2Aq3p4U4IaTRNnIaY03gMaeBSyQ= X-Google-Smtp-Source: ABdhPJw1jWE/jLVlMkHw4VsyWrjjt8pDzvDYLQhanqj63agvp4cq96/BakhhffvQIMqt0u063QVVUA== X-Received: by 2002:adf:eacb:: with SMTP id o11mr17467481wrn.208.1605507637390; Sun, 15 Nov 2020 22:20:37 -0800 (PST) Received: from localhost.localdomain ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id m3sm17065985wrv.6.2020.11.15.22.20.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Nov 2020 22:20: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 v3 1/7] arm64: dts: meson: add audio playback to a95x Date: Mon, 16 Nov 2020 06:20:25 +0000 Message-Id: <20201116062031.11233-2-christianshewitt@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201116062031.11233-1-christianshewitt@gmail.com> References: <20201116062031.11233-1-christianshewitt@gmail.com> Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Add initial audio support limited to HDMI i2s. Signed-off-by: Christian Hewitt --- .../dts/amlogic/meson-gxbb-nexbox-a95x.dts | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts index 67d901ed2fa3..b5b11cb9f393 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts @@ -10,6 +10,7 @@ #include "meson-gxbb.dtsi" #include #include +#include / { compatible = "nexbox,a95x", "amlogic,meson-gxbb"; @@ -139,6 +140,45 @@ }; }; }; + + sound { + compatible = "amlogic,gx-sound-card"; + model = "GXBB-NEXBOX-A95X"; + 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"; }; &cvbs_vdac_port { From patchwork Mon Nov 16 06:20:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hewitt X-Patchwork-Id: 324785 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C40BBC6379D for ; Mon, 16 Nov 2020 06:21:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6ED562222E for ; Mon, 16 Nov 2020 06:21:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="dyS4m4VP" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726979AbgKPGUr (ORCPT ); Mon, 16 Nov 2020 01:20:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53656 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725379AbgKPGUo (ORCPT ); Mon, 16 Nov 2020 01:20:44 -0500 Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EBBDBC0613D1; Sun, 15 Nov 2020 22:20:42 -0800 (PST) Received: by mail-wr1-x441.google.com with SMTP id k2so17419187wrx.2; Sun, 15 Nov 2020 22:20:42 -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=d988cBXnFVQ/GWsV54ibiM2GROtIFfDIzMG48hK8mIw=; b=dyS4m4VPWFRukkjQ39dZz3y6F+S5CWL50MrRNVrAaPWuqOlbfdTc3MYw+ztts8F80W CwgUaFxC2F2ysgDeR+ZGn2cQZWSmARarf5CX5+wsdTvD/IyINLxYUncSIfMKZfWnPfz5 jlHpAPgAth+zavg39MQt2dVx7vvdWY1S/NLel760g7ZkGeuSbUGk55KLDE8QfIkyBy6g 5rTIek1jS1H4ALjv8OjWKcSfgA5SQdH40HgYdX3M22jqX5yVkBigFm3IQqGGlIyVuGzn wo4jTFfxdoqOID97txcb7sV6Vzp9kgkPt2Edb/r6eDANu34MJJHQag0JxfyJ6o+PYIQK mAZA== 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=d988cBXnFVQ/GWsV54ibiM2GROtIFfDIzMG48hK8mIw=; b=Vir7kPUrGaC5XU5FCSm1yMaYyzOO1vabaGuUK0FLuCTX6Vq5ricYOtwKM/DSF4RrIx vSDDp7QXL0jkB1/MLNCUClst7uOykvQ+27faNXbRKy+3scQSYi9e5wZtd+jgx3RolfYg rbUATRPSkReCG61mNI2RGosSxLPDmbXZO2bRj6TCnDv3P7bdGs1n+B/OBwphNqtI7r0Y wBOV9CjvL6HF9B+vHhVioUXFoDxOJZTtwDgPIoZcgntW28xRk8NpxvUJD0djlhMQ/AFy ab/FiaF5ekej3z5Y5H37LBQu6d8/+1i3iCwgPGSE3zrxn0zMf19PQedVh4sXf2RQzhE0 PLxA== X-Gm-Message-State: AOAM533GHYEInb3/CZ1UHsNPvQ+VGNwDpvzvRXF5p1zh/BH+gSw0AsHe U5d19wad2tK3zb10BfQ9c53cXslOS7c= X-Google-Smtp-Source: ABdhPJwRn41L6QLmNecPltMeJiSirI8tr63H8VRB4YLtWAHaygJz0KkkIcHVv3yZNHxsv2Ful0aR9Q== X-Received: by 2002:a5d:514f:: with SMTP id u15mr16666218wrt.385.1605507641663; Sun, 15 Nov 2020 22:20:41 -0800 (PST) Received: from localhost.localdomain ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id m3sm17065985wrv.6.2020.11.15.22.20.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Nov 2020 22:20:41 -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 v3 3/7] arm64: dts: meson: add audio playback to khadas-vim2 Date: Mon, 16 Nov 2020 06:20:27 +0000 Message-Id: <20201116062031.11233-4-christianshewitt@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201116062031.11233-1-christianshewitt@gmail.com> References: <20201116062031.11233-1-christianshewitt@gmail.com> Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Add initial audio support limited to HDMI i2s. Signed-off-by: Christian Hewitt --- .../dts/amlogic/meson-gxm-khadas-vim2.dts | 44 +++++++++++++++++-- 1 file changed, 41 insertions(+), 3 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts index bff8ec2c1c70..d4734220443c 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts @@ -7,9 +7,9 @@ /dts-v1/; -#include - #include "meson-gxm.dtsi" +#include +#include / { compatible = "khadas,vim2", "amlogic,s912", "amlogic,meson-gxm"; @@ -145,6 +145,45 @@ clock-frequency = <32768>; pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */ }; + + sound { + compatible = "amlogic,gx-sound-card"; + model = "GXM-KHADAS-VIM2"; + 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 { @@ -154,7 +193,6 @@ hdmi-phandle = <&hdmi_tx>; }; - &cpu_cooling_maps { map0 { cooling-device = <&gpio_fan THERMAL_NO_LIMIT 1>; From patchwork Mon Nov 16 06:20:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hewitt X-Patchwork-Id: 327046 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5E250C64E7C for ; Mon, 16 Nov 2020 06:21:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1D03D2222E for ; Mon, 16 Nov 2020 06:21:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="oVwJCEoU" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726993AbgKPGUs (ORCPT ); Mon, 16 Nov 2020 01:20:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53664 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726964AbgKPGUp (ORCPT ); Mon, 16 Nov 2020 01:20:45 -0500 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 01BB2C0613CF; Sun, 15 Nov 2020 22:20:45 -0800 (PST) Received: by mail-wr1-x42c.google.com with SMTP id r17so17408985wrw.1; Sun, 15 Nov 2020 22:20:44 -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=0aTKJ5HZFsSQ+eCcPAw4QelVRGYoHt0VsuUcLv/a/yw=; b=oVwJCEoUO0cPE+bysHQys/P8gwJ4OSvwnJA4An072DSCY4iXPFcNH5wtV9UTVXxE6l DzKKbcQJrtAZrekquPHe3ihM4nKjwo2rGZ+sRj8zdhS7wJG66dfd8n26n3q0cEkgeMxr 1cOJO64BQb2ClGanobW+xcd9G31OkyGekoMhJTt9aQWPIQQFTr4/loTS2OLKJo18nrjw jev2rgn+vK0yVGjEJOvcYHt4gMf41pnjydlpVz+yG8nKFYgeuDs/3FCTQ/TMwt1A7lOT 4/xmPVhyydXRAAMEPOLvsLbEZIf71WZtEecDMbbyymOk0/kKesGkg5t1YhosoXy6M3UI de6w== 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=fplFYory79ya+ye2ur45+bS4UBmXquJHtZMdJkY/dWG7RcYgDnsPmtXcD77A0vwUHl /hkrJX7ruAEepkY3qAoF7M3rz+mXXfII529hPFLnBgFFrpBG/SRhpyTIVfC45PqxVKk9 LtKcYhg4Ew2xS73PYAQs8+Vf+Lj8NS0O5LoC/ROJo8eE8dJbXAI0EejzryxBUww0i/k2 aHmCk4vH+CYCLQV75lcE4+dMbbApt5pPBrYNoZVqvwUdrtY5XMqbF6PN4cgZ6i03891b 61czTNIWdrnsfOH2naoWKbKYjb0/njvGXZuiBEgfWGNqZPbCIknER1fzi3oo9OP5UYMX QhHg== X-Gm-Message-State: AOAM5311qs6v2fslBqfZBJFgxs25t+chVdyug0+MJry6/D7a37RzNba0 apas8/iMrJK8lYonC9vJLvA= X-Google-Smtp-Source: ABdhPJw3LqdgZebMeTfGoydpX1BZ+cu0qP7A/4FSFPeRA62GMGxV73zIG8beWWh+IHU5qZo4UVAf4g== X-Received: by 2002:a5d:550f:: with SMTP id b15mr16793905wrv.145.1605507643792; Sun, 15 Nov 2020 22:20:43 -0800 (PST) Received: from localhost.localdomain ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id m3sm17065985wrv.6.2020.11.15.22.20.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Nov 2020 22:20:43 -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 v3 4/7] arm64: dts: meson: add audio playback to nanopi-k2 Date: Mon, 16 Nov 2020 06:20:28 +0000 Message-Id: <20201116062031.11233-5-christianshewitt@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201116062031.11233-1-christianshewitt@gmail.com> References: <20201116062031.11233-1-christianshewitt@gmail.com> Precedence: bulk List-ID: X-Mailing-List: devicetree@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 { From patchwork Mon Nov 16 06:20:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hewitt X-Patchwork-Id: 324783 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 83105C64E7D for ; Mon, 16 Nov 2020 06:21:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4AAFB222B9 for ; Mon, 16 Nov 2020 06:21:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HxZLwRsL" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726203AbgKPGU4 (ORCPT ); Mon, 16 Nov 2020 01:20:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53674 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726970AbgKPGUr (ORCPT ); Mon, 16 Nov 2020 01:20:47 -0500 Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 219B4C0613D2; Sun, 15 Nov 2020 22:20:47 -0800 (PST) Received: by mail-wr1-x442.google.com with SMTP id p8so17383305wrx.5; Sun, 15 Nov 2020 22:20:47 -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=6vYF1uN6y1MEmfx/aSCmf3xT19pRJOVeWursMQGhdC8=; b=HxZLwRsL9L3clU/gWk0Q9ZInhSslRrsA3tfRAZPyQtD9eDKYPLlgBIS2bTqeZmqYqb uT5GZrmkK9M6Itn+7tOyMtiqZKSfXYHC/XbiW3c9doJhHlrf4LD/6+7Dr3QUTpXoicNF CLbo7/Mp9lNnC841ZwXezHm0M11uK0hrfFynPB/1ONz3kK2dtyP7SLUJ6HrQBbceh2cA zIUydObcGuEFBYCAfH1AOOv9z1FAtSN/NYKs8wdU9UkP+OvTrfosFH+8Q8xbKr3AGf/W qRc+862chJCB9r/dghsQ6H61/jdNXFHdKBVgLmxRfrcYdgA/CZj9Od06wJuzHLGt2BJu M9sw== 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=6vYF1uN6y1MEmfx/aSCmf3xT19pRJOVeWursMQGhdC8=; b=ElGMVv7oATHSnr3Xz7GLpiA/Z4As9BlW8N5dwNl0Yrig6iCFw3w9NsB+udeQJrNcdK Clzrfc6qGyoqCJTFX5GlDGldPeBje+E2UINaz5a6qMOBJwaA+yoVXvSirLAHJlAjrRjS pHKwBlXs9NOkjnMApPkwpSrY3KPtd9XrAlOXTInREoL0vfsMryvSeJslnxfaFiqCjxq/ T1laUIXaJAiJAuJn3dTUcYeCM/gBRZjg49fLc1SEkoK7aFbqip3DhBQPV/AMgIPOobRh UOYGzCLAdoveK5/Hn2HE7Tl9oggeNHj6kpc1TX8yW/oti8z/gn0BgGBQEBrLEGsUoIVY NigA== X-Gm-Message-State: AOAM532S4FnOUcCgCHD4V1dUui6gSRfkqynyTjTPPjmN1UC5tysLHMv4 wqOrFVV5a4m2YuzuPTrYnkA= X-Google-Smtp-Source: ABdhPJxWY5DjtO0AcBcOkDH5D624IlsLS+3TwQg7ls2RUOyHEZm1AaMxIVyQh8Y4+yULr/0oNbXAwA== X-Received: by 2002:a5d:4c52:: with SMTP id n18mr17452650wrt.68.1605507645868; Sun, 15 Nov 2020 22:20:45 -0800 (PST) Received: from localhost.localdomain ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id m3sm17065985wrv.6.2020.11.15.22.20.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Nov 2020 22:20:45 -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 v3 5/7] arm64: dts: meson: add audio playback to odroid-c2 Date: Mon, 16 Nov 2020 06:20:29 +0000 Message-Id: <20201116062031.11233-6-christianshewitt@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201116062031.11233-1-christianshewitt@gmail.com> References: <20201116062031.11233-1-christianshewitt@gmail.com> Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Add initial audio support limited to HDMI i2s. Signed-off-by: Christian Hewitt --- .../boot/dts/amlogic/meson-gxbb-odroidc2.dts | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts index 70fcfb7b0683..9d8c919c6e19 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts @@ -9,6 +9,7 @@ #include "meson-gxbb.dtsi" #include +#include / { compatible = "hardkernel,odroid-c2", "amlogic,meson-gxbb"; @@ -172,6 +173,45 @@ }; }; }; + + sound { + compatible = "amlogic,gx-sound-card"; + model = "GXBB-ODROID-C2"; + 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 { From patchwork Mon Nov 16 06:20:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hewitt X-Patchwork-Id: 324784 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 027F5C55ABD for ; Mon, 16 Nov 2020 06:21:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 92A6C2222E for ; Mon, 16 Nov 2020 06:21:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Mj00KA0a" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726964AbgKPGUw (ORCPT ); Mon, 16 Nov 2020 01:20:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53688 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727053AbgKPGUv (ORCPT ); Mon, 16 Nov 2020 01:20:51 -0500 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 519B1C0613CF; Sun, 15 Nov 2020 22:20:51 -0800 (PST) Received: by mail-wr1-x443.google.com with SMTP id d12so17340551wrr.13; Sun, 15 Nov 2020 22:20:51 -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=1gIivsKhrs5B4E2eM/SXdSVH3UTq3Ox3b3pPitMs8zM=; b=Mj00KA0a7s4QpdkqkPSUoIVCe5VfTiL38H3A13Q1CwiP6l6gZBjrN3DfiIYzehSVeR f1mtaedQdInmz3m+Ia+ZCoWGtDYtbk7ilngUhVrgqE92Xo9a+eX2HYlfaYSc6lwesVvK zeY21EZy2lhcd9txYzzgKj5KI2sdIi6279Evj4GTs+iQfiCXGPaCxn5RNDjbXhoWaMXg HRO8OoYoJuUiX9S7DCZ1Bs7cEc5l8sMTNb0kNSLJnPnI0EUU+uEYb3Yf8zsRkMbmgw22 mYIb47ZhxzetB5ykPRGbaRsH+c58y4VeE9LAmvxOv8VLeOKXwKdtaf84STQRVJVqKOTM w+nw== 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=1gIivsKhrs5B4E2eM/SXdSVH3UTq3Ox3b3pPitMs8zM=; b=C8FnvG9KnyP/VpS+8Sfls2awxbsXM7k+VzYk7/CnKh6+nEzGSLmTJYB+yJjSZWkR4U uWMJiiwb1luh79vijrekpgHh4QTHaQueWcB2HuRCb1OoeepXqmnx8mGW8XTFIAFeKCRc YTeS5bLD8wmIuPHKezWBq9Qx4bBW/RnjXRuc5m0aEDAFINzrAgLuvUuLuKxu2vH81yMU fA3UqdGIl3nnZrUqEcbJlvY9lEAPWlPHgvymurNmAcgALSYY3IrFNa4IYLc8bdKWoqxI +jTGPb/mew2vQMKobFWqavahuhzn7K9Buj3OxCU05GDQ1ZGZs0PDN7069bOVzG58XOgR YrgQ== X-Gm-Message-State: AOAM533iUcIjTdlX9W9xEhrInhq3ity7uLTHfbM9Mfbi1nFrJO3KQCm8 /hwipEs4U5zIfYKPB2hbMHI= X-Google-Smtp-Source: ABdhPJzX9nR3wvtsqiKz74R6KI/jvBf0xlZXoVn401YSQ4zdG0j+kueNoBq2SybGSrh59EePeSCWtw== X-Received: by 2002:adf:8028:: with SMTP id 37mr17153751wrk.111.1605507650109; Sun, 15 Nov 2020 22:20:50 -0800 (PST) Received: from localhost.localdomain ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id m3sm17065985wrv.6.2020.11.15.22.20.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Nov 2020 22:20:49 -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 v3 7/7] arm64: dts: meson: add audio playback to wetek-play2 Date: Mon, 16 Nov 2020 06:20:31 +0000 Message-Id: <20201116062031.11233-8-christianshewitt@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201116062031.11233-1-christianshewitt@gmail.com> References: <20201116062031.11233-1-christianshewitt@gmail.com> Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Add initial support limited to HDMI i2s and SPDIF (LPCM). Signed-off-by: Christian Hewitt --- .../dts/amlogic/meson-gxbb-wetek-play2.dts | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts index 2ab8a3d10079..f2562c7de67c 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts @@ -8,11 +8,19 @@ #include "meson-gxbb-wetek.dtsi" #include +#include / { compatible = "wetek,play2", "amlogic,meson-gxbb"; model = "WeTek Play 2"; + spdif_dit: audio-codec-0 { + #sound-dai-cells = <0>; + compatible = "linux,spdif-dit"; + status = "okay"; + sound-name-prefix = "DIT"; + }; + leds { led-wifi { label = "wetek-play:wifi-status"; @@ -39,6 +47,59 @@ gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_LOW>; }; }; + + sound { + compatible = "amlogic,gx-sound-card"; + model = "GXBB-WETEK-PLAY2"; + 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_y_pins>; + pinctrl-names = "default"; }; &i2c_A {