From nobody Fri Dec 19 08:02:26 2025 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 91B981DF78A; Sun, 24 Mar 2024 22:52:27 +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=1711320748; cv=none; b=Gg9E+UtyubiVw5RFceWNi9tdfM96hURIU2LIT/xuYZCTsDsL8ifDKI/uGhDGPWGft/g5ZFBqBuaL08Gm1NFJ0P7UW82nMXWylnLDv6GXl/VBXH66Wh6rjSKsC/6Ex7f6H25ykywGijuWOoygOVqtXSeu9YkI7rByoHNJ1Hxoepo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711320748; c=relaxed/simple; bh=PSfaJaGHfeh9RYxvNOEV3FNhCqWgQCV/Di0zLdoOfeM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UREnKvR3lW8IYG7BJTObhLvgufBdKR2Tg9ePfWUWJle+9LCdfPD8bIhY38EoI8SiaO2S7pbbGf+iKmlHd02Y4cu2oXQ907m1LG9gsnDXSvJohi8PqXmNBxoxDmZT3ka1xjrDxC6lOWVPeKvObpKBIKijVI/cl68g2s96PrUzK/c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=rk3QGSJ5; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="rk3QGSJ5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BBE6EC433C7; Sun, 24 Mar 2024 22:52:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711320747; bh=PSfaJaGHfeh9RYxvNOEV3FNhCqWgQCV/Di0zLdoOfeM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rk3QGSJ5wGHaSdINwE/zsQMLG3OEH+ZgqZ2KJ0wf3wOSqxbs7LUxO7cwd7TBBsUzQ qDPJu6zyR3A46A5j13v+8RlOUGtJeBrB/VLRzVeUjtFqQWXqPEJ4x1mvJPW5Rz87Wv ZmZzbLFKEvZuE6uj1FvVrVUdZdjPfs74aC4xZY3EqvJ0QPYuVrnQkcBMlIS8h8N/AO 6qGFv9dDxfQQ38yMI7vXKRYu09IwBztLziEAbodca0re/2vQp6kcMChmDPn/LrsFOW w3CysMyRW0war4WnLCQTUrm/rCPdQ3aN/CchC3E1dpSzj2m/3bksf6uO62gx/EYz8T jmartopfm1bwA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Chen-Yu Tsai , Andre Przywara , Jernej Skrabec , Sasha Levin Subject: [PATCH 6.7 311/713] arm64: dts: allwinner: h6: Add RX DMA channel for SPDIF Date: Sun, 24 Mar 2024 18:40:37 -0400 Message-ID: <20240324224720.1345309-312-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324224720.1345309-1-sashal@kernel.org> References: <20240324224720.1345309-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Chen-Yu Tsai [ Upstream commit 7b59348c11f3355e284d77bbe3d33632ddadcfc2 ] 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 H= 6") Signed-off-by: Chen-Yu Tsai Reviewed-by: Andre Przywara Reviewed-by: Jernej Skrabec Link: https://lore.kernel.org/r/20240127163247.384439-6-wens@kernel.org Signed-off-by: Jernej Skrabec Signed-off-by: Sasha Levin --- 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 9ec49ac2f6fd5..381d58cea092d 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 { }; =20 &spdif { + pinctrl-names =3D "default"; + pinctrl-0 =3D <&spdif_tx_pin>; status =3D "okay"; }; =20 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-tanix.dtsi b/arch/arm6= 4/boot/dts/allwinner/sun50i-h6-tanix.dtsi index 4903d6358112d..855b7d43bc503 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 { }; =20 &spdif { + pinctrl-names =3D "default"; + pinctrl-0 =3D <&spdif_tx_pin>; status =3D "okay"; }; =20 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot= /dts/allwinner/sun50i-h6.dtsi index ca1d287a0a01d..d11e5041bae9a 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 =3D "spi1"; }; =20 + /omit-if-no-ref/ spdif_tx_pin: spdif-tx-pin { pins =3D "PH7"; function =3D "spdif"; @@ -655,10 +656,8 @@ spdif: spdif@5093000 { clocks =3D <&ccu CLK_BUS_SPDIF>, <&ccu CLK_SPDIF>; clock-names =3D "apb", "spdif"; resets =3D <&ccu RST_BUS_SPDIF>; - dmas =3D <&dma 2>; - dma-names =3D "tx"; - pinctrl-names =3D "default"; - pinctrl-0 =3D <&spdif_tx_pin>; + dmas =3D <&dma 2>, <&dma 2>; + dma-names =3D "rx", "tx"; status =3D "disabled"; }; =20 --=20 2.43.0