From patchwork Mon Jan 22 17:05:16 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: 190268 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2bc4:b0:101:a8e8:374 with SMTP id hx4csp2734202dyb; Mon, 22 Jan 2024 09:50:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IExSQ2rM/dfD7r9V+bidqhpYz6KVcYqF7qCgxuhb9SKuXQQUOmT+1uPFKgHyvXVHaaqpU/v X-Received: by 2002:a05:6a20:3d02:b0:19c:4d44:9e65 with SMTP id y2-20020a056a203d0200b0019c4d449e65mr1131935pzi.31.1705945859671; Mon, 22 Jan 2024 09:50:59 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705945859; cv=pass; d=google.com; s=arc-20160816; b=JToPItqDwfqUNswyyL27ZKaZ1v/4WWZEyM/hDfuHAMX9bi8TIEKOykA54HS+zzehu9 kXGeXjQfVsOUnn0JR9+x3c74TY/im7uPRoSDE38Nb2+AUiEEEdYE+lpjiKx/zrfLlnGw DmZzrI4vgn9VgiiAF+XCdhFAoQhZyenCHE6LR2VoprBLyqdRrl7a07wvyZhr5bTKMts5 rjiapt6A0x3QAz5MxbvXhL3Rv3gzHKxrvnJoadr9jKUWKDHdhYqjfQVii1kGoU6lebuN s6Hzl4bDRlw2Y4JP9cOxHE5su1ZNwYcLfPo7KE2ErskRzZHPpHSKfwf0be70IpvsmMOk PnZg== 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=kDQJqr6goYYIkxSRzyTBzCdsdpof2oH+qclBj/rXWwM=; fh=m1+VV4HTiGNm18uZzn/d6hCG96aBwlw9t3UKL+x124s=; b=0Za+mMxl3QMTHs+8Sn3LBML7i2y9g8V79hv/Z3LShwdwQD/99m/6u0Ed2J2Im36QcP MvisXrWe6Y8OycWVj58fuiKuqpHWDLe7auLIROTRgkjT3loHBVOFu+RSUUDZocu2P5fS NG7seWEiLHzJIkn3Wqm3t/3NmkLG2PVrUKUNv7tqoFTK5SoZ+BHP8abOAeFKbsQhpPJ3 7HMenbp/4vO2vwRkwjOIwHA/G8V8QPYE911cokpwkLnqWlR6Bj5z/8VURZZtuK1X4S3I DJMLID1VaVbFgcRvkwnOfZtKjHFJhNdfv2hBhq0g+HCsEV+efoMtvLsWEpBOsCTwQNfB Xqkg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=vP9acJoB; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-33749-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-33749-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id l189-20020a6325c6000000b005c67e10f238si8539251pgl.492.2024.01.22.09.50.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jan 2024 09:50:59 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-33749-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=vP9acJoB; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-33749-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-33749-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 2C2DC28C561 for ; Mon, 22 Jan 2024 17:45:40 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0AC045DF0A; Mon, 22 Jan 2024 17:05:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="vP9acJoB" 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 6C7505C91D; Mon, 22 Jan 2024 17:05:35 +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=1705943135; cv=none; b=XxEac0MWRzhKpPpXoV9lLm7x/ebi+EVHHPauF6W2gFqbAetsBmH1LV1yxz4yYiHjQQ3zoiHDCp9YLaVbot31T6aVXRFJ6wI0zsBf50FZJHCxtrm1a1q7mwHvtTbBoQZ7LyqeUQkjiPPfUWU1Q2VRedF1/YoQ+hAfmtMjlS1LCjk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705943135; c=relaxed/simple; bh=sdP1r/VhAMaKVNqjhK+hZstufK/WpJeVtEdRqv6k0hU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=a4hh6k4JdlrHGn+uvnuA8D01yE10oIxiT9+Kinsa8FyK48jLuPd85vZzLA6lQmviat6VD+/DGIepLLJpdLo+cs95rGtysgeJLVeXoguDlaHe4eJzzGS4MyvnWX9gl66zOGDVpFvaOnWiyuYfIs5pLld5U1x6UldPQn2LKxL/dpU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=vP9acJoB; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id B53CDC43394; Mon, 22 Jan 2024 17:05:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705943134; bh=sdP1r/VhAMaKVNqjhK+hZstufK/WpJeVtEdRqv6k0hU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vP9acJoBknBHA3wKShNSxY5CetLpAoQM27SJUaeoHdIOzn8f1z+FdPdh3L6XsQQ3d 7yIrIs8QngJkdEH/0mlNLEvA1OHj0GvzC7j3z1a/7q9UPsIpyF/5/UllFwiFf2h3b6 BGb0RyFDiuDTl/A01CqkKCtCZSVSTThfEOpwegvtrSlWGK4yyjyQh7t7UrubuQczAx eX0GF7KOYgj6kogV/8iYKY+rANrwG+rTe27Wwp1U1qu0nllvqTBskm4X0QabpKWPn7 J6dX3UNrpo028k7I0IUj8WoveB9423thrJYWxp6+l16DKWzPdgQzQMf3ImI5NxUSpl 3FnbmcglNJgVg== Received: by wens.tw (Postfix, from userid 1000) id 1382D6002A; Tue, 23 Jan 2024 01:05:30 +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 Subject: [PATCH 5/7] arm64: dts: allwinner: h6: Add RX DMA channel for SPDIF Date: Tue, 23 Jan 2024 01:05:16 +0800 Message-Id: <20240122170518.3090814-6-wens@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240122170518.3090814-1-wens@kernel.org> References: <20240122170518.3090814-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: 1788813886006607539 X-GMAIL-MSGID: 1788813886006607539 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 --- 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"; };