From nobody Tue Nov 26 19:46:13 2024 Received: from inva021.nxp.com (inva021.nxp.com [92.121.34.21]) (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 3D9FD20514D; Wed, 16 Oct 2024 09:13:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=92.121.34.21 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729069984; cv=none; b=q9KaEPtiD6a9auMFZ0PdpDkbYmlfRDUlKXbiILmuO1IxCPIzywuN/DL19Nt/S7nsQiEripx0xNpuKf+Ob+/tvfG/29p7M4amAWSc4J5nXoTzd5natmaETDpv8yLqdsbCkQWT+CA9pskS4vHFdzItL/WUQB1rx8rIPxRc4UiCK0I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729069984; c=relaxed/simple; bh=6sTcEybA4fMCSWXMs5hSxNhfiOnyhvZbrHvIAnXfK9s=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References; b=HaLpMBc9XjwoiwEIycl1r6v3oHPfEKc/ZlnfFm3rzuF4Yxal/rFe8lUHP//l0ekRzLkyOnc2GyQ1LJBSTsSM2Boe7Joyjy7Wg9PtPL31OVXCyNjL5Nw7zuroiIp62v9SwtLCknqRtt/Z3kYXUuVBAdZ+VqGys8sIaX5/EYHHmeI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; arc=none smtp.client-ip=92.121.34.21 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Received: from inva021.nxp.com (localhost [127.0.0.1]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id B0FDE20256B; Wed, 16 Oct 2024 11:12:54 +0200 (CEST) Received: from aprdc01srsp001v.ap-rdc01.nxp.com (aprdc01srsp001v.ap-rdc01.nxp.com [165.114.16.16]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 7D833200FED; Wed, 16 Oct 2024 11:12:54 +0200 (CEST) Received: from localhost.localdomain (shlinux2.ap.freescale.net [10.192.224.44]) by aprdc01srsp001v.ap-rdc01.nxp.com (Postfix) with ESMTP id D41571939E62; Wed, 16 Oct 2024 17:12:52 +0800 (+08) From: Shengjiu Wang To: robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, devicetree@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, shengjiu.wang@gmail.com Subject: [PATCH v3 1/3] arm64: dts: imx93-9x9-qsb: Enable sound-wm8962 sound card Date: Wed, 16 Oct 2024 16:49:15 +0800 Message-Id: <1729068557-10073-2-git-send-email-shengjiu.wang@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1729068557-10073-1-git-send-email-shengjiu.wang@nxp.com> References: <1729068557-10073-1-git-send-email-shengjiu.wang@nxp.com> X-Virus-Scanned: ClamAV using ClamSMTP Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add wm8962 sound card which connects to sai3. The connection of SAI3 and wm8962 is controlled by PCAL6524HEAZ module, add gpio-hog for it. Signed-off-by: Shengjiu Wang Reviewed-by: Frank Li --- .../boot/dts/freescale/imx93-9x9-qsb.dts | 74 +++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/arch/arm64/boot/dts/freescale/imx93-9x9-qsb.dts b/arch/arm64/b= oot/dts/freescale/imx93-9x9-qsb.dts index f8a73612fa05..5cb85a83d2ef 100644 --- a/arch/arm64/boot/dts/freescale/imx93-9x9-qsb.dts +++ b/arch/arm64/boot/dts/freescale/imx93-9x9-qsb.dts @@ -68,6 +68,15 @@ reg_vref_1v8: regulator-adc-vref { regulator-max-microvolt =3D <1800000>; }; =20 + reg_audio_pwr: regulator-audio-pwr { + compatible =3D "regulator-fixed"; + regulator-name =3D "audio-pwr"; + regulator-min-microvolt =3D <3300000>; + regulator-max-microvolt =3D <3300000>; + gpio =3D <&pcal6524 16 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; + reg_rpi_3v3: regulator-rpi { compatible =3D "regulator-fixed"; regulator-name =3D "VDD_RPI_3V3"; @@ -88,6 +97,22 @@ reg_usdhc2_vmmc: regulator-usdhc2 { enable-active-high; off-on-delay-us =3D <12000>; }; + + sound-wm8962 { + compatible =3D "fsl,imx-audio-wm8962"; + model =3D "wm8962-audio"; + audio-cpu =3D <&sai3>; + audio-codec =3D <&wm8962>; + hp-det-gpio =3D <&pcal6524 4 GPIO_ACTIVE_HIGH>; + audio-routing =3D + "Headphone Jack", "HPOUTL", + "Headphone Jack", "HPOUTR", + "Ext Spk", "SPKOUTL", + "Ext Spk", "SPKOUTR", + "AMIC", "MICBIAS", + "IN3R", "AMIC", + "IN1R", "AMIC"; + }; }; =20 &adc1 { @@ -136,6 +161,28 @@ &lpi2c1 { pinctrl-0 =3D <&pinctrl_lpi2c1>; status =3D "okay"; =20 + wm8962: audio-codec@1a { + compatible =3D "wlf,wm8962"; + reg =3D <0x1a>; + clocks =3D <&clk IMX93_CLK_SAI3_GATE>; + DCVDD-supply =3D <®_audio_pwr>; + DBVDD-supply =3D <®_audio_pwr>; + AVDD-supply =3D <®_audio_pwr>; + CPVDD-supply =3D <®_audio_pwr>; + MICVDD-supply =3D <®_audio_pwr>; + PLLVDD-supply =3D <®_audio_pwr>; + SPKVDD1-supply =3D <®_audio_pwr>; + SPKVDD2-supply =3D <®_audio_pwr>; + gpio-cfg =3D < + 0x0000 /* 0:Default */ + 0x0000 /* 1:Default */ + 0x0000 /* 2:FN_DMICCLK */ + 0x0000 /* 3:Default */ + 0x0000 /* 4:FN_DMICCDAT */ + 0x0000 /* 5:Default */ + >; + }; + ptn5110: tcpc@50 { compatible =3D "nxp,ptn5110", "tcpci"; reg =3D <0x50>; @@ -194,6 +241,12 @@ pcal6524: gpio@22 { interrupts =3D <26 IRQ_TYPE_LEVEL_LOW>; pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_pcal6524>; + + exp-sel-hog { + gpio-hog; + gpios =3D <22 GPIO_ACTIVE_HIGH>; + output-low; + }; }; =20 pmic@25 { @@ -286,6 +339,17 @@ &mu2 { status =3D "okay"; }; =20 +&sai3 { + pinctrl-names =3D "default"; + pinctrl-0 =3D <&pinctrl_sai3>; + assigned-clocks =3D <&clk IMX93_CLK_SAI3>; + assigned-clock-parents =3D <&clk IMX93_CLK_AUDIO_PLL>; + assigned-clock-rates =3D <12288000>; + fsl,sai-mclk-direction-output; + fsl,sai-synchronous-rx; + status =3D "okay"; +}; + &usbotg1 { dr_mode =3D "otg"; hnp-disable; @@ -443,6 +507,16 @@ MX93_PAD_SD2_RESET_B__GPIO3_IO07 0x31e >; }; =20 + pinctrl_sai3: sai3grp { + fsl,pins =3D < + MX93_PAD_GPIO_IO12__SAI3_RX_SYNC 0x31e + MX93_PAD_GPIO_IO18__SAI3_RX_BCLK 0x31e + MX93_PAD_GPIO_IO17__SAI3_MCLK 0x31e + MX93_PAD_GPIO_IO19__SAI3_TX_DATA00 0x31e + MX93_PAD_GPIO_IO20__SAI3_RX_DATA00 0x31e + >; + }; + pinctrl_usdhc2_gpio: usdhc2gpiogrp { fsl,pins =3D < MX93_PAD_SD2_CD_B__GPIO3_IO00 0x31e --=20 2.34.1 From nobody Tue Nov 26 19:46:13 2024 Received: from inva021.nxp.com (inva021.nxp.com [92.121.34.21]) (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 2504E205E08; Wed, 16 Oct 2024 09:13:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=92.121.34.21 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729069984; cv=none; b=pGcUwLWLDolru44y/Itmkd4LEJKFKAVjlXrVXW4NrrA8nB3w5f8fQ57KxiSq5pKjZlelAW8Utw+yCD/vAJy6V/3CiTMQi0UGmt/UyJyHfL+hVOTAUTIN8mAGfvFG6W4kAvwIm4SzURHUJBRW1gWcb9Hk2Cgj4NmhjusMNX3jy8E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729069984; c=relaxed/simple; bh=BOSQm0wVRdNe3ad2xrkz5I1c76LtSWSU1fSqVzMQAzU=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References; b=RUX6tcRZJl+myty20Vd/+QQd75e2/HCgDC2QB1cmqDr8rMnN8gA7xddLjUFXNuSW/Ij/qoqHd5RJOjMZtxrAMeH4M40BgrxdgHaXc67twLuN+XPOVqwGzzxfaFDqNzSeKFMyU2wOthshKZtfBNj9IHEzRRDkmTmWwqGEbBSA/3w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; arc=none smtp.client-ip=92.121.34.21 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Received: from inva021.nxp.com (localhost [127.0.0.1]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id CAD11201544; Wed, 16 Oct 2024 11:12:55 +0200 (CEST) Received: from aprdc01srsp001v.ap-rdc01.nxp.com (aprdc01srsp001v.ap-rdc01.nxp.com [165.114.16.16]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 98E3B201869; Wed, 16 Oct 2024 11:12:55 +0200 (CEST) Received: from localhost.localdomain (shlinux2.ap.freescale.net [10.192.224.44]) by aprdc01srsp001v.ap-rdc01.nxp.com (Postfix) with ESMTP id F19D51939E61; Wed, 16 Oct 2024 17:12:53 +0800 (+08) From: Shengjiu Wang To: robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, devicetree@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, shengjiu.wang@gmail.com Subject: [PATCH v3 2/3] arm64: dts: imx93-9x9-qsb: add bt-sco sound card support Date: Wed, 16 Oct 2024 16:49:16 +0800 Message-Id: <1729068557-10073-3-git-send-email-shengjiu.wang@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1729068557-10073-1-git-send-email-shengjiu.wang@nxp.com> References: <1729068557-10073-1-git-send-email-shengjiu.wang@nxp.com> X-Virus-Scanned: ClamAV using ClamSMTP Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add bt-sco sound card, which is used by BT HFP case. It supports wb profile as default. Signed-off-by: Shengjiu Wang Reviewed-by: Frank Li --- .../boot/dts/freescale/imx93-9x9-qsb.dts | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/arch/arm64/boot/dts/freescale/imx93-9x9-qsb.dts b/arch/arm64/b= oot/dts/freescale/imx93-9x9-qsb.dts index 5cb85a83d2ef..eb872014c11d 100644 --- a/arch/arm64/boot/dts/freescale/imx93-9x9-qsb.dts +++ b/arch/arm64/boot/dts/freescale/imx93-9x9-qsb.dts @@ -12,6 +12,11 @@ / { model =3D "NXP i.MX93 9x9 Quick Start Board"; compatible =3D "fsl,imx93-9x9-qsb", "fsl,imx93"; =20 + bt_sco_codec: bt-sco-codec { + #sound-dai-cells =3D <1>; + compatible =3D "linux,bt-sco"; + }; + chosen { stdout-path =3D &lpuart1; }; @@ -98,6 +103,25 @@ reg_usdhc2_vmmc: regulator-usdhc2 { off-on-delay-us =3D <12000>; }; =20 + sound-bt-sco { + compatible =3D "simple-audio-card"; + simple-audio-card,name =3D "bt-sco-audio"; + simple-audio-card,format =3D "dsp_a"; + simple-audio-card,bitclock-inversion; + simple-audio-card,frame-master =3D <&btcpu>; + simple-audio-card,bitclock-master =3D <&btcpu>; + + btcpu: simple-audio-card,cpu { + sound-dai =3D <&sai1>; + dai-tdm-slot-num =3D <2>; + dai-tdm-slot-width =3D <16>; + }; + + simple-audio-card,codec { + sound-dai =3D <&bt_sco_codec 1>; + }; + }; + sound-wm8962 { compatible =3D "fsl,imx-audio-wm8962"; model =3D "wm8962-audio"; @@ -339,6 +363,16 @@ &mu2 { status =3D "okay"; }; =20 +&sai1 { + pinctrl-names =3D "default"; + pinctrl-0 =3D <&pinctrl_sai1>; + assigned-clocks =3D <&clk IMX93_CLK_SAI1>; + assigned-clock-parents =3D <&clk IMX93_CLK_AUDIO_PLL>; + assigned-clock-rates =3D <12288000>; + fsl,sai-mclk-direction-output; + status =3D "okay"; +}; + &sai3 { pinctrl-names =3D "default"; pinctrl-0 =3D <&pinctrl_sai3>; @@ -507,6 +541,15 @@ MX93_PAD_SD2_RESET_B__GPIO3_IO07 0x31e >; }; =20 + pinctrl_sai1: sai1grp { + fsl,pins =3D < + MX93_PAD_SAI1_TXC__SAI1_TX_BCLK 0x31e + MX93_PAD_SAI1_TXFS__SAI1_TX_SYNC 0x31e + MX93_PAD_SAI1_TXD0__SAI1_TX_DATA00 0x31e + MX93_PAD_SAI1_RXD0__SAI1_RX_DATA00 0x31e + >; + }; + pinctrl_sai3: sai3grp { fsl,pins =3D < MX93_PAD_GPIO_IO12__SAI3_RX_SYNC 0x31e --=20 2.34.1 From nobody Tue Nov 26 19:46:13 2024 Received: from inva020.nxp.com (inva020.nxp.com [92.121.34.13]) (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 04F6C205E11; Wed, 16 Oct 2024 09:13:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=92.121.34.13 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729069985; cv=none; b=E6Doh60JcwkIh73DvCgNznoifyiPcG3Ksi3kG5Qe5MX1xEoKEBJgERhF469svCBXfhHx4zylo39X0Pkvrl/9UAWqZtt0xa/zLuPJfvw0BlCiLfa/tuoc5HpwZ7tD0GaBU6QwUO82u/iblQnPRA0mQH47qbeuzPenxwSbs28Pd8M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729069985; c=relaxed/simple; bh=Q7YiFkq6G86CYppOK/tGA2/5+gyUMdTXdv0mAC/q77Y=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References; b=bVwuB4dZ+/q7FRkpmkC582gCIoMu7/k1RLLPteRNGN1D5iBGD2/gqm8G3NG1HtxyOdBIDTZDLalU4iX+D9dz+O5tyelprIHBOXX+icvTD5yc08lItzq2p+3XCduAWL5u9cIAgPGDHG5+nWG2h25VkEjxKn84pMNRVKYjbIaDUHo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; arc=none smtp.client-ip=92.121.34.13 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Received: from inva020.nxp.com (localhost [127.0.0.1]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id E68231A199B; Wed, 16 Oct 2024 11:12:56 +0200 (CEST) Received: from aprdc01srsp001v.ap-rdc01.nxp.com (aprdc01srsp001v.ap-rdc01.nxp.com [165.114.16.16]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id AE4DF1A18D9; Wed, 16 Oct 2024 11:12:56 +0200 (CEST) Received: from localhost.localdomain (shlinux2.ap.freescale.net [10.192.224.44]) by aprdc01srsp001v.ap-rdc01.nxp.com (Postfix) with ESMTP id 187131939E62; Wed, 16 Oct 2024 17:12:55 +0800 (+08) From: Shengjiu Wang To: robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, devicetree@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, shengjiu.wang@gmail.com Subject: [PATCH v3 3/3] arm64: dts: imx93-9x9-qsb: Add PDM microphone sound card support Date: Wed, 16 Oct 2024 16:49:17 +0800 Message-Id: <1729068557-10073-4-git-send-email-shengjiu.wang@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1729068557-10073-1-git-send-email-shengjiu.wang@nxp.com> References: <1729068557-10073-1-git-send-email-shengjiu.wang@nxp.com> X-Virus-Scanned: ClamAV using ClamSMTP Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add PDM micphone sound card support, configure the pinmux. This sound card supports recording sound from PDM microphone and convert the PDM format data to PCM data. Signed-off-by: Shengjiu Wang Reviewed-by: Frank Li --- .../boot/dts/freescale/imx93-9x9-qsb.dts | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/arch/arm64/boot/dts/freescale/imx93-9x9-qsb.dts b/arch/arm64/b= oot/dts/freescale/imx93-9x9-qsb.dts index eb872014c11d..10f931e334e2 100644 --- a/arch/arm64/boot/dts/freescale/imx93-9x9-qsb.dts +++ b/arch/arm64/boot/dts/freescale/imx93-9x9-qsb.dts @@ -122,6 +122,20 @@ simple-audio-card,codec { }; }; =20 + sound-micfil { + compatible =3D "fsl,imx-audio-card"; + model =3D "micfil-audio"; + + pri-dai-link { + link-name =3D "micfil hifi"; + format =3D "i2s"; + + cpu { + sound-dai =3D <&micfil>; + }; + }; + }; + sound-wm8962 { compatible =3D "fsl,imx-audio-wm8962"; model =3D "wm8962-audio"; @@ -271,6 +285,12 @@ exp-sel-hog { gpios =3D <22 GPIO_ACTIVE_HIGH>; output-low; }; + + mic-can-sel-hog { + gpio-hog; + gpios =3D <17 GPIO_ACTIVE_HIGH>; + output-low; + }; }; =20 pmic@25 { @@ -355,6 +375,15 @@ &lpuart1 { /* console */ status =3D "okay"; }; =20 +&micfil { + pinctrl-names =3D "default"; + pinctrl-0 =3D <&pinctrl_pdm>; + assigned-clocks =3D <&clk IMX93_CLK_PDM>; + assigned-clock-parents =3D <&clk IMX93_CLK_AUDIO_PLL>; + assigned-clock-rates =3D <49152000>; + status =3D "okay"; +}; + &mu1 { status =3D "okay"; }; @@ -468,6 +497,14 @@ MX93_PAD_CCM_CLKO1__GPIO3_IO26 0x31e >; }; =20 + pinctrl_pdm: pdmgrp { + fsl,pins =3D < + MX93_PAD_PDM_CLK__PDM_CLK 0x31e + MX93_PAD_PDM_BIT_STREAM0__PDM_BIT_STREAM00 0x31e + MX93_PAD_PDM_BIT_STREAM1__PDM_BIT_STREAM01 0x31e + >; + }; + pinctrl_uart1: uart1grp { fsl,pins =3D < MX93_PAD_UART1_RXD__LPUART1_RX 0x31e --=20 2.34.1