From patchwork Sat Jan 27 16:32:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen-Yu Tsai X-Patchwork-Id: 193066 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2395:b0:106:343:edcb with SMTP id gw21csp572785dyb; Sat, 27 Jan 2024 08:39:44 -0800 (PST) X-Google-Smtp-Source: AGHT+IEVhilDV5UrWfp01wCAcCLAGFtQJEpZ/DPP+hYI8ZGRj0Dots4rbtGbjJ3YtnGL4UImbn5u X-Received: by 2002:a05:6808:23c8:b0:3bd:eadb:2ec8 with SMTP id bq8-20020a05680823c800b003bdeadb2ec8mr2327404oib.27.1706373584277; Sat, 27 Jan 2024 08:39:44 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706373584; cv=pass; d=google.com; s=arc-20160816; b=o5WLK+19DFyVAwhh2J+CKtaDf2WuVFs4LwbYpCT2nwca7IoE1F2o7nWP/MDnRCLDCk zJGkEv7d1NoVdB7IjxgCvdQYgtQDn/3/FmJ7iy3vBD94IYH0iVPpMTyrdTwcqv9RZSnd 54790hiqtXBDgsALmW45aYdUr9EDGUSa01rF0CuxRhgaM/rl8koQe5wHrHUxNpajLhx6 pCUwUSaeB+9HF3n8Zw+8x5FQXGfeCp8zlnM0UQdKE9HmDV7uFin6LweOOu90fVS1R3mF r9WzFKYX+vZOVjk8Rpei2zqfg5gHNP0cTb3XFuCdQJyYRPmWWFfFXnYoKThqpc/NfZue ctXQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=40Lhw8xxQEfWnpIraU5hAsbBYaahWw1Qt/uUWJzWR3c=; fh=7heQgEq06SRj3M5jJj/3xEMmsrcIaj+c3B/LX1Wa5n4=; b=ozT8SgaOx+XOl0wtlQZKO9BmkTGttJLNterF+Wafd32hzxpsIHGN0Vot/nQifwgL2h e4vdQtywJ73dy4p2iczDQghIjQd1FYXl4QZPN0L/CtemEeOcf3y8oQUSMKTzK3TOEhcA 1tarJA3hBwmdtnxY0tPu9ZhxL7f4+6IQlK/7aFXbl5iCXYumOEb9lwPxxwDmvT9BxaUO L8IjKXHOWXx18u4sqqG7euFM+Fa7bdGLD/qvDxrFfNZI+uyS61jWlwmU6r2loU5fmVlV AdlVvDhC7fyYTWsIdLmY5/b7Ri5gWhWjCqd6T7/mAB7kYZGSdpsFF4L02JrfNaX1MtoM CICw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=H6f72xPR; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-41313-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-41313-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id o23-20020a637e57000000b005d7bed2bc4asi3015242pgn.541.2024.01.27.08.39.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 Jan 2024 08:39:44 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-41313-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=H6f72xPR; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-41313-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-41313-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 18035B232C2 for ; Sat, 27 Jan 2024 16:35:07 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6B5B745BE3; Sat, 27 Jan 2024 16:33:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="H6f72xPR" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 631DD2E62E; Sat, 27 Jan 2024 16:32:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706373177; cv=none; b=P0itoltflBrf9/qtZm9oQ2pfQPtY0KuEetxq3d8E453ixUCTAO2BDaNgactZ9SJ+NO6TSh16Z5I4Yh8c1LzZ2fclSFc6tWCqTDQ5RlPlTlYWmLwYBrv5UodSnnv7c5Abu6FzvNF2H3PXUrHJ0YV8TI6RrrcdGLEZgQBPJqSTkP8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706373177; c=relaxed/simple; bh=WOUqb67kFNowd66WvLyJkFViYo3BarKcvhbuq1ivPvc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=YHwl36dqNS7qqIgu3wsLIAVkPfhSk/MryH4qr6aCt7ObKwiz6sUOjKEH0eWw16/QQtfYfBn5JlDJvxCNK68RdJZ+Fqw7xmemn6IGaXaO/ev4FRlyxUQp5x4xtibxA9QqocHwBsNQlfv3PVGUElrFTz94i/zkt6497zH671OyWNI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=H6f72xPR; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id DD5B4C43330; Sat, 27 Jan 2024 16:32:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1706373177; bh=WOUqb67kFNowd66WvLyJkFViYo3BarKcvhbuq1ivPvc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=H6f72xPRi0Dz/4aTk0M8NlzZl45rEQCYBvPGz7KEBrnFVNqcWpvST8O0iC1HrVCEg /aFV1BPgXYX3ME/N2jN0HXFF9uL81kg3c6Fw0G70LmHOp8CEe7wWsf4v7c+IL0kZ4N IuF23IrccqrDX5y8i385BX3IcelHacJdFHjiBsoP8IjctcQdEMp7WyyQ4hYCKIy/J1 9FYMdUldFxR21IMLv7QkfjRFgvzZAdXl5VRAruktMRFeB+B1myXfP6WKCVnVE8H9Kb i+gVwx5DRmzuGPCMf/Ku66qUDbPRKdKZDTezgpmaMR2ELMdDoVXGHcYKzzsRHnoQO/ D7Ji4MjvGRyUw== Received: by wens.tw (Postfix, from userid 1000) id 7AB825FE36; Sun, 28 Jan 2024 00:32:52 +0800 (CST) From: Chen-Yu Tsai To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Jernej Skrabec , Samuel Holland , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Vinod Koul Cc: Chen-Yu Tsai , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-sound@vger.kernel.org, dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, Andre Przywara Subject: [PATCH v2 5/7] arm64: dts: allwinner: h6: Add RX DMA channel for SPDIF Date: Sun, 28 Jan 2024 00:32:45 +0800 Message-Id: <20240127163247.384439-6-wens@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240127163247.384439-1-wens@kernel.org> References: <20240127163247.384439-1-wens@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789262387356898814 X-GMAIL-MSGID: 1789262387356898814 From: Chen-Yu Tsai The SPDIF hardware found on the H6 supports both transmit and receive functions. However it is missing the RX DMA channel. Add the SPDIF hardware block's RX DMA channel. Also remove the by-default pinmux, since the end device can choose to implement either or both functionalities. Fixes: f95b598df419 ("arm64: dts: allwinner: Add SPDIF node for Allwinner H6") Signed-off-by: Chen-Yu Tsai Reviewed-by: Andre Przywara Reviewed-by: Jernej Skrabec --- arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts | 2 ++ arch/arm64/boot/dts/allwinner/sun50i-h6-tanix.dtsi | 2 ++ arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 7 +++---- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts index 9ec49ac2f6fd..381d58cea092 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts @@ -291,6 +291,8 @@ sw { }; &spdif { + pinctrl-names = "default"; + pinctrl-0 = <&spdif_tx_pin>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-tanix.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6-tanix.dtsi index 4903d6358112..855b7d43bc50 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6-tanix.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-tanix.dtsi @@ -166,6 +166,8 @@ &r_ir { }; &spdif { + pinctrl-names = "default"; + pinctrl-0 = <&spdif_tx_pin>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi index ca1d287a0a01..d11e5041bae9 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi @@ -406,6 +406,7 @@ spi1_cs_pin: spi1-cs-pin { function = "spi1"; }; + /omit-if-no-ref/ spdif_tx_pin: spdif-tx-pin { pins = "PH7"; function = "spdif"; @@ -655,10 +656,8 @@ spdif: spdif@5093000 { clocks = <&ccu CLK_BUS_SPDIF>, <&ccu CLK_SPDIF>; clock-names = "apb", "spdif"; resets = <&ccu RST_BUS_SPDIF>; - dmas = <&dma 2>; - dma-names = "tx"; - pinctrl-names = "default"; - pinctrl-0 = <&spdif_tx_pin>; + dmas = <&dma 2>, <&dma 2>; + dma-names = "rx", "tx"; status = "disabled"; };