From patchwork Mon Sep 11 15:45:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 13379453 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 78A4AEE7FF4 for ; Mon, 11 Sep 2023 15:46:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=zxLbCMd54ODtgHgKFeafCuD5oOXBcth02WmmkeJ3GrM=; b=HsaDpuG2muGvHJ Dy51tMVNO9Mkt2p8+MMEir4AsVng76sDNMZd7kkI9X8rR/4/2AzqHi2VmAYRde6FaXxijNurqhG7e l3cp7OCqhXTgWOeegmmNzB594mJvT7bF73NK7btFvXSkvC/S/zyCcAcDTLsTCwBKQS7onMTSeNRdT OjifPNFWL4YAFjfLCmevCi4WfaVayOOwWtX23klpfihnjvtLv6iagzaVPnLRAeKiF/yGbKf+GEnYs d1xUBddiR3GQ//S3kuaiLmllsWgqp+t5lCGd6Bu81+cQvrgiQyy8TGN1fw1jPjIi0W5LJpR3AnZhs Vdm+15ipolw5EGeVzYIg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qfj6t-000vfo-35; Mon, 11 Sep 2023 15:45:59 +0000 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qfj6p-000vd8-0n for linux-amlogic@lists.infradead.org; Mon, 11 Sep 2023 15:45:57 +0000 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-403004a96eeso25256455e9.3 for ; Mon, 11 Sep 2023 08:45:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1694447153; x=1695051953; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wtIhAxbGVK+7yj4SNMHYOQFab9XtJv/AFRYvoUE3Ztg=; b=3c9RB3QLWNPYF9S6pYHTIOM/+ePnMeVUUq8B1cqXd5LBgJu5Rc39HN/SKfk/nwawEW IR6wkxptHnRY/vf4GWRfqIhKQRomKrP8+94qSIKziqbGUgr6DG+8ryb2jgXJMlKWgTT4 H9Gikig67G9QOcbGvaL1b9EyTIf6QO7R476XbMGyUZaUeBKvV/jDbnkFW6fXTqGwXxIi 5kTr/1pQNl5ptq31ZGFWs3KuHKz/TV8RMJ54TytCnVA6NdHQuLFroJTVRoeFWhXmUZqu NwI4ZYXIXGZQvvdYKA9xYDt/31ZwiUH0lfcROgvJXFfICtp1ihkRwSoijwG/sUSzLseI tozw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694447153; x=1695051953; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wtIhAxbGVK+7yj4SNMHYOQFab9XtJv/AFRYvoUE3Ztg=; b=SjEBiKtqDbTR1uA0NoKupneLPK6AdHmZoi0tbilRXDLt/e/FZsl6ekp8FONAhoGPqC mV47Fk57+iuE2mTpSsxjWiZuoEQMwO+6dZNM9ArQ/d7WbZf+fK5LKTQ6QxkWZQb5sPqI mJP6CCZPT6YWC3afacRVzPJEWJ6Mkt1kaytlL42wVlpmMIBy5YrA3j80vbbRG6Z4Nmor 7uj+59wqrg8D8TgYnBG4wfteSLYGCadiaVs36WKquU5a/tfax73mk9ko2ISFKNg4IJci jcIYyIZLvJit49ncokjk9pSkwq3Sc9CGmu/t2PUyoPhBSDSI7RxTxwKlu04rBv16IZVq rFJQ== X-Gm-Message-State: AOJu0YyuF6T+5pEwgoJOpAQ9wYgyDm/M6YW0lCjBsEH6+eFP+man9q2d oaZEhSEyZBYvDiRT6kTCqZpHHg== X-Google-Smtp-Source: AGHT+IFlHuDGD4y/pkzGSIaXA5xLAwU8gajS0add0DHyT1XivNj62MdgH/kpwUyCyIHaYB4pZmxRlw== X-Received: by 2002:a05:600c:b4e:b0:3f8:fac0:ad40 with SMTP id k14-20020a05600c0b4e00b003f8fac0ad40mr9105096wmr.29.1694447153244; Mon, 11 Sep 2023 08:45:53 -0700 (PDT) Received: from toaster.lan ([2a01:e0a:3c5:5fb1:55be:8f7e:5f59:7ed1]) by smtp.googlemail.com with ESMTPSA id q12-20020a05600c040c00b003fe539b83f2sm13616255wmb.42.2023.09.11.08.45.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Sep 2023 08:45:52 -0700 (PDT) From: Jerome Brunet To: Neil Armstrong , Kevin Hilman , Krzysztof Kozlowski , Rob Herring , Conor Dooley Subject: [PATCH 1/5] arm64: dts: meson: u200: fix spdif output pin Date: Mon, 11 Sep 2023 17:45:37 +0200 Message-Id: <20230911154541.471484-2-jbrunet@baylibre.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230911154541.471484-1-jbrunet@baylibre.com> References: <20230911154541.471484-1-jbrunet@baylibre.com> MIME-Version: 1.0 X-Patchwork-Bot: notify X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230911_084555_476629_66B84207 X-CRM114-Status: GOOD ( 11.28 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, Jerome Brunet Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.org u200 outputs spdif on GPIOAO_10, not GPIOH_4 which is used for the LCD panel. Fixes: cfae4eadb7cd ("arm64: dts: meson: add audio playback to u200") Signed-off-by: Jerome Brunet --- arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts index 2878e3ad7de2..8fa17a62534c 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts @@ -396,7 +396,7 @@ &sd_emmc_c { }; &spdifout { - pinctrl-0 = <&spdif_out_h_pins>; + pinctrl-0 = <&spdif_ao_out_pins>; pinctrl-names = "default"; status = "okay"; }; From patchwork Mon Sep 11 15:45:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 13379457 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F18D3EEB580 for ; Mon, 11 Sep 2023 15:46:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=iH9DWrMqWtTH7IPo4sZdvaASv5oIw5lBcLU7eGkwtmM=; b=LduQ8+vj8sr9Pz ckawI85zLPq7lhldequn9Kjr/mIxC67fUHk8d2NDr6l0EXYVojGi5M0hwYRbG+hB6hCZtONmjGOgZ vbFeocGOkmDdpRDcH2z2x+uQKs06F9OUmJ/5eXkcJq5a11RjYArKYMFTb6jQJM1z61muuW1x0BGHi SkLzRngsE/87m5K4Bztb/UMKy3imCy7QzBvnZ9jhcacAShSbxUxCuCbGhyAz0LrfqflA6wHUyenQU yw18I/gMWHS8IYm6i/IMbQhYL6YZy07OvedqAnZqy4qmRSuRm3PeBq/saNcT5YAkoBhKM2zJlos20 mV1Cz6km/1btsAFWnZ/Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qfj6u-000vgC-2O; Mon, 11 Sep 2023 15:46:00 +0000 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qfj6r-000vdD-2x for linux-amlogic@lists.infradead.org; Mon, 11 Sep 2023 15:45:59 +0000 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-4018af103bcso29190995e9.1 for ; Mon, 11 Sep 2023 08:45:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1694447154; x=1695051954; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3bdQljBM9G3jopTFDsO9g16l4ONvm8vQqmOSRCzAnEo=; b=KO0/w19YI+GtO/LmTbOofF09L+xka5p4LNlH8WjhPFnMz/WVzLJWbrtJKlkt7oTyaO aKwhimrdAaS+/BspdJ8kkRPpCOWjw83UaO4RJN1n/wtmOq4B6qyzPH8PQtFGzZFC2RZv 6rtynmoGtaH5epy6rR/J/cR7r3ayauDfDFRs4FdMCPkrakFRQRH5gqENEjcOqwn8TJsR usyoXBGJbmIx+IzyoASXvaxZtzLeBVQDc50nIDjpO3FLusE+P1uyAIe6NtwOAQW/BQeQ P29ODMWv92I/Insv2Wc0ybun9mJeAV/CdAYOgmwJ9Yz2T/8UoJQQnTh5eQTJljP86ZI/ Q0iA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694447154; x=1695051954; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3bdQljBM9G3jopTFDsO9g16l4ONvm8vQqmOSRCzAnEo=; b=YiMtWf5yH9mg0mCVnvdQhU4pgLxoHKMfxrlWcw8h68gw5oqKs4/59x63rw2sRLKR5O Y12sRLCjkW7247yvrBGM7Vaq6JzyuWPazVs9K6JXaw8tSCaFJoG7ISApfZBP22nX2xtT f3ofOV6lgqBWXDWbk7sgjDGLia8zMd2t0eO02vzEQPjBuCo9j0QU1cBND2cSRt/2WCi+ aufNagSk9bCdckCQ3HCOJHKTbSEhJvp7iqOSjRYeuoIJe5oBtxKlpLIdDN5FA0qJENk8 E8S1+QLMcC2zcCJnz1faluVxqGQpQt3SjfJQSdt99YY571lmNoEiY1v6JKMX5Kjnm1ZW gHhw== X-Gm-Message-State: AOJu0YwO7oD9/q72X3pZzf7QQyVvyxaYOzUoIOstF4H+5hhuI1qxmPiq n3X4DGVk78wG+gRqT2w6980UEw== X-Google-Smtp-Source: AGHT+IHSlCpiA67RcBqWVu/yNJspToPqKhBDsN+U4vD1E3RtnOz9o0ZpI5rtn7YZWGnKnmMXksiGeg== X-Received: by 2002:a05:600c:49a3:b0:3fb:f0b2:20eb with SMTP id h35-20020a05600c49a300b003fbf0b220ebmr22361wmp.1.1694447154131; Mon, 11 Sep 2023 08:45:54 -0700 (PDT) Received: from toaster.lan ([2a01:e0a:3c5:5fb1:55be:8f7e:5f59:7ed1]) by smtp.googlemail.com with ESMTPSA id q12-20020a05600c040c00b003fe539b83f2sm13616255wmb.42.2023.09.11.08.45.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Sep 2023 08:45:53 -0700 (PDT) From: Jerome Brunet To: Neil Armstrong , Kevin Hilman , Krzysztof Kozlowski , Rob Herring , Conor Dooley Subject: [PATCH 2/5] arm64: dts: meson: u200: add missing audio clock controller Date: Mon, 11 Sep 2023 17:45:38 +0200 Message-Id: <20230911154541.471484-3-jbrunet@baylibre.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230911154541.471484-1-jbrunet@baylibre.com> References: <20230911154541.471484-1-jbrunet@baylibre.com> MIME-Version: 1.0 X-Patchwork-Bot: notify X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230911_084557_982760_B4D224E1 X-CRM114-Status: UNSURE ( 9.46 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, Jerome Brunet Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.org The audio subsystem will not work if the audio clock controller is not enabled. Fixes: cfae4eadb7cd ("arm64: dts: meson: add audio playback to u200") Signed-off-by: Jerome Brunet --- arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts index 8fa17a62534c..2380d237d220 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts @@ -286,6 +286,10 @@ &cpu3 { clock-latency = <50000>; }; +&clkc_audio { + status = "okay"; +}; + &cvbs_vdac_port { cvbs_vdac_out: endpoint { remote-endpoint = <&cvbs_connector_in>; From patchwork Mon Sep 11 15:45:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 13379452 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6178DEE57DF for ; Mon, 11 Sep 2023 15:46:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=vGuBTyQAbnLVRzE3fArx7bN1c56ehltpIUoxYKr8l44=; b=ukoGNGkPd7J7MV 2w0MlcRZz+eQvAixHNtOl/cBXoSQKTii0hpRracl/UX7lsuFvw/zLNYxO55tip0Jf+hhcxa5Y/O1f adAJxkYF9OtjepY2hBHWNhDVOAHkezpRyEzxsJeRJydczLOC2fbszllrmc/pXIdMT2kXOzwj8hCnE gMoGEcG89rPfEgk1X1/ieTfauTn2PysZDhA/zWTdENUIwqa+xCOSjRwKd2MtzIXLrjPsgiVvXOQsd GGk5qyYiRbFbFPLjeLqUX6QL3NUY5Wgt1JYQE2faE7OBUOtoynninjYIUyRuein8UZ0+kyeEX8J52 T+1nEH74OFw6q7Bi9wbw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qfj6u-000vg1-1A; Mon, 11 Sep 2023 15:46:00 +0000 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qfj6q-000vdQ-23 for linux-amlogic@lists.infradead.org; Mon, 11 Sep 2023 15:45:59 +0000 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-401b0d97850so51255025e9.2 for ; Mon, 11 Sep 2023 08:45:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1694447155; x=1695051955; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=epwO+SStz9NM69htgYjFNbJ+1k8dChdarhPRbsLmIPo=; b=N0Cnq7Wep2NqGrM2iA79suRSj06du8BfWhZGqWZv2eUk8UXNk4jrubd1Zbun1qExDC iAnWNpHWpP7BS4MeFeTcdYApY/iVRvmvop+EGkKZv3DpI4oNi6WoZwjIt/loxeoaq41a 3gnrx4aoNW1PsqpE7OxCuYp/stqc4AyYUK2TkpDtnwagT3qfcHs4O6135HP/GW8vuDzl lhgptSIpJyeRVjhO1BhwdGFUJUqKOEEXYDf5OeGQj22lX/l77A9zUdSBm29CrmlVpbVP rt7RITQyI6mFtHqTwrlS6ao6K7is8qrso/Uze/bYpxDhrhB6BuPmnhjeiiWg+7pE1quc nHpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694447155; x=1695051955; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=epwO+SStz9NM69htgYjFNbJ+1k8dChdarhPRbsLmIPo=; b=NA8nA81Yv8CE7AvNJVnAUR9xeB/lG9F2OLVR8mzRk/bSUuD6xN55tGLJ6aUzlN7458 4myL38trJiO6UQHvD1cUmqcTV+8Coifza7wKMd+/9pssbnyX/9J1c2TShhoPevs/xJa6 041RFsng/TpP2vQ4nHKVZHnpOMVVRuewCWfJUI2cxhW83sS0GXYBnKfC4a+wyZdPOJII j+CK2f1AcFhzheiCtm7xeCr0kjnuda0JG6pSbZ5u5GmTiY+ymVihw8w/oXL32OZ2fetV 3IMkCkt71D5MyOgEL4VPjk9VkGJbSIRppOaYSDLSBMpKqU1lfPuxz5EiC9QAwzqqJSHG +QwA== X-Gm-Message-State: AOJu0YyApNjG2yoipHfTZWTvU9Jra9ZWz0Zdgf4eY9yOxOTQxAzpBf95 IynWu1Uhr0tStPSA/JzhQmx+TVDmTpnrHQ3z8q0= X-Google-Smtp-Source: AGHT+IH/l9YhTMJ8R87Jn4M26LwWErmp/fMinm+HkJON+GjKiZqfQ57rUyoelo8qX83HND/gSYm4Tw== X-Received: by 2002:a05:600c:228f:b0:401:c338:ab94 with SMTP id 15-20020a05600c228f00b00401c338ab94mr9099563wmf.29.1694447155036; Mon, 11 Sep 2023 08:45:55 -0700 (PDT) Received: from toaster.lan ([2a01:e0a:3c5:5fb1:55be:8f7e:5f59:7ed1]) by smtp.googlemail.com with ESMTPSA id q12-20020a05600c040c00b003fe539b83f2sm13616255wmb.42.2023.09.11.08.45.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Sep 2023 08:45:54 -0700 (PDT) From: Jerome Brunet To: Neil Armstrong , Kevin Hilman , Krzysztof Kozlowski , Rob Herring , Conor Dooley Subject: [PATCH 3/5] arm64: dts: meson: u200: add spdifout b routes Date: Mon, 11 Sep 2023 17:45:39 +0200 Message-Id: <20230911154541.471484-4-jbrunet@baylibre.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230911154541.471484-1-jbrunet@baylibre.com> References: <20230911154541.471484-1-jbrunet@baylibre.com> MIME-Version: 1.0 X-Patchwork-Bot: notify X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230911_084556_672262_E1F90BD5 X-CRM114-Status: GOOD ( 11.06 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, Jerome Brunet Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.org spdifout B remains untested as it can only feed the HDMI controller, which does not support spdif ATM. Still if the u200 has spdifout b, the routes to it should be set. Fixes: cfae4eadb7cd ("arm64: dts: meson: add audio playback to u200") Signed-off-by: Jerome Brunet --- arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts index 2380d237d220..921b62c5ab33 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts @@ -166,7 +166,10 @@ sound { "TDM_B Playback", "TDMOUT_B OUT", "SPDIFOUT IN 0", "FRDDR_A OUT 3", "SPDIFOUT IN 1", "FRDDR_B OUT 3", - "SPDIFOUT IN 2", "FRDDR_C OUT 3"; + "SPDIFOUT IN 2", "FRDDR_C OUT 3", + "SPDIFOUT_B IN 0", "FRDDR_A OUT 4", + "SPDIFOUT_B IN 1", "FRDDR_B OUT 4", + "SPDIFOUT_B IN 2", "FRDDR_C OUT 4"; assigned-clocks = <&clkc CLKID_MPLL2>, <&clkc CLKID_MPLL0>, From patchwork Mon Sep 11 15:45:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 13379455 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7ED98EE57DF for ; Mon, 11 Sep 2023 15:46:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=2HT6Iu/YtO178t/dEAOSgyc0ZCiBsRqGYMptt50yNdc=; b=QUuC1AHTpKJZeh 8IApWhDdQSM7ejieVC4YzRCgVIqLv5lQoNM0gAin9Kc3XZcmNDLHonpJr01dANQ1eb9rqqF/3iU9E Zmp4txn7c1/IoS/rFDB74Gu8wUe2uyCH7MfJNI2omyQwC4eTKg9J6C33ZrkQ8DgFN7vyJ7HzphWVG xRnRxy4NRa4+WuHNxe+dmP91nLD2g+/SExMd64n5hRm+T2pFofiiHFFB6kPHQki7JMu+oLMcnc8yh eYNVX56nJtv6A5QvqzBtQTnQS1Y1kLZbrjbCqGWFNHaNgEHae7qWbaLXVGgyKuUKMpqdBi9xvgiJV N59aJwpEmOAQjcSjsIDg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qfj6v-000vgL-0M; Mon, 11 Sep 2023 15:46:01 +0000 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qfj6r-000vdg-0m for linux-amlogic@lists.infradead.org; Mon, 11 Sep 2023 15:45:59 +0000 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-3ff7d73a6feso48897795e9.1 for ; Mon, 11 Sep 2023 08:45:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1694447156; x=1695051956; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=w8GmnivYIya/kXsBEnAOi5/Fi2lHPHk3tyJN33w5ic4=; b=YW7tnrKGCOV4rVTS5gvdfouDq4zrgPjFplyddXoUu+W5z4UZKdSwCliQ+exa9x57JG 0Lxtf4jH8BLGc4RmH9XBEy6QYJG8pQULJkpcUGI11suTpTfC6xDemvm6G0E3N2HlslDw a8Pb7REAquZrGkwp2IUETO2oQJyW24HM2n53K8XoqlBqAUgbCTnc6U7Op3oWU3dQgoFr UdKeagY/CLscpkubeC7uMAbnYDgKUNVkEdtgcQho4w9FM3kjJYw8HNAc1X9LhZZpaCFM Uhmb0l16MERz621lk904r4ExtqFJZPsJam5Ag4JN3VeU5jYUzbbtoNgqcN1gDEOkcRQk 3mkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694447156; x=1695051956; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=w8GmnivYIya/kXsBEnAOi5/Fi2lHPHk3tyJN33w5ic4=; b=hsV9P+iVteBkY5u21YWmwflXXulg94ocRk0pgXpmZtcwHPrvuG6phudlicn7F0ZEOt +MVs/Lw4Dn/sjUY93FeOVNILmjrrDx8xLc/Elx4e+2LJtq9KU7snaoyu+0VxIjw2CvpR Wts/oFHA4IodPnyQ9XW0TkXVHaiC403VPQUIGP17mM1UHRomsEh4A867dlPL7xxJh+YI D2VgVbOWynJrSN/AnTQngMc8m35Sv+lOcPsz19Hh/3m2f3nObWYctJRkPAP710LN9xmN fVA3HZwiXiS1Q8P2KOamAnQrhbJrVvKQUy0UWJXC4bJAknQM0K9Ittqk082wKw2LuZVL Ys+A== X-Gm-Message-State: AOJu0Yxk5jVDcCWbbwwfu/EFz61iga3cEDS/gvOa788ZDHAb2+6iNzaa Z0xQpqSAqP3pmE2h5cYf8XXmvA== X-Google-Smtp-Source: AGHT+IEOdC6N4yffuUJH7WsfrdAEJ+HeWUa6KJ6KGJQUIHAReIzAkUYcbtQ2ckSxfrRuPEHZZd+3aQ== X-Received: by 2002:a05:600c:2294:b0:401:b204:3b98 with SMTP id 20-20020a05600c229400b00401b2043b98mr8950146wmf.19.1694447155928; Mon, 11 Sep 2023 08:45:55 -0700 (PDT) Received: from toaster.lan ([2a01:e0a:3c5:5fb1:55be:8f7e:5f59:7ed1]) by smtp.googlemail.com with ESMTPSA id q12-20020a05600c040c00b003fe539b83f2sm13616255wmb.42.2023.09.11.08.45.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Sep 2023 08:45:55 -0700 (PDT) From: Jerome Brunet To: Neil Armstrong , Kevin Hilman , Krzysztof Kozlowski , Rob Herring , Conor Dooley Subject: [PATCH 4/5] arm64: dts: meson: u200: use TDM C for HDMI Date: Mon, 11 Sep 2023 17:45:40 +0200 Message-Id: <20230911154541.471484-5-jbrunet@baylibre.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230911154541.471484-1-jbrunet@baylibre.com> References: <20230911154541.471484-1-jbrunet@baylibre.com> MIME-Version: 1.0 X-Patchwork-Bot: notify X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230911_084557_274714_D306A324 X-CRM114-Status: GOOD ( 12.28 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, Jerome Brunet Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.org On the u200, TDM B is wired to the onboard AD82584F i2c speaker codec. This makes TDM B a poor choice for the interface dedicated to HDMI which uses 4 i2s lanes. TDM A is not a good choice either as it is connected to the SDIO wifi/bt chip. TDM C is not used externally by default, which makes it a better choice for the HDMI interface. Signed-off-by: Jerome Brunet --- arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts index 921b62c5ab33..da66e2e1dffb 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts @@ -159,10 +159,10 @@ vddcpu: regulator-vddcpu { sound { compatible = "amlogic,axg-sound-card"; model = "U200"; - audio-aux-devs = <&tdmout_b>; - audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1", - "TDMOUT_B IN 1", "FRDDR_B OUT 1", - "TDMOUT_B IN 2", "FRDDR_C OUT 1", + audio-aux-devs = <&tdmout_c>; + audio-routing = "TDMOUT_C IN 0", "FRDDR_A OUT 2", + "TDMOUT_C IN 1", "FRDDR_B OUT 2", + "TDMOUT_C IN 2", "FRDDR_C OUT 2", "TDM_B Playback", "TDMOUT_B OUT", "SPDIFOUT IN 0", "FRDDR_A OUT 3", "SPDIFOUT IN 1", "FRDDR_B OUT 3", @@ -193,7 +193,7 @@ dai-link-2 { /* 8ch hdmi interface */ dai-link-3 { - sound-dai = <&tdmif_b>; + sound-dai = <&tdmif_c>; dai-format = "i2s"; dai-tdm-slot-tx-mask-0 = <1 1>; dai-tdm-slot-tx-mask-1 = <1 1>; @@ -202,7 +202,7 @@ dai-link-3 { mclk-fs = <256>; codec { - sound-dai = <&tohdmitx TOHDMITX_I2S_IN_B>; + sound-dai = <&tohdmitx TOHDMITX_I2S_IN_C>; }; }; @@ -412,11 +412,11 @@ &spdifout_b { status = "okay"; }; -&tdmif_b { +&tdmif_c { status = "okay"; }; -&tdmout_b { +&tdmout_c { status = "okay"; }; From patchwork Mon Sep 11 15:45:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 13379456 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 47D63EE801F for ; Mon, 11 Sep 2023 15:46:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=rO6fVt5/lMf+TCC+cOeqCAvrmofHnwQ1vIu4hMchYIo=; b=5BgaLSukjihAUI aoaPuR1uoTEmtyFqzHjEUXAMj41j+eoF9taXXO4G0wexQIFPvxrH//jKTMf1OCuXzxf6vSaHtMGTl vnPawj8SThXdOuBhimJ6O6BVH2BALAJXucabvkx6Od+ZjSRb68FVQ1yZVrX8uVjbuqQgrNTRKSEzx 7mxKM0yQTrIoRgaMK643xK22Ci3wWBsbU9y2gc9Lv49XvfSp3b1HaSIuj4UKY94qiFo+fLhvaVovQ /6hYClwX4ZimNqHoYKirHl7rZgRpqnRjA8gzNqJS296sMoRbwKVANwXRQUkyykimWZcCH8w7YKHKJ ba4u+Uk/uQA/2gEXIIyw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qfj6x-000vhu-1o; Mon, 11 Sep 2023 15:46:03 +0000 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qfj6s-000veE-0Q for linux-amlogic@lists.infradead.org; Mon, 11 Sep 2023 15:45:59 +0000 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-403004a96eeso25257175e9.3 for ; Mon, 11 Sep 2023 08:45:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1694447157; x=1695051957; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=cSIzaGY4JTGWQViW6JO82zhUaR3rfht5CJdLlOs6lcQ=; b=lrfyWCy/eT0UYUkQFE5X+iuDF19kIB8AKe19MkaX3jDMuKMBnuPGEjLIc5qy5FX9VG ScLS5XTAaV6j7pmKmlLRK6Tw+poaIjWG4RD6HxcnGq8qu5S1LMKpb9DtiS+2zmgubsHm qQZ6JmAXNyccR9VM9V6GTL2S8itnVS8e3uPavHZYHUGyTC9siKZzmN49nJahlKfpJJa8 yImZnTa6RBAw0nT5/I7W3wJUH6kG5Gu2PnMVgSDYs31p1v3PzfET1Zla4AkA74nUKJp0 ZdlyUPQ3aoWHDnHwr9DPjddpJ3CmTmP4tG+jH1EHT+4FKGsR73fEmdXnr45ZNM3yvp+/ odyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694447157; x=1695051957; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cSIzaGY4JTGWQViW6JO82zhUaR3rfht5CJdLlOs6lcQ=; b=mZOPup87F5RxNVR5O/i1NtbcAEQZ6Ckwut0Dgy3FKejIwnDUUAficZ5Y6LWQrW4GM1 /sjK5pv+Rtua67EAyx2TjV3trfOLm4Kp4r6lfq16FD1IHQKSZaYUByEVlcBtqD51gFVs awQt4pDB/7cM62ZgdOnKzHUln1jklTjm82rEWvgKdsQ8IvGaibc9E4rNahruNiJuMMWf Nu041sE1JPe+asIgE8fnTAungIZQNxkOyKRl4CTVxb295ZYI09ORMdorSegZgdMqdVbr kkue2/PDV9LeRVJSlaR08MCn4vSy8p2uslSn3AFbMiZCPr/HPMWwUy6epC1YC1PBxkzH g6dw== X-Gm-Message-State: AOJu0YxPHPCp5F0jPG/glkRjOrUyLmyyIWMGXwFnZ7/NOAT9V87E8qBO Ob1kDyUqZq1cgyKaQclY7QPqKA== X-Google-Smtp-Source: AGHT+IGhLPBA7FSbST65jTdBOh+qXxiGny/m9t3mksHt37rJQNayJyIdmGOMbsoTZtN+Egf8qMpPjA== X-Received: by 2002:a05:600c:204c:b0:401:23fc:1f92 with SMTP id p12-20020a05600c204c00b0040123fc1f92mr8964501wmg.25.1694447156746; Mon, 11 Sep 2023 08:45:56 -0700 (PDT) Received: from toaster.lan ([2a01:e0a:3c5:5fb1:55be:8f7e:5f59:7ed1]) by smtp.googlemail.com with ESMTPSA id q12-20020a05600c040c00b003fe539b83f2sm13616255wmb.42.2023.09.11.08.45.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Sep 2023 08:45:56 -0700 (PDT) From: Jerome Brunet To: Neil Armstrong , Kevin Hilman , Krzysztof Kozlowski , Rob Herring , Conor Dooley Subject: [PATCH 5/5] arm64: dts: meson: u200: add onboard devices Date: Mon, 11 Sep 2023 17:45:41 +0200 Message-Id: <20230911154541.471484-6-jbrunet@baylibre.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230911154541.471484-1-jbrunet@baylibre.com> References: <20230911154541.471484-1-jbrunet@baylibre.com> MIME-Version: 1.0 X-Patchwork-Bot: notify X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230911_084558_187456_DAE9CFAA X-CRM114-Status: GOOD ( 12.98 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, Jerome Brunet Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.org Add missing audio devices found on the u200 PCB. This includes * Lineout connected to the internal DAC * SPDIF input connected to a coaxial socket * TDM input decoders allowing output loopback * TDM A and B output encoders and interfaces TDM A and B link format is set by the related external codec. Internal audio DAC can hook to any TDM output. This change does not include support necessary the optional the speaker and PDM Mic headers Signed-off-by: Jerome Brunet --- .../boot/dts/amlogic/meson-g12a-u200.dts | 228 +++++++++++++++++- 1 file changed, 218 insertions(+), 10 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts index da66e2e1dffb..9abe37b5b227 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts @@ -9,6 +9,7 @@ #include #include #include +#include / { compatible = "amlogic,u200", "amlogic,g12a"; @@ -19,6 +20,22 @@ aliases { ethernet0 = ðmac; }; + dioo2133: audio-amplifier-0 { + #sound-dai-cells = <0>; + compatible = "simple-audio-amplifier"; + status = "okay"; + enable-gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_HIGH>; + VCC-supply = <&vcc_5v>; + sound-name-prefix = "10U2"; + }; + + spdif_dir: audio-codec-0 { + #sound-dai-cells = <0>; + compatible = "linux,spdif-dir"; + status = "okay"; + sound-name-prefix = "DIR"; + }; + spdif_dit: audio-codec-1 { #sound-dai-cells = <0>; compatible = "linux,spdif-dit"; @@ -159,17 +176,71 @@ vddcpu: regulator-vddcpu { sound { compatible = "amlogic,axg-sound-card"; model = "U200"; - audio-aux-devs = <&tdmout_c>; - audio-routing = "TDMOUT_C IN 0", "FRDDR_A OUT 2", + audio-widgets = "Line", "Lineout"; + audio-aux-devs = <&tdmout_a>, <&tdmout_b>, <&tdmout_c>, + <&tdmin_a>, <&tdmin_b>, <&tdmin_c>, + <&tdmin_lb>, <&dioo2133>; + audio-routing = "TDMOUT_A IN 0", "FRDDR_A OUT 0", + "TDMOUT_A IN 1", "FRDDR_B OUT 0", + "TDMOUT_A IN 2", "FRDDR_C OUT 0", + "TDM_A Playback", "TDMOUT_A OUT", + "TDMOUT_B IN 0", "FRDDR_A OUT 1", + "TDMOUT_B IN 1", "FRDDR_B OUT 1", + "TDMOUT_B IN 2", "FRDDR_C OUT 1", + "TDM_B Playback", "TDMOUT_B OUT", + "TDMOUT_C IN 0", "FRDDR_A OUT 2", "TDMOUT_C IN 1", "FRDDR_B OUT 2", "TDMOUT_C IN 2", "FRDDR_C OUT 2", - "TDM_B Playback", "TDMOUT_B OUT", + "TDM_C Playback", "TDMOUT_C OUT", "SPDIFOUT IN 0", "FRDDR_A OUT 3", "SPDIFOUT IN 1", "FRDDR_B OUT 3", "SPDIFOUT IN 2", "FRDDR_C OUT 3", "SPDIFOUT_B IN 0", "FRDDR_A OUT 4", "SPDIFOUT_B IN 1", "FRDDR_B OUT 4", - "SPDIFOUT_B IN 2", "FRDDR_C OUT 4"; + "SPDIFOUT_B IN 2", "FRDDR_C OUT 4", + "TDMIN_A IN 0", "TDM_A Capture", + "TDMIN_A IN 1", "TDM_B Capture", + "TDMIN_A IN 2", "TDM_C Capture", + "TDMIN_A IN 3", "TDM_A Loopback", + "TDMIN_A IN 4", "TDM_B Loopback", + "TDMIN_A IN 5", "TDM_C Loopback", + "TDMIN_B IN 0", "TDM_A Capture", + "TDMIN_B IN 1", "TDM_B Capture", + "TDMIN_B IN 2", "TDM_C Capture", + "TDMIN_B IN 3", "TDM_A Loopback", + "TDMIN_B IN 4", "TDM_B Loopback", + "TDMIN_B IN 5", "TDM_C Loopback", + "TDMIN_C IN 0", "TDM_A Capture", + "TDMIN_C IN 1", "TDM_B Capture", + "TDMIN_C IN 2", "TDM_C Capture", + "TDMIN_C IN 3", "TDM_A Loopback", + "TDMIN_C IN 4", "TDM_B Loopback", + "TDMIN_C IN 5", "TDM_C Loopback", + "TDMIN_LB IN 3", "TDM_A Capture", + "TDMIN_LB IN 4", "TDM_B Capture", + "TDMIN_LB IN 5", "TDM_C Capture", + "TDMIN_LB IN 0", "TDM_A Loopback", + "TDMIN_LB IN 1", "TDM_B Loopback", + "TDMIN_LB IN 2", "TDM_C Loopback", + "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 3", "SPDIFIN Capture", + "TODDR_B IN 3", "SPDIFIN Capture", + "TODDR_C IN 3", "SPDIFIN Capture", + "TODDR_A IN 6", "TDMIN_LB OUT", + "TODDR_B IN 6", "TDMIN_LB OUT", + "TODDR_C IN 6", "TDMIN_LB OUT", + "10U2 INL", "ACODEC LOLP", + "10U2 INR", "ACODEC LORP", + "Lineout", "10U2 OUTL", + "Lineout", "10U2 OUTR"; assigned-clocks = <&clkc CLKID_MPLL2>, <&clkc CLKID_MPLL0>, @@ -191,8 +262,52 @@ dai-link-2 { sound-dai = <&frddr_c>; }; - /* 8ch hdmi interface */ dai-link-3 { + sound-dai = <&toddr_a>; + }; + + dai-link-4 { + sound-dai = <&toddr_b>; + }; + + dai-link-5 { + sound-dai = <&toddr_c>; + }; + + /* Connected to the WIFI/BT chip */ + dai-link-6 { + sound-dai = <&tdmif_a>; + dai-format = "dsp_a"; + dai-tdm-slot-tx-mask-0 = <1 1>; + mclk-fs = <256>; + + codec-0 { + sound-dai = <&toacodec TOACODEC_IN_A>; + }; + + codec-1 { + sound-dai = <&tohdmitx TOHDMITX_I2S_IN_A>; + }; + }; + + /* Connected to the onboard AD82584F DAC */ + dai-link-7 { + sound-dai = <&tdmif_b>; + dai-format = "i2s"; + dai-tdm-slot-tx-mask-0 = <1 1>; + mclk-fs = <256>; + + codec-0 { + sound-dai = <&toacodec TOACODEC_IN_B>; + }; + + codec-1 { + sound-dai = <&tohdmitx TOHDMITX_I2S_IN_B>; + }; + }; + + /* 8ch HDMI interface */ + dai-link-8 { sound-dai = <&tdmif_c>; dai-format = "i2s"; dai-tdm-slot-tx-mask-0 = <1 1>; @@ -201,13 +316,17 @@ dai-link-3 { dai-tdm-slot-tx-mask-3 = <1 1>; mclk-fs = <256>; - codec { + codec-0 { + sound-dai = <&toacodec TOACODEC_IN_C>; + }; + + codec-1 { sound-dai = <&tohdmitx TOHDMITX_I2S_IN_C>; }; }; - /* spdif hdmi or toslink interface */ - dai-link-4 { + /* spdif hdmi and coax output */ + dai-link-9 { sound-dai = <&spdifout>; codec-0 { @@ -220,7 +339,7 @@ codec-1 { }; /* spdif hdmi interface */ - dai-link-5 { + dai-link-10 { sound-dai = <&spdifout_b>; codec { @@ -229,16 +348,38 @@ codec { }; /* hdmi glue */ - dai-link-6 { + dai-link-11 { sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>; codec { sound-dai = <&hdmi_tx>; }; }; + + /* internal codec glue */ + dai-link-12 { + sound-dai = <&toacodec TOACODEC_OUT>; + + codec { + sound-dai = <&acodec>; + }; + }; + + /* spdif coax input */ + dai-link-13 { + sound-dai = <&spdifin>; + + codec { + sound-dai = <&spdif_dir>; + }; + }; }; }; +&acodec { + status = "okay"; +}; + &arb { status = "okay"; }; @@ -402,6 +543,12 @@ &sd_emmc_c { vqmmc-supply = <&flash_1v8>; }; +&spdifin { + pinctrl-0 = <&spdif_in_h_pins>; + pinctrl-names = "default"; + status = "okay"; +}; + &spdifout { pinctrl-0 = <&spdif_ao_out_pins>; pinctrl-names = "default"; @@ -412,14 +559,75 @@ &spdifout_b { status = "okay"; }; +&tdmif_a { + pinctrl-0 = <&tdm_a_fs_pins>, <&tdm_a_sclk_pins>, <&tdm_a_dout0_pins> ; + pinctrl-names = "default"; + status = "okay"; +}; + +&tdmif_b { + pinctrl-0 = <&mclk0_a_pins>, <&tdm_b_fs_pins>, <&tdm_b_sclk_pins>, + <&tdm_b_dout0_pins>; + pinctrl-names = "default"; + status = "okay"; + + assigned-clocks = <&clkc_audio AUD_CLKID_TDM_MCLK_PAD0>, + <&clkc_audio AUD_CLKID_TDM_SCLK_PAD1>, + <&clkc_audio AUD_CLKID_TDM_LRCLK_PAD1>; + assigned-clock-parents = <&clkc_audio AUD_CLKID_MST_B_MCLK>, + <&clkc_audio AUD_CLKID_MST_B_SCLK>, + <&clkc_audio AUD_CLKID_MST_B_LRCLK>; + assigned-clock-rates = <0>, <0>, <0>; +}; + &tdmif_c { status = "okay"; }; +&tdmin_a { + status = "okay"; +}; + +&tdmin_b { + status = "okay"; +}; + +&tdmin_c { + status = "okay"; +}; + +&tdmin_lb { + status = "okay"; +}; + +&tdmout_a { + status = "okay"; +}; + +&tdmout_b { + status = "okay"; +}; + &tdmout_c { status = "okay"; }; +&toacodec { + status = "okay"; +}; + +&toddr_a { + status = "okay"; +}; + +&toddr_b { + status = "okay"; +}; + +&toddr_c { + status = "okay"; +}; + &tohdmitx { status = "okay"; };