From patchwork Mon Jan 22 17:05:13 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: 764755 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 16134482FC; Mon, 22 Jan 2024 17:05:32 +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=1705943133; cv=none; b=LZLlTI2IZGM8hF+a5nBD5ZJepuncS1poO+b4rJlq4mas6jBv9rgrtFsR5Fc4MfrvQuW1fOAgxwwD5k/xWDpxdmycCnJOLXvXuXxkqLq7g01+ELuxuozG03P1tpYDG8A0EFM2MnGQ3O8NRUVijmzVpo5O8VOLdcjHsqlVPZLDwmk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705943133; c=relaxed/simple; bh=JdOHpoopJxRFnjbFQBUm9b3RMTijAagwBCFmoFDWfog=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=VlxzEAaIWVPYxjG0y7CDLvh+lDi7A15JI6zPMwppOq/ESdUGeJb6ZEVHkFOKqlgUEyjRdrgyS9QPRY89COdlxq0AS0bvaNz22H5dpvVJ0zsVAWho+/hO8r+iPbmReitQRvruAcNDwRw+2ng4h0fZ6UIV8JGZe0og/8Y3zEgqiI0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Zipi+Xj+; 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="Zipi+Xj+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 88155C43394; Mon, 22 Jan 2024 17:05:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705943132; bh=JdOHpoopJxRFnjbFQBUm9b3RMTijAagwBCFmoFDWfog=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Zipi+Xj+/jgKkYfY1ZTFr/SWeePZYEaELd9CMz2ZBHo0BJzFH0fsmxI/0g9h5ma5p +UzAyg/pwdYibC7tzW8FhgaFb14pKR6Krc/U2QoLvaNiXZR2OqogtLcryKb7yGd4IO s4rsPh9nT59QIz5ULDfIPlg1ZEYA2zBKIsj/U8M0q19Es2+ZaH8282OJmMVPoLH8KD Mh/hiz6RnV2/9PFhOkooIeGSwxS1ir+L3+MBi251vYM99iBCk11zOHQ9jIzwnbdt0L JchWknEfmyDpo9GkQw84o2izZ1eoMiMVPGuo8MGJnQfl3mLIZ/WGoXZkpiijLRat24 XPCUV1JtCr1OQ== Received: by wens.tw (Postfix, from userid 1000) id D68205FFB2; Tue, 23 Jan 2024 01:05:29 +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 2/7] dt-bindings: sound: sun4i-spdif: Add Allwinner H616 compatible Date: Tue, 23 Jan 2024 01:05:13 +0800 Message-Id: <20240122170518.3090814-3-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: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Chen-Yu Tsai The SPDIF hardware block found in the H616 SoC has the same layout as the one found in the H6 SoC, except that it is missing the receiver side. Add a new compatible string for it. Signed-off-by: Chen-Yu Tsai Reviewed-by: Jernej Skrabec --- .../devicetree/bindings/sound/allwinner,sun4i-a10-spdif.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-spdif.yaml b/Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-spdif.yaml index 98e2e053fa19..aa32dc950e72 100644 --- a/Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-spdif.yaml +++ b/Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-spdif.yaml @@ -22,6 +22,7 @@ properties: - const: allwinner,sun6i-a31-spdif - const: allwinner,sun8i-h3-spdif - const: allwinner,sun50i-h6-spdif + - const: allwinner,sun50i-h616-spdif - items: - const: allwinner,sun8i-a83t-spdif - const: allwinner,sun8i-h3-spdif @@ -63,6 +64,7 @@ allOf: - allwinner,sun6i-a31-spdif - allwinner,sun8i-h3-spdif - allwinner,sun50i-h6-spdif + - allwinner,sun50i-h616-spdif then: required: @@ -74,6 +76,7 @@ allOf: contains: enum: - allwinner,sun8i-h3-spdif + - allwinner,sun50i-h616-spdif then: properties: From patchwork Mon Jan 22 17:05:14 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: 764754 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 6A1CA487AF; Mon, 22 Jan 2024 17:05:33 +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=1705943133; cv=none; b=rAi+RSOHlxE7YzpSXIm0MpL+067++i60VkmkYDlusdwCHo5JIrp9QTi94cAgtEZHOTEtmwlYN/6eSO6gJCNy+j+6SmRDSmvfuhJ+KUgnM5NJbOaa6QbpZoC+qe6jcjV5AOFCm5fQAASr5p0lCer7kaId32qo5n9lxOg6xC2o53E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705943133; c=relaxed/simple; bh=Xm8PplLtMeyRnn4CAuMxfRssboO0T91G8ByncCA6dSw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=DpB2SlA8JasyHJGkZSGq4Ki/TKt0eFsTEkxbMZj1yM89yUCkHqwArhjzDPRq+heEab28PlMyp9PV97jj8at5HLwXG9Ja5JhqaYdy726GbByXuX2aj3QeAkKc5FW7P4OmgfM9+tHmmgRjmABLbq09OAqua0k7/quGIqth4LdpFeI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=RRGc0ACc; 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="RRGc0ACc" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D2026C4166D; Mon, 22 Jan 2024 17:05:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705943133; bh=Xm8PplLtMeyRnn4CAuMxfRssboO0T91G8ByncCA6dSw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RRGc0ACcvQUq1KvnIRCnD8xBhNgvfPM6Wm3Cwb6g14mDxirVCEJY1iBF9DHntZBDj VuQt7JZ0uolIhxb3iH89sx7h5A2XBIm0x4dEs58HYTHY9bH3X+yv6FwOO1xPUdj3tK VOUOT6S1FrQVY9MRTIFe7jhhoz0DVjI1Lf3ScnwGhGgohoUTP9ZdDGjf3n/jv3eSja mZtWKssbmOF4N2DA54NqxB9dxlkpOl3KBvzFbpQ5ZlFkr6auGLAHxOyQ2DDC5pNgi+ uLQPrkLQEH2A1JL9ZEDYHzTmxmEm0yEjxJUo7pzTWZXWRLBeUB13keU2NCajZvGMjy ytMsJurJl4aSQ== Received: by wens.tw (Postfix, from userid 1000) id 0DB9D600B2; Tue, 23 Jan 2024 01:05:29 +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 3/7] ASoC: sunxi: sun4i-spdif: Add support for Allwinner H616 Date: Tue, 23 Jan 2024 01:05:14 +0800 Message-Id: <20240122170518.3090814-4-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: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Chen-Yu Tsai The SPDIF hardware block found in the H616 SoC has the same layout as the one found in the H6 SoC, except that it is missing the receiver side. Since the driver currently only supports the transmit function, support for the H616 is identical to what is currently done for the H6. Signed-off-by: Chen-Yu Tsai Reviewed-by: Jernej Skrabec --- sound/soc/sunxi/sun4i-spdif.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sound/soc/sunxi/sun4i-spdif.c b/sound/soc/sunxi/sun4i-spdif.c index 702386823d17..f41c30955857 100644 --- a/sound/soc/sunxi/sun4i-spdif.c +++ b/sound/soc/sunxi/sun4i-spdif.c @@ -577,6 +577,11 @@ static const struct of_device_id sun4i_spdif_of_match[] = { .compatible = "allwinner,sun50i-h6-spdif", .data = &sun50i_h6_spdif_quirks, }, + { + .compatible = "allwinner,sun50i-h616-spdif", + /* Essentially the same as the H6, but without RX */ + .data = &sun50i_h6_spdif_quirks, + }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, sun4i_spdif_of_match); From patchwork Mon Jan 22 17:05:15 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: 764756 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 0CDEB3D990; Mon, 22 Jan 2024 17:05:32 +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=1705943133; cv=none; b=nQ/nO1M0cHzn05oUl17dTLv0Q2E/Eqgi0UA2e2ITLwhJxXWqex1dCUlE7Sf3RDp2A2FZGMAha+9mx3lmseqgHSgLYxcDzCbcuEFEughPI2lLmTtlRD+P55bmsg/6JMj3P4YJv/qt8Or0IIgLp8yNNFLQb4fBhlkNVcK7+CnPPSU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705943133; c=relaxed/simple; bh=S1UkfK4/p0h181iT92j9rPEO3r0iRuL3QMMsPwiuSjY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=iqQDlhH2w/n1h0DAXaGyB5Ah02UHJTKhnj/EI+G4ETAbUdf14S0e8NHwBY5+DkHFrITgtmIM2SPzGxfVSWeAyHF9nARNO+mWlyb5oAS0fP3D+/tHXRcUb/LQO8ZVh5aAyKxULXTle4pMlAWBOxDXDM8mQOsFW8cXQOckNEen99o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=We0IU1KN; 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="We0IU1KN" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 98346C433A6; Mon, 22 Jan 2024 17:05:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705943132; bh=S1UkfK4/p0h181iT92j9rPEO3r0iRuL3QMMsPwiuSjY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=We0IU1KNz5olxvNKbzGISxymnsCBPYNEmHnBPYe0KSnaa6SFlpW03oES+JnMoq8YC juiRstM9skTINNEATDvPHQnKam5PnTYkgPkjl75W4Uwc+hLPU5ivjvbKSei7e86HMd cZkSDUKl1F8DszivK2iiyOZ6e5c/AnwfwjECbGHRMXOfWGblEi5xvJbOMcq2UEW+PO KMJhRu7hoeT9sdEsnob11MVrjW48vsZA4IhXI8XEIL3mvpUIfrxnHmH8yD/HluAjzN p//aoMFPhYpwaUDmbEdrAfJpIDSz7ZsmyknDJAECmzoscNByaRjXo/2foseJm8Okxs Zf7i0qWj3zg/A== Received: by wens.tw (Postfix, from userid 1000) id F13F66001C; Tue, 23 Jan 2024 01:05:29 +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 4/7] dt-bindings: dma: allwinner,sun50i-a64-dma: Add compatible for H616 Date: Tue, 23 Jan 2024 01:05:15 +0800 Message-Id: <20240122170518.3090814-5-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: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Chen-Yu Tsai The DMA controllers found on the H616 and H618 are the same as the one found on the H6. The only difference is the DMA endpoint (DRQ) layout. Since the number of channels and endpoints are described with additional generic properties, just add a new H616-specific compatible string and fallback to the H6 one. Signed-off-by: Chen-Yu Tsai --- .../bindings/dma/allwinner,sun50i-a64-dma.yaml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/dma/allwinner,sun50i-a64-dma.yaml b/Documentation/devicetree/bindings/dma/allwinner,sun50i-a64-dma.yaml index ec2d7a789ffe..e5693be378bd 100644 --- a/Documentation/devicetree/bindings/dma/allwinner,sun50i-a64-dma.yaml +++ b/Documentation/devicetree/bindings/dma/allwinner,sun50i-a64-dma.yaml @@ -28,6 +28,9 @@ properties: - items: - const: allwinner,sun8i-r40-dma - const: allwinner,sun50i-a64-dma + - items: + - const: allwinner,sun50i-h616-dma + - const: allwinner,sun50i-h6-dma reg: maxItems: 1 @@ -59,10 +62,14 @@ required: if: properties: compatible: - enum: - - allwinner,sun20i-d1-dma - - allwinner,sun50i-a100-dma - - allwinner,sun50i-h6-dma + oneOf: + - enum: + - allwinner,sun20i-d1-dma + - allwinner,sun50i-a100-dma + - allwinner,sun50i-h6-dma + - items: + - const: allwinner,sun50i-h616-dma + - const: allwinner,sun50i-h6-dma then: properties: 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: 764753 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="vP9acJoB" 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: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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"; };