From patchwork Thu Mar 30 09:44:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jai Luthra X-Patchwork-Id: 13193738 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9CE38C6FD1D for ; Thu, 30 Mar 2023 09:45:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:CC:To:In-Reply-To:References:Message-ID :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=TNYGjTZxX6DfmbmuBa9Du9zURerXqD1IMJjQ2us5d80=; b=GC1+ucxqkQ58nx I60Lx49VogoRFzgog9IS9K3TQNkbrfc3pVekZoH8DPGmDp2ZQRv4zyGv5VFF7DVXVCqiQTVXV9c0y BbnRChbmRQgb6mOukf/5x5hyHL9tFtFFdF9Q9vmQYaj6FZqVfHloG/kemTCCCNBFFDhuzxymgyIwu fDV142JeoMw16UeG9z2jND5Hmr40+vrKnwVYJALE8Pv+9wxzt7tnFK12IGIGT0T1PNLxCrOBliDfU 1Sl32l19qNhZLLPJqPZdfNb/rzuT/KHy2tx+Z0dOkz0U4fKaxAGs+D+3FypvAXMyZ6PFbsraVgjTq TtQb6stcl8fPqoLVxLSw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1phoq9-003K7l-07; Thu, 30 Mar 2023 09:45:05 +0000 Received: from lelv0142.ext.ti.com ([198.47.23.249]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1phoq0-003K3h-1v for linux-arm-kernel@lists.infradead.org; Thu, 30 Mar 2023 09:44:58 +0000 Received: from lelv0266.itg.ti.com ([10.180.67.225]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id 32U9inHJ096110; Thu, 30 Mar 2023 04:44:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1680169489; bh=AlMhjL9CRajVtBVIkCsJW9Rh4YIfgaRLVDCN7Vup2sk=; h=From:Date:Subject:References:In-Reply-To:To:CC; b=PbYDhFxJooN6EuOGoaKig78FqUQg35MdnZFL01EIG0zKdH0omUZjlbZpt8mv34ZtX ayAC5xc9Cmcnrn3YXOms27gI8yFdNQgd0jMaWFZ5ZiYdT/jnExzP7dfMrm48buQ0Mt 4N8H/GEGMLgUuCXH+0TdsG2v4DyJssNS9pJ11QOg= Received: from DFLE113.ent.ti.com (dfle113.ent.ti.com [10.64.6.34]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 32U9ingK003609 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 30 Mar 2023 04:44:49 -0500 Received: from DFLE105.ent.ti.com (10.64.6.26) by DFLE113.ent.ti.com (10.64.6.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16; Thu, 30 Mar 2023 04:44:49 -0500 Received: from fllv0040.itg.ti.com (10.64.41.20) by DFLE105.ent.ti.com (10.64.6.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16 via Frontend Transport; Thu, 30 Mar 2023 04:44:49 -0500 Received: from localhost (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by fllv0040.itg.ti.com (8.15.2/8.15.2) with ESMTP id 32U9igI6097036; Thu, 30 Mar 2023 04:44:43 -0500 From: Jai Luthra Date: Thu, 30 Mar 2023 15:14:05 +0530 Subject: [PATCH v10 1/3] arm64: dts: ti: k3-am62-main: Add McASP nodes MIME-Version: 1.0 Message-ID: <20230313-mcasp_upstream-v10-1-94332149657a@ti.com> References: <20230313-mcasp_upstream-v10-0-94332149657a@ti.com> In-Reply-To: <20230313-mcasp_upstream-v10-0-94332149657a@ti.com> To: Nishanth Menon , Vignesh Raghavendra , Tero Kristo , Catalin Marinas , Will Deacon , Rob Herring , Krzysztof Kozlowski CC: , , , Aradhya Bhatia , Devarsh Thakkar , Jayesh Choudhary , Andrew Davis , Jai Luthra X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2740; i=j-luthra@ti.com; h=from:subject:message-id; bh=oJGd3Jm0QelcHLq5dxDiEcHYIhZUcAN3ApL/B7AF7lc=; b=owEBbQKS/ZANAwAKAUPekfkkmnFFAcsmYgBkJVoF3HH73cO97rLBmOlq+Fw3/oW8P95DyvDW7 10cp/ora0WJAjMEAAEKAB0WIQRN4NgY5dV16NRar8VD3pH5JJpxRQUCZCVaBQAKCRBD3pH5JJpx Rb4wD/9/9xSO+9zgUDjoM2vjgleKV/R88+dPDqNE0ybjfdwl+QkGLzIj3ndvuurXC9XUaitakXp vx0K5HxLC/hn26CmvcBIB50ikx75f8W2YZQtJW7zRLwwmjkhvZLjMR7M++tm3f0rORt8b11lDCA RF+K7Ddq6uyjZx4c7jgLwDfbfextvazsHcrQ8Bqvb+m8wTEZApnUPDV/WIqg3nb9LuS3jZRu0eb eYHAvCZuSiBenHEaFH/SGYxSBwnQL79sECJYoAHc5A/fnw2NPUk1V2D9dP+rMH5IvwkS7RVBFRg M0UgP0XXeiYM0otowrenvPzZyzWejT2xnBFEap4rIYpnr9RCw0KZ6Kn2h6TfGQJuD5EifwNUHMP tI6iU/CYVHNzGRluQd0o96we7e1Q/JOFOOFceZVju+6ykqFMe89cFDUAzrgwDDMBPjaWP6JU8ka 7nnY0ybwJGRmpn738wOQq4scPkZh7sQQxo5J4gPSboKMvpV/VJYVDjt3UPqMpbjOsz0hfqR3uJx 32mU+7OR4M7Pu5lE5no9rQTR7AA6tC/biwhxDOw1lMes0cHMXjDIP0rlkP5mx6vMoeQf2XoiS/s 0bqXcMSM2xPwJaKi5VpahwAvHRpW87GB9HHgR6FSqHZRG9LEM8J85IkdtUCBdJMvMRpvyA3MsI/ qvUYNVmXHFcXkJA== X-Developer-Key: i=j-luthra@ti.com; a=openpgp; fpr=4DE0D818E5D575E8D45AAFC543DE91F9249A7145 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230330_024456_727308_A462A0D8 X-CRM114-Status: UNSURE ( 9.83 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Jayesh Choudhary Add the nodes for McASP 0-2. Use the audio-friendly 96MHz main_1_hsdivout6_clk as clock parent instead of the default 100Mhz main_2_hsdivout8_clk source. Signed-off-by: Jayesh Choudhary Signed-off-by: Jai Luthra Reviewed-by: Andrew Davis --- arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 60 ++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/arch/arm64/boot/dts/ti/k3-am62-main.dtsi b/arch/arm64/boot/dts/ti/k3-am62-main.dtsi index 16e14863d7df..b3e4857bbbe4 100644 --- a/arch/arm64/boot/dts/ti/k3-am62-main.dtsi +++ b/arch/arm64/boot/dts/ti/k3-am62-main.dtsi @@ -832,4 +832,64 @@ epwm2: pwm@23020000 { clock-names = "tbclk", "fck"; status = "disabled"; }; + + mcasp0: audio-controller@2b00000 { + compatible = "ti,am33xx-mcasp-audio"; + reg = <0x00 0x02b00000 0x00 0x2000>, + <0x00 0x02b08000 0x00 0x400>; + reg-names = "mpu", "dat"; + interrupts = , + ; + interrupt-names = "tx", "rx"; + + dmas = <&main_bcdma 0 0xc500 0>, <&main_bcdma 0 0x4500 0>; + dma-names = "tx", "rx"; + + clocks = <&k3_clks 190 0>; + clock-names = "fck"; + assigned-clocks = <&k3_clks 190 0>; + assigned-clock-parents = <&k3_clks 190 2>; + power-domains = <&k3_pds 190 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; + }; + + mcasp1: audio-controller@2b10000 { + compatible = "ti,am33xx-mcasp-audio"; + reg = <0x00 0x02b10000 0x00 0x2000>, + <0x00 0x02b18000 0x00 0x400>; + reg-names = "mpu", "dat"; + interrupts = , + ; + interrupt-names = "tx", "rx"; + + dmas = <&main_bcdma 0 0xc501 0>, <&main_bcdma 0 0x4501 0>; + dma-names = "tx", "rx"; + + clocks = <&k3_clks 191 0>; + clock-names = "fck"; + assigned-clocks = <&k3_clks 191 0>; + assigned-clock-parents = <&k3_clks 191 2>; + power-domains = <&k3_pds 191 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; + }; + + mcasp2: audio-controller@2b20000 { + compatible = "ti,am33xx-mcasp-audio"; + reg = <0x00 0x02b20000 0x00 0x2000>, + <0x00 0x02b28000 0x00 0x400>; + reg-names = "mpu", "dat"; + interrupts = , + ; + interrupt-names = "tx", "rx"; + + dmas = <&main_bcdma 0 0xc502 0>, <&main_bcdma 0 0x4502 0>; + dma-names = "tx", "rx"; + + clocks = <&k3_clks 192 0>; + clock-names = "fck"; + assigned-clocks = <&k3_clks 192 0>; + assigned-clock-parents = <&k3_clks 192 2>; + power-domains = <&k3_pds 192 TI_SCI_PD_EXCLUSIVE>; + status = "disabled"; + }; }; From patchwork Thu Mar 30 09:44:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jai Luthra X-Patchwork-Id: 13193740 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 50064C77B60 for ; Thu, 30 Mar 2023 09:45:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:CC:To:In-Reply-To:References:Message-ID :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=tgThPc5eEkbN10cOkhfo0T2u1agoHWnVxhZ2luL3yPA=; b=tV2i7kMo7YgVDy 3GUxf+wSIVUemHg3oiWfXTBMnuRlzDIMr7GbazudyASLOxlbBe1uxNNXeH1XpwTkYEOTEJZCu38bi 65N6AN/OKELMzLx4mpYQkNVPwuvT30WL73IiVykLKL1gKJwxgyyBiApDkTDRym0cU0/QoZuoDsE77 6VgpuVqU/W5aKk5KEfHGGiG0RmmcXZjsqr2r9fSyUA9IEok/oPohtmltkStEeHjqmUOa/nlT5jKDd AFlYQowS+lQ+97Es9rOur9VjKXMQVuE4PWIYosUZbeD067ab0i4ojA+QHgWG4fU0ZF2xpZ5Du5a05 RpmrXg0XUBkk1RyD+ioA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1phoqA-003K87-04; Thu, 30 Mar 2023 09:45:06 +0000 Received: from fllv0015.ext.ti.com ([198.47.19.141]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1phoq2-003K4Y-0a for linux-arm-kernel@lists.infradead.org; Thu, 30 Mar 2023 09:44:59 +0000 Received: from fllv0034.itg.ti.com ([10.64.40.246]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 32U9ip1Z012217; Thu, 30 Mar 2023 04:44:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1680169491; bh=BcDIjJzjHM+N/vIcwapsyTbufzOIObtBASc/eP3RZoY=; h=From:Date:Subject:References:In-Reply-To:To:CC; b=IDEjAYfbYtctMKxgMjw1gonoHtbT1gywv0S2qG5QhWh5pSMn3hSZMt/OLDYDvQG7R CKCGfi+TJD3xDGF3WVLFAjQH3BSkl6p9T+mLGjga9oXH5Rf3t+u3brv7tKzq7lE0In Jw30VnlJIQYoduKJh0OKujFLpjNM23nz8CmDD7zU= Received: from DLEE112.ent.ti.com (dlee112.ent.ti.com [157.170.170.23]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 32U9ipGo126016 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 30 Mar 2023 04:44:51 -0500 Received: from DLEE110.ent.ti.com (157.170.170.21) by DLEE112.ent.ti.com (157.170.170.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16; Thu, 30 Mar 2023 04:44:51 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DLEE110.ent.ti.com (157.170.170.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16 via Frontend Transport; Thu, 30 Mar 2023 04:44:51 -0500 Received: from localhost (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 32U9iowg107066; Thu, 30 Mar 2023 04:44:50 -0500 From: Jai Luthra Date: Thu, 30 Mar 2023 15:14:06 +0530 Subject: [PATCH v10 2/3] arm64: dts: ti: Enable audio on SK-AM62(-LP) MIME-Version: 1.0 Message-ID: <20230313-mcasp_upstream-v10-2-94332149657a@ti.com> References: <20230313-mcasp_upstream-v10-0-94332149657a@ti.com> In-Reply-To: <20230313-mcasp_upstream-v10-0-94332149657a@ti.com> To: Nishanth Menon , Vignesh Raghavendra , Tero Kristo , Catalin Marinas , Will Deacon , Rob Herring , Krzysztof Kozlowski CC: , , , Aradhya Bhatia , Devarsh Thakkar , Jayesh Choudhary , Andrew Davis , Jai Luthra X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4664; i=j-luthra@ti.com; h=from:subject:message-id; bh=Q+DrbQqKkVZKHL1+fZFKT0R9RrX4odqVY5iWfqn0blo=; b=owEBbQKS/ZANAwAKAUPekfkkmnFFAcsmYgBkJVoFQYr/KMFWODnOKxTQqqXaZy4jFItaKnytD B3AAeOhIM2JAjMEAAEKAB0WIQRN4NgY5dV16NRar8VD3pH5JJpxRQUCZCVaBQAKCRBD3pH5JJpx RVsnEACdlmJvCBpAwnyV89JQID2dDiFOgEw05vrdFFk5D51Mm4a/kkfuXcFlox/gBIN9yHRWNPq VJGytbdxT3f0FbvuMqPQ199FqBi508QZqJZJwj2+rN4LOAN4TwC3i7GeMaEOVdAm8Z4etwWMTy+ weo5+Fyb11Qx3lv+feKbngwkmxnVdGlBGhK2LLHQAxaXMOgerXuZXM+T0H7GLt43X7g26kDV6ai ID1gUQR/Z9y9w7m9Oub24J9ytPcHrnWVbVQxmeWGcM4oIsT8vvPYSg+igwRYMFM3c2Pv0C21Vfq k+iNBYnOBe3DKM9geF9hch9Z/vG1dT7KWi+EhOt8CoPsVrwgF3ZjBIHmD2hz5VwJ1rQ/U1NtM77 YU0eUGsPttdrpfMdsHAI+EE1q3Z71T5DCAy87+MqTDRhV+v4ema1UVdV6aTHbYsIbv/qSodBIr1 gyWlu+b7dwSFqfi+cy94S63c9aCfhfTmYnuw56Q2d+7v+84J8wEtziJZ51P/1c7tMSksi4Jk9sC K6P+CtJ6LxE+p+LIWf7E2RZ3jH2Eg7qcsyaSJSugIin1b9QcTA+205XInXc0lIL37MuBoI7Ecao Z9FrcQeL/CebKEKP7WqqHtEQVRSS/zBcF1tjkqQQelBapWy269NvrTxADjSOTMa4RQfK1Nx9qDp hXMoOEL/SMtxpDA== X-Developer-Key: i=j-luthra@ti.com; a=openpgp; fpr=4DE0D818E5D575E8D45AAFC543DE91F9249A7145 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230330_024458_307900_96F1F779 X-CRM114-Status: GOOD ( 12.71 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add nodes for audio codec and sound card, enable the audio serializer (McASP1) under use from SK-AM62 E2 [1] onwards and update pinmux. Keep all audio related nodes in the common dtsi as they are exactly the same between SK-AM62 and SK-AM62-LP [2]. Link: https://www.ti.com/lit/zip/sprr448 [1] Link: https://www.ti.com/lit/zip/sprr471 [2] Signed-off-by: Jai Luthra Reviewed-by: Jayesh Choudhary --- arch/arm64/boot/dts/ti/k3-am62-lp-sk.dts | 4 ++ arch/arm64/boot/dts/ti/k3-am625-sk.dts | 15 +++++ arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi | 76 ++++++++++++++++++++++++++ 3 files changed, 95 insertions(+) diff --git a/arch/arm64/boot/dts/ti/k3-am62-lp-sk.dts b/arch/arm64/boot/dts/ti/k3-am62-lp-sk.dts index b2ca19e3042e..4b94f7a86316 100644 --- a/arch/arm64/boot/dts/ti/k3-am62-lp-sk.dts +++ b/arch/arm64/boot/dts/ti/k3-am62-lp-sk.dts @@ -225,3 +225,7 @@ ldo4_reg: ldo4 { }; }; }; + +&tlv320aic3106 { + DVDD-supply = <&buck2_reg>; +}; diff --git a/arch/arm64/boot/dts/ti/k3-am625-sk.dts b/arch/arm64/boot/dts/ti/k3-am625-sk.dts index cdc0858dd1b2..2a1adda9bff6 100644 --- a/arch/arm64/boot/dts/ti/k3-am625-sk.dts +++ b/arch/arm64/boot/dts/ti/k3-am625-sk.dts @@ -87,6 +87,17 @@ vdd_sd_dv: regulator-4 { states = <1800000 0x0>, <3300000 0x1>; }; + + vcc_1v8: regulator-5 { + /* output of TPS6282518DMQ */ + compatible = "regulator-fixed"; + regulator-name = "vcc_1v8"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + vin-supply = <&vcc_3v3_sys>; + regulator-always-on; + regulator-boot-on; + }; }; &main_pmx0 { @@ -256,3 +267,7 @@ partition@3fc0000 { }; }; }; + +&tlv320aic3106 { + DVDD-supply = <&vcc_1v8>; +}; diff --git a/arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi b/arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi index 54318a07d50c..e197ea5fa448 100644 --- a/arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi +++ b/arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi @@ -81,6 +81,41 @@ led-0 { default-state = "off"; }; }; + + tlv320_mclk: clk-0 { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <12288000>; + }; + + codec_audio: sound { + compatible = "simple-audio-card"; + simple-audio-card,name = "AM62x-SKEVM"; + simple-audio-card,widgets = + "Headphone", "Headphone Jack", + "Line", "Line In", + "Microphone", "Microphone Jack"; + simple-audio-card,routing = + "Headphone Jack", "HPLOUT", + "Headphone Jack", "HPROUT", + "LINE1L", "Line In", + "LINE1R", "Line In", + "MIC3R", "Microphone Jack", + "Microphone Jack", "Mic Bias"; + simple-audio-card,format = "dsp_b"; + simple-audio-card,bitclock-master = <&sound_master>; + simple-audio-card,frame-master = <&sound_master>; + simple-audio-card,bitclock-inversion; + + simple-audio-card,cpu { + sound-dai = <&mcasp1>; + }; + + sound_master: simple-audio-card,codec { + sound-dai = <&tlv320aic3106>; + clocks = <&tlv320_mclk>; + }; + }; }; &main_pmx0 { @@ -175,6 +210,15 @@ main_usb1_pins_default: main-usb1-pins-default { AM62X_IOPAD(0x0258, PIN_OUTPUT, 0) /* (F18/E16) USB1_DRVVBUS */ >; }; + + main_mcasp1_pins_default: main-mcasp1-pins-default { + pinctrl-single,pins = < + AM62X_IOPAD(0x090, PIN_INPUT, 2) /* (M24) GPMC0_BE0N_CLE.MCASP1_ACLKX */ + AM62X_IOPAD(0x098, PIN_INPUT, 2) /* (U23) GPMC0_WAIT0.MCASP1_AFSX */ + AM62X_IOPAD(0x08c, PIN_OUTPUT, 2) /* (L25) GPMC0_WEN.MCASP1_AXR0 */ + AM62X_IOPAD(0x084, PIN_INPUT, 2) /* (L23) GPMC0_ADVN_ALE.MCASP1_AXR2 */ + >; + }; }; &wkup_uart0 { @@ -205,6 +249,18 @@ &main_i2c1 { pinctrl-names = "default"; pinctrl-0 = <&main_i2c1_pins_default>; clock-frequency = <400000>; + + tlv320aic3106: audio-codec@1b { + #sound-dai-cells = <0>; + compatible = "ti,tlv320aic3106"; + reg = <0x1b>; + ai3x-micbias-vg = <1>; /* 2.0V */ + + /* Regulators */ + AVDD-supply = <&vcc_3v3_sys>; + IOVDD-supply = <&vcc_3v3_sys>; + DRVDD-supply = <&vcc_3v3_sys>; + }; }; &sdhci0 { @@ -272,3 +328,23 @@ &usb1 { pinctrl-names = "default"; pinctrl-0 = <&main_usb1_pins_default>; }; + +&mcasp1 { + status = "okay"; + #sound-dai-cells = <0>; + + pinctrl-names = "default"; + pinctrl-0 = <&main_mcasp1_pins_default>; + + op-mode = <0>; /* MCASP_IIS_MODE */ + tdm-slots = <2>; + + serial-dir = < /* 0: INACTIVE, 1: TX, 2: RX */ + 1 0 2 0 + 0 0 0 0 + 0 0 0 0 + 0 0 0 0 + >; + tx-num-evt = <32>; + rx-num-evt = <32>; +}; From patchwork Thu Mar 30 09:44:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jai Luthra X-Patchwork-Id: 13193739 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A0B52C761A6 for ; Thu, 30 Mar 2023 09:45:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:CC:To:In-Reply-To:References:Message-ID :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Vw9WVxVEpo7HMUMlWmjWEPjQHRS/l2n1cczUfOEuA+g=; b=x6FZKilsHOW4Mh 6ZIlZ8hF56qIu+/DEP3QdbcyCezVBAS4b2TW7r4uvUALsDFXo94+UJ6S/53y32iLcudHdplCpNQJq 1q455yt5YjV40dkEZpNNGvKH8ZqbTBT1OoGvwZpy+FsUMK70MNyy7JCpeVYRnQLGVML0CMdpZRHyz w6E0VT7vrkVdXgbwlzRjXORV70NwxSE7+8+7q4fWv8XSc1YqDHH3Hw0FZZaKgmCoUw18ggpnCugDz Oa/FduZIXzf1ZQsemC30UosOBUDAST7ssujjBpMpZoaLIzwZN6cSm6Pxm2EN8WOIzGqdnX+bgesxA sTq/LPbWWmVSZIIhjouA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1phoqB-003K8k-0E; Thu, 30 Mar 2023 09:45:07 +0000 Received: from lelv0142.ext.ti.com ([198.47.23.249]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1phoq3-003K5E-0M for linux-arm-kernel@lists.infradead.org; Thu, 30 Mar 2023 09:45:00 +0000 Received: from lelv0266.itg.ti.com ([10.180.67.225]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id 32U9isxB096122; Thu, 30 Mar 2023 04:44:54 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1680169494; bh=soXE9bktBToEycLhN2zBXHfzs7BMojhJ2uSbbRGceRg=; h=From:Date:Subject:References:In-Reply-To:To:CC; b=RxGwGMxvxqN9FQFS/ng2/gWJFwRB9iKQ415zy27lNl/KlGS01lHv5jbQi3NsrNVwk 5nK1iZyEkB0Vg/6ZDweFuJHTE8TmoM3B/PQzmwNPoF2JRHvRRprDNtHsTu54hlh0b2 6Mp2P+23ciEOCUbzYEumQaTz5RDUY/C/72LCS7RM= Received: from DLEE104.ent.ti.com (dlee104.ent.ti.com [157.170.170.34]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 32U9is3C003683 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 30 Mar 2023 04:44:54 -0500 Received: from DLEE103.ent.ti.com (157.170.170.33) by DLEE104.ent.ti.com (157.170.170.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16; Thu, 30 Mar 2023 04:44:53 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DLEE103.ent.ti.com (157.170.170.33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16 via Frontend Transport; Thu, 30 Mar 2023 04:44:53 -0500 Received: from localhost (ileaxei01-snat.itg.ti.com [10.180.69.5]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 32U9iq9n107081; Thu, 30 Mar 2023 04:44:53 -0500 From: Jai Luthra Date: Thu, 30 Mar 2023 15:14:07 +0530 Subject: [PATCH v10 3/3] arm64: defconfig: Enable audio drivers for SK-AM62 MIME-Version: 1.0 Message-ID: <20230313-mcasp_upstream-v10-3-94332149657a@ti.com> References: <20230313-mcasp_upstream-v10-0-94332149657a@ti.com> In-Reply-To: <20230313-mcasp_upstream-v10-0-94332149657a@ti.com> To: Nishanth Menon , Vignesh Raghavendra , Tero Kristo , Catalin Marinas , Will Deacon , Rob Herring , Krzysztof Kozlowski CC: , , , Aradhya Bhatia , Devarsh Thakkar , Jayesh Choudhary , Andrew Davis , Jai Luthra X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1095; i=j-luthra@ti.com; h=from:subject:message-id; bh=ZO8au2iG1cOBrDND8B5Vouipf0z2YJCHnxzIsKjkbGw=; b=owEBbQKS/ZANAwAKAUPekfkkmnFFAcsmYgBkJVoG+woVuZG1ZDiiAsh6vvTVTjXZ0bVKGZkff w8XogN7X1mJAjMEAAEKAB0WIQRN4NgY5dV16NRar8VD3pH5JJpxRQUCZCVaBgAKCRBD3pH5JJpx Rf9eD/0T6B2Tokl85gKZuEBLPLVA8xMT+WJrFLE7ueXloWjkrz2TBcq9N3L2RwTqX0/B5PqwEjz 0VsI2LtN+5uNRPipwU5QpWJ2cwAzU45lklmFJnscrdBu8KSJ5snJBx6RQ1Wl/pvYPhJzb37s/kX yigjsRe6VnbX8CI6OwfcmrCdv3LDVr7s+55c73QluVSZ3ySOez6Ay+/CgDYBHyd6QwKgExAK/W7 aflxGsni8tc57+ISnz1T7GRvQ3PCoMMmROvpNhKCUUvPuX96QvEqrR3wABoc8fZG+1Qp+9vqQKT WYkY8o4byRQ0e2HC4fr8wHRtX6Ki1L95hWLf84hqfDSRvjlUM7rmWeu4u4mXOEIjqKKfJ+qktki NVimR6x3ZdIDZlCXaHNLjAIC3D++yoM/p+bOqHThTjHSQm5Q2FOLxB9UzA5fcxsStn/KQHfeJCU fAQ//23xauZq4toQ+mCkFig4QOsz9T1rzSvKGBl88LjAeqUm22Y7TfSYcMy7RRu6+SfSLywQYit 8crN/QWym1nwedCIAZJTAq5kWTtDJh2R3u0zp6/j6zdHH4aWtM/JL6E5O1MdAM/KR34lQxu6JYD 55y7aScbgLUF9SgpBp/x0TUH/fgEdejUv2z72wdTT4FVIBNLlXxZYlL0yv/QMZT7VJYmSaMPg/U zEvt5jyUpXxubnA== X-Developer-Key: i=j-luthra@ti.com; a=openpgp; fpr=4DE0D818E5D575E8D45AAFC543DE91F9249A7145 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230330_024459_234744_299BD906 X-CRM114-Status: UNSURE ( 9.25 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org TI's K3 platform uses McASP as the digital audio interface on the SoCs. SK-AM62, SK-AM62-LP and SK-AM62A also use the TLV320AIC3106 codec with a 3.5mm jack for analog audio input and output. Signed-off-by: Jai Luthra Reviewed-by: Devarsh Thakkar --- arch/arm64/configs/defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index ca3569261713..a13119aecaa1 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -877,6 +877,7 @@ CONFIG_SND_SOC_TEGRA210_AMX=m CONFIG_SND_SOC_TEGRA210_ADX=m CONFIG_SND_SOC_TEGRA210_MIXER=m CONFIG_SND_SOC_TEGRA_AUDIO_GRAPH_CARD=m +CONFIG_SND_SOC_DAVINCI_MCASP=m CONFIG_SND_SOC_AK4613=m CONFIG_SND_SOC_ES7134=m CONFIG_SND_SOC_ES7241=m @@ -891,6 +892,7 @@ CONFIG_SND_SOC_SIMPLE_MUX=m CONFIG_SND_SOC_TAS2552=m CONFIG_SND_SOC_TAS571X=m CONFIG_SND_SOC_TLV320AIC32X4_I2C=m +CONFIG_SND_SOC_TLV320AIC3X_I2C=m CONFIG_SND_SOC_WCD9335=m CONFIG_SND_SOC_WCD934X=m CONFIG_SND_SOC_WM8524=m