From patchwork Sat Jan 27 16:32:41 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: 13534174 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 55C601B812; Sat, 27 Jan 2024 16:32:55 +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=1706373175; cv=none; b=LKqKALkki6yiEn5jt+IYbulEPbaLif1Vf2mTKcOl91nBkwordNPPJKuxywoFN0YhQ1GiabUhLLoyUguMudBg7L+x12hp48PotpYgE2XplZywWocLGds+ZuVenjJFN6Uj4pyCoirJPGe8oeRXi7iVIBLwPlbI8OsBRFKSp43z6aE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706373175; c=relaxed/simple; bh=vsL0mbXsOusXWQQoLV0+ENppFAA94idE+K76ih4R3EY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=YuTRKB3xexFcgSKSCeqgGBhF6wLtIRY+HEtST01mnrj7Jf7wlG6IzLzADBb24utOmyH7BhfnvkJLenY7fG3BqeSouoAxtttg9FlGygqzK7l9Rtk+5ZPtTTinBgZ0qqsixMwDa5cRH2P50m3AzLskwKMpRDKAgSoaZIIUmrWJg9Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=f5iClA6L; 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="f5iClA6L" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B36B6C433C7; Sat, 27 Jan 2024 16:32:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1706373174; bh=vsL0mbXsOusXWQQoLV0+ENppFAA94idE+K76ih4R3EY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f5iClA6LGijEWwjkd3JAyCqVl96GzTg73GnRC2fvLKT+m6IUiGiC3W0oDeF6N4z5d RQfxt4c2fXpZXqd9Cq6MJpMqH9QSuM8ueQPpnfDfi7TNAy3sHueUo7KCjAs/BM4MNd w5iqzM3q8A/GqmDmI1o74TiGz1I2JhH8htUq8djsqyDpOYwwXn6Bk0EvZI0xrjoTM1 OWOM7m7QRPaQnfcxwpBogHsvDWfiu4/+YVjtUSvDzVXheiJ4/byOV4lJqGQf0a5piF hvi1W1KfZPWkNqITxNhOB5R69uRMZR4Bm1igljypmNR4hP16HJ7N+31Ssfy53loYWU PnfYgW2gvwMSQ== Received: by wens.tw (Postfix, from userid 1000) id 4B4D15FA14; 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, Conor Dooley Subject: [PATCH v2 1/7] dt-bindings: sound: sun4i-spdif: Fix requirements for H6 Date: Sun, 28 Jan 2024 00:32:41 +0800 Message-Id: <20240127163247.384439-2-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-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Chen-Yu Tsai When the H6 was added to the bindings, only the TX DMA channel was added. As the hardware supports both transmit and receive functions, the binding is missing the RX DMA channel and is thus incorrect. Also, the reset control was not made mandatory. Add the RX DMA channel for SPDIF on H6 by removing the compatible from the list of compatibles that should only have a TX DMA channel. And add the H6 compatible to the list of compatibles that require the reset control to be present. Fixes: b20453031472 ("dt-bindings: sound: sun4i-spdif: Add Allwinner H6 compatible") Signed-off-by: Chen-Yu Tsai Acked-by: Conor Dooley Reviewed-by: Jernej Skrabec --- .../devicetree/bindings/sound/allwinner,sun4i-a10-spdif.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-spdif.yaml b/Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-spdif.yaml index 8108c564dd78..98e2e053fa19 100644 --- a/Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-spdif.yaml +++ b/Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-spdif.yaml @@ -62,6 +62,7 @@ allOf: enum: - allwinner,sun6i-a31-spdif - allwinner,sun8i-h3-spdif + - allwinner,sun50i-h6-spdif then: required: @@ -73,7 +74,6 @@ allOf: contains: enum: - allwinner,sun8i-h3-spdif - - allwinner,sun50i-h6-spdif then: properties: From patchwork Sat Jan 27 16:32:42 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: 13534178 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 A444C2C68B; Sat, 27 Jan 2024 16:32:55 +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=1706373175; cv=none; b=NCRGadzofvjzQy64qpRkqeRt48hxttXCkRe0QfkRtN3INm6EZp/lH/iOXqFWZUzhb//GriFww1/rCZYkDXf6kWlV+P8bK59+RmzJ9c69mMyWKwCiho6Sf4AvRff+w4Ptt8Jrcm9To6mSDsfO/R7lujwXIv4/udfz7OqeGzmTsKE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706373175; c=relaxed/simple; bh=UV5vUtB55jwJjSHcj4dFELiMmvh+A8Qx1KiXYwwaOdg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=jhW9N4EWH/uLq9OPeKWzQr0/hV/aIjHCUynPbc5/9Obdu76VtqthXbGsJ+DLP3X9EacNgCfWFGJa463f92JtdZFFqt2QceDhiAVQ9WnRZEAakaEraZMRqhi2tHhDPeLNrnGLIPVn6kvLWXV+lOTd4itM2t44TPibPzCL2gn/+RI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=U2laxqYa; 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="U2laxqYa" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 21DD4C43330; Sat, 27 Jan 2024 16:32:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1706373175; bh=UV5vUtB55jwJjSHcj4dFELiMmvh+A8Qx1KiXYwwaOdg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=U2laxqYaYIfMWNW+FebTG7Hp8zE4EwXty2oystY1/hs3eXZEc8jB+BUmgZQqcOr+2 Mqg/rvm/WMyizloRS+sMFhizfAVrJ1VukgJZr8yeTGUXYkOn3yn4vQjBPwVf9vULZS JusJRPqfVJZSs9ucVReRxUJKNX9/WkylUjxrrJz6I3LluAvLWMTiBEGsAyl/pu7v+V 3/mapLOWcy2vGO/4aAgtdvnLMIa4dUzZ0eyjhafu56TDpiuYralUG6h4XsIrCdvdNY DAMS5+mFJ0b89V4sRzwv7mK7eTtwpyrXuTfyjGebW2RqE+xla6iN/YZ8k1TYxjetoi 3k+gtIyCpLOCQ== Received: by wens.tw (Postfix, from userid 1000) id 6B21B5FDDF; 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, Conor Dooley Subject: [PATCH v2 2/7] dt-bindings: sound: sun4i-spdif: Add Allwinner H616 compatible Date: Sun, 28 Jan 2024 00:32:42 +0800 Message-Id: <20240127163247.384439-3-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-sound@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 Acked-by: Conor Dooley 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 Sat Jan 27 16:32:43 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: 13534175 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 61C1B1E531; Sat, 27 Jan 2024 16:32:55 +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=1706373175; cv=none; b=l6O+yyFpEe5rPcCTTOrKYoRYpctBJcrQ2HvMp43yQEYW9QfwbjKgDCTYRsxqC6G4eBSbyHxHU/gejxLGM84+aViai5X3eTUew5zk9GQ5xbQG6AXkErvSStj9CcwaPoakJTLVsZZAJqyytzaVw3/f0hiaHfdEHmKFrlW3pxm2yGU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706373175; c=relaxed/simple; bh=Kh4LgU41ucmqLDiWgVW2g3izu0jN4Zn5A+1gSaj5/7Q=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=X0EDAh4oEORhBeX9nD4VdwM/NSRwDrXDtcoVDMgbgWW20K6tDBqx7gJKJ1yHzc+waG+Zos9u16zZPUut+hIyoaYVprs1zYxY0hVE50pbIzdNcVICbdNABneE7OVwI5Axd5Thdl+POHYL2lYIE2PYpCWutNHvLNcxU2cAhLuJrkw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ECaen3DG; 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="ECaen3DG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0953FC433B1; Sat, 27 Jan 2024 16:32:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1706373175; bh=Kh4LgU41ucmqLDiWgVW2g3izu0jN4Zn5A+1gSaj5/7Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ECaen3DGTCwiDfEdSEhDXDOCJGuemFmKJspx8UTpp6bKZdHf7jLXsocEl551KtgbN TdRlg/y15p9f6mBBkiZi+h1v/vXCbHAxBro51mI9TSz7O/ckhcdckFWlR1tEZgVKJ/ 0LogHQQp+/FBvRMYMHLPiVGWzWoPMdMPawwNcn5weK4p781dCdisDFikAQlor2IVQL MEPYpXV6VA2PwnNDUfzSp0qo9dZPMTzOBqPSxf/vypMyjBazHnyzotGGnoNbRM6jW5 /ZHZCwffvyIWgNjRiOkPk1m22SuyU1PB2unZUJZ/kacpLhuzRfsGWdUISq5QJQF0Xa SX8C1PnHBao/g== Received: by wens.tw (Postfix, from userid 1000) id 611C55FBBD; 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 3/7] ASoC: sunxi: sun4i-spdif: Add support for Allwinner H616 Date: Sun, 28 Jan 2024 00:32:43 +0800 Message-Id: <20240127163247.384439-4-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-sound@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: Andre Przywara 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 Sat Jan 27 16:32:44 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: 13534177 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 72FE92206B; Sat, 27 Jan 2024 16:32:55 +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=1706373175; cv=none; b=eBpl5wvmti5xO1ufbWjRpHyo1GASdedEciicElP+kHg744zzZbjZHnAg7+7klgorL+EAXXqaGDeVfyZosS6STYzTmpsRoxzGT73Pzd2lymIa+D6/iNOVjD7d3DhiKakhxXOyEeOXSE/Zr4UdGhLMYp6EG4RsWcGHQA0ijNyzCe0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706373175; c=relaxed/simple; bh=8BAcimB2vVPlYBPHFOIgIFLTY9STdBweYW7HvMTKlig=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=KObxB3yqkIA/tbWZ0PMmdVdOEXoKJkCmEodp7Rc3iPwPFLRp5yRQ7HQOSrjbaRJGp7eUGwSR8dHAFKnUVQa8i8EYytm5BV0xz6vkdJf7ikFL13AZzQcrmw3O7zSzkhYl1gx9G2hJnliHfgm6NikcSNb3H4OCJhzYtuZxCvSvIuo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=CQsh7erl; 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="CQsh7erl" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DF956C43390; Sat, 27 Jan 2024 16:32:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1706373175; bh=8BAcimB2vVPlYBPHFOIgIFLTY9STdBweYW7HvMTKlig=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CQsh7erls6X9hzFBwfJisBWdG+uNFUXpVtcq3aeOAr4bonKNh7KrKqcVTYS/H33nR GbbNia0jpKlDaTHaEPPGPkAISjY1KySI7lOdBnhGKQXDXJReWiA0R+e0N1Eq2lJiGY 9eBCg6CYKVzqKBXvs26LWpGaGZwkV3Z6s5mJXVGh+pYDLb1P4YrT336qn94G1fvVba h4jPrd38Og0jAI4w2gA1G3BaMY38cL38ikhWpPBNOZEN1tL0azvpqjIT4w2O/YcdY7 pDAdu/BUoRF4vJpfC1ctDao4+veLTtduKXKUjO7XNccNBAz1AIj0tAU/+Esj2+Jkbv GBjpRjUTblf2A== Received: by wens.tw (Postfix, from userid 1000) id 712EF5FDC7; 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 Subject: [PATCH v2 4/7] dt-bindings: dma: allwinner,sun50i-a64-dma: Add compatible for H616 Date: Sun, 28 Jan 2024 00:32:44 +0800 Message-Id: <20240127163247.384439-5-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-sound@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 A100. 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 A100 one. Signed-off-by: Chen-Yu Tsai Acked-by: Conor Dooley Reviewed-by: Andre Przywara --- Changes since v1: - Switch to "contains" for if-properties statement - Fall back to A100 instead of H6 .../bindings/dma/allwinner,sun50i-a64-dma.yaml | 12 ++++++++---- 1 file changed, 8 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..0f2501f72cca 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-a100-dma reg: maxItems: 1 @@ -59,10 +62,11 @@ required: if: properties: compatible: - enum: - - allwinner,sun20i-d1-dma - - allwinner,sun50i-a100-dma - - allwinner,sun50i-h6-dma + contains: + enum: + - allwinner,sun20i-d1-dma + - allwinner,sun50i-a100-dma + - allwinner,sun50i-h6-dma then: properties: 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: 13534180 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="H6f72xPR" 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-sound@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"; }; From patchwork Sat Jan 27 16:32:46 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: 13534179 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 631FC2E62F; 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=ROPxVFU7/+ZSBAdJXmG2Zmbxb31HSbXnroP8/CsWLXFgpgkcJdErxMJCPGRTi54BOX1adzZQhWjbMA/oM18a31JzsKgYB/buvcAog8sglNWXDTlWRFQ9MD0X+A5XBhay54uFCx2vOQNUy6hRHPY/TVGtIkU3Uq2Ll7S1Pzu63kg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706373177; c=relaxed/simple; bh=zQfoZw8TAHIXjSz0P9ay/fYjypHtOoMzHr8C8vMyAuw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=YVJxBA+7Hj81kdrBp0l6K1Y54KnkopxOdi7xpQ9POZyH9CNSRAS3WbcGhHTis3qBwKKpy2JltUcXaO92U3oQacArsy7VSinNlIuyAQh/rV4ni8QgnVVlzSoI3GP0bAHn3SAd75k4QSFPCbJoH6kh1F7LaBkez+hjYhAq+/+V1ws= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=DNrGbLX7; 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="DNrGbLX7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D6EA4C4166D; 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=zQfoZw8TAHIXjSz0P9ay/fYjypHtOoMzHr8C8vMyAuw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DNrGbLX7VsycQLHZKhmkPyj+vrvcC0UogDZv0KRWqDXAWmjK7oRdOwxiZAZT7oVUk 0D6r/bDML/Qz2U1pevBmozEb34cueyQtPa2AhS+mtfFq/803/9jqIALT3qHYuNArd6 aJJerssO39mcF9i1uBRGPhxqXydfQ3Y7Tu0+tLU9lqWIMvYOgw41lcsEfYkcqzHrDe JaEGxxlS+Ux1m1spm3v78yIL+WAUnCcRj7DbbYS5VGctynuvhYMYaueWKU6kZyJQVa YwGYFOcX1bInx7ss6wnt8Yrbci22rvQONZ8jXClQx4Kp/9gzWbfHOn4mVoDtzqsv3r Re/ogS+EAvXnw== Received: by wens.tw (Postfix, from userid 1000) id 85B4F5FF9C; 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 Subject: [PATCH v2 6/7] arm64: dts: allwinner: h616: Add DMA controller and DMA channels Date: Sun, 28 Jan 2024 00:32:46 +0800 Message-Id: <20240127163247.384439-7-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-sound@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 A100. The only difference is the DMA endpoint (DRQ) layout. Add a device node for it, and add DMA channels for existing peripherals. Signed-off-by: Chen-Yu Tsai Reviewed-by: Andre Przywara --- Changes since v1: - Fall back to A100 instead of H6 - Add DMA channels for r_i2c .../arm64/boot/dts/allwinner/sun50i-h616.dtsi | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi index d549d277d972..885809137b9d 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi @@ -133,6 +133,19 @@ ccu: clock@3001000 { #reset-cells = <1>; }; + dma: dma-controller@3002000 { + compatible = "allwinner,sun50i-h616-dma", + "allwinner,sun50i-a100-dma"; + reg = <0x03002000 0x1000>; + interrupts = ; + clocks = <&ccu CLK_BUS_DMA>, <&ccu CLK_MBUS_DMA>; + clock-names = "bus", "mbus"; + dma-channels = <16>; + dma-requests = <49>; + resets = <&ccu RST_BUS_DMA>; + #dma-cells = <1>; + }; + sid: efuse@3006000 { compatible = "allwinner,sun50i-h616-sid", "allwinner,sun50i-a64-sid"; reg = <0x03006000 0x1000>; @@ -339,6 +352,8 @@ uart0: serial@5000000 { reg-shift = <2>; reg-io-width = <4>; clocks = <&ccu CLK_BUS_UART0>; + dmas = <&dma 14>, <&dma 14>; + dma-names = "tx", "rx"; resets = <&ccu RST_BUS_UART0>; status = "disabled"; }; @@ -350,6 +365,8 @@ uart1: serial@5000400 { reg-shift = <2>; reg-io-width = <4>; clocks = <&ccu CLK_BUS_UART1>; + dmas = <&dma 15>, <&dma 15>; + dma-names = "tx", "rx"; resets = <&ccu RST_BUS_UART1>; status = "disabled"; }; @@ -361,6 +378,8 @@ uart2: serial@5000800 { reg-shift = <2>; reg-io-width = <4>; clocks = <&ccu CLK_BUS_UART2>; + dmas = <&dma 16>, <&dma 16>; + dma-names = "tx", "rx"; resets = <&ccu RST_BUS_UART2>; status = "disabled"; }; @@ -372,6 +391,8 @@ uart3: serial@5000c00 { reg-shift = <2>; reg-io-width = <4>; clocks = <&ccu CLK_BUS_UART3>; + dmas = <&dma 17>, <&dma 17>; + dma-names = "tx", "rx"; resets = <&ccu RST_BUS_UART3>; status = "disabled"; }; @@ -383,6 +404,8 @@ uart4: serial@5001000 { reg-shift = <2>; reg-io-width = <4>; clocks = <&ccu CLK_BUS_UART4>; + dmas = <&dma 18>, <&dma 18>; + dma-names = "tx", "rx"; resets = <&ccu RST_BUS_UART4>; status = "disabled"; }; @@ -394,6 +417,8 @@ uart5: serial@5001400 { reg-shift = <2>; reg-io-width = <4>; clocks = <&ccu CLK_BUS_UART5>; + dmas = <&dma 19>, <&dma 19>; + dma-names = "tx", "rx"; resets = <&ccu RST_BUS_UART5>; status = "disabled"; }; @@ -405,6 +430,8 @@ i2c0: i2c@5002000 { reg = <0x05002000 0x400>; interrupts = ; clocks = <&ccu CLK_BUS_I2C0>; + dmas = <&dma 43>, <&dma 43>; + dma-names = "rx", "tx"; resets = <&ccu RST_BUS_I2C0>; pinctrl-names = "default"; pinctrl-0 = <&i2c0_pins>; @@ -420,6 +447,8 @@ i2c1: i2c@5002400 { reg = <0x05002400 0x400>; interrupts = ; clocks = <&ccu CLK_BUS_I2C1>; + dmas = <&dma 44>, <&dma 44>; + dma-names = "rx", "tx"; resets = <&ccu RST_BUS_I2C1>; status = "disabled"; #address-cells = <1>; @@ -433,6 +462,8 @@ i2c2: i2c@5002800 { reg = <0x05002800 0x400>; interrupts = ; clocks = <&ccu CLK_BUS_I2C2>; + dmas = <&dma 45>, <&dma 45>; + dma-names = "rx", "tx"; resets = <&ccu RST_BUS_I2C2>; status = "disabled"; #address-cells = <1>; @@ -446,6 +477,8 @@ i2c3: i2c@5002c00 { reg = <0x05002c00 0x400>; interrupts = ; clocks = <&ccu CLK_BUS_I2C3>; + dmas = <&dma 46>, <&dma 46>; + dma-names = "rx", "tx"; resets = <&ccu RST_BUS_I2C3>; status = "disabled"; #address-cells = <1>; @@ -459,6 +492,8 @@ i2c4: i2c@5003000 { reg = <0x05003000 0x400>; interrupts = ; clocks = <&ccu CLK_BUS_I2C4>; + dmas = <&dma 47>, <&dma 47>; + dma-names = "rx", "tx"; resets = <&ccu RST_BUS_I2C4>; status = "disabled"; #address-cells = <1>; @@ -472,6 +507,8 @@ spi0: spi@5010000 { interrupts = ; clocks = <&ccu CLK_BUS_SPI0>, <&ccu CLK_SPI0>; clock-names = "ahb", "mod"; + dmas = <&dma 22>, <&dma 22>; + dma-names = "rx", "tx"; resets = <&ccu RST_BUS_SPI0>; status = "disabled"; #address-cells = <1>; @@ -485,6 +522,8 @@ spi1: spi@5011000 { interrupts = ; clocks = <&ccu CLK_BUS_SPI1>, <&ccu CLK_SPI1>; clock-names = "ahb", "mod"; + dmas = <&dma 23>, <&dma 23>; + dma-names = "rx", "tx"; resets = <&ccu RST_BUS_SPI1>; status = "disabled"; #address-cells = <1>; @@ -734,6 +773,8 @@ r_i2c: i2c@7081400 { reg = <0x07081400 0x400>; interrupts = ; clocks = <&r_ccu CLK_R_APB2_I2C>; + dmas = <&dma 48>, <&dma 48>; + dma-names = "rx", "tx"; resets = <&r_ccu RST_R_APB2_I2C>; status = "disabled"; #address-cells = <1>; From patchwork Sat Jan 27 16:32:47 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: 13534181 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 7C7C22E635; 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=ff30xOuK3T7GUzFFgQYaNEDqA991V/0tW+83nNDV/+kWrmz6rvHZE0sDiEdMt3FVjBr4gDTl/m2AT9tNFUIvtysti22HdMKhQNxjoQK6iK1g5TuRAsSRsMkDt76zDZV4zcHKX5dGDqLIERrxvMAtqcSa194joOWb4OkkK759rsQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706373177; c=relaxed/simple; bh=eAd7srBbetTNuoTznQNyc5Zq6J7HU6wdNysZdYd3kxE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=izvwT0QqnBRlWUkDSAi7PJsXCJ3EcnkJlpIkppSQsyjXqGI2EtjOGE/2n39fS9DiIVBJO4FEmkjofvmMEV4ZNP9KS/y4UD9HwFiVJ2/6+wXy14MXEMVkTlmKdpX9otYPgIotqK5Eiy16YlsdDnAM9OfdxMIaPzf/D43hLqRJjq4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ZfxcEB/P; 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="ZfxcEB/P" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 300EBC32782; Sat, 27 Jan 2024 16:32:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1706373177; bh=eAd7srBbetTNuoTznQNyc5Zq6J7HU6wdNysZdYd3kxE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZfxcEB/PjxKgjc/wwsQqMoHdUsXoHcutXwR54Zz40tbIJXiovoDWfeN2uMIdDB59T hM6+YDMoFZqvX6il/E5dr7lY6HkkXWdBiCpifCLQEUR5NwmlSdCKnzXY2qaJo/10sE NtZu6vr8Lxl5EBkdeY3/XyYXBJX+3XDG0lR/cH1WhoneVu0SMDVZZh6qLSf9oq+6w3 GKjLZNe0SXeazRSN53MmOCtRbwLlr/q0iqSECdPaDJWIiqHFXX+cAPde9PawemAPgt Bec634DL1z171RBlA2cLg4ECC8TEDIl+4khHl52kIHZ/Bgf+9Zzj4UDFcU8P/i06cO HeusOAzAQND/g== Received: by wens.tw (Postfix, from userid 1000) id 925475FEC6; 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 7/7] arm64: dts: allwinner: h616: Add SPDIF device node Date: Sun, 28 Jan 2024 00:32:47 +0800 Message-Id: <20240127163247.384439-8-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-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Chen-Yu Tsai The H616 SoC has an SPDIF transmitter hardware block, which has the same layout as the one in the H6, minus the receiver side. Add a device node for it, and a default pinmux. Signed-off-by: Chen-Yu Tsai Reviewed-by: Andre Przywara Acked-by: Jernej Skrabec --- .../arm64/boot/dts/allwinner/sun50i-h616.dtsi | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi index 885809137b9d..b1bf4fb5fc58 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi @@ -253,6 +253,11 @@ spi1_cs0_pin: spi1-cs0-pin { function = "spi1"; }; + spdif_tx_pin: spdif-tx-pin { + pins = "PH4"; + function = "spdif"; + }; + uart0_ph_pins: uart0-ph-pins { pins = "PH0", "PH1"; function = "uart0"; @@ -550,6 +555,21 @@ mdio0: mdio { }; }; + spdif: spdif@5093000 { + compatible = "allwinner,sun50i-h616-spdif"; + reg = <0x05093000 0x400>; + interrupts = ; + 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>; + #sound-dai-cells = <0>; + status = "disabled"; + }; + usbotg: usb@5100000 { compatible = "allwinner,sun50i-h616-musb", "allwinner,sun8i-h3-musb";