From patchwork Sun Oct 8 14:02:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 13412732 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 BD2B6E95A8F for ; Sun, 8 Oct 2023 14:03:30 +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:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=S6dq9wHSwYdPTy2vitaewKviSHGcQg1gJbF3D/zuHWM=; b=Ihs4UJW0ciCppp h3q8RbNRewpw3BKenFwivbQlfElo14n4E75MV8jgDgJ83Z+sfQYNjE4qXjoBGleXl/+6wE5QlnVXt bMVUjpj5Hoy7IIucFzWff7UFAAcJLmbRprg7EtlYv3glbN2ZeHW2/R0QisXNBkzTnV8QDs3Jag/Ox LhA4h/7Mbhccg02k7y8dHX/kdUontAhi9dPzl1eceJSpD1lZ132DkN+io1rv4ramYUDz85ZJz8kgW JSEIaqLz5K5/fu+znNcZREKAfye0pQ1RHKbLlHibxJBBJJYT29oBIzb6f3y1BeLZQtCtIM7sPutXA 5P+5oG+92WOkWOa103sQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qpUMx-008vRT-0O; Sun, 08 Oct 2023 14:02:55 +0000 Received: from mail-il1-x130.google.com ([2607:f8b0:4864:20::130]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qpUMu-008vQh-1S for linux-arm-kernel@lists.infradead.org; Sun, 08 Oct 2023 14:02:53 +0000 Received: by mail-il1-x130.google.com with SMTP id e9e14a558f8ab-352a22e1471so15729465ab.0 for ; Sun, 08 Oct 2023 07:02:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696773770; x=1697378570; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=i817gm/mHayZlPnquKIwRuj/bCQb7oFHdZW9Ygf1Wzw=; b=aymSgS5TGBkoQIdLZRHGCUjoNTJbsmsRDt+GgD5VCAG95yHfEoJPN9jSiLQ9LOxyIP QdXgsHfpz5ZzvSyEn2GN+NOBp+tOq1zws8hsii/UFbiT66tQKioLQt2EvbqTGgDawqnh B4lJttWAlXoY5Zf7udzIwdFKMrHm/2PVtz2BzmJV+02yvfjV32u5703RSzTx0C8vNrH7 jeAVFGgCgPOI13N7Ul3tHwEyx4jksdmklA91YddZJsA7biTizBjyoUmGlzv/Nu2GQbp1 oABINpP+FrLFXOCFS2Z3cSxtCeJuDrKYT3RgYZc5J37oxW449IIWElLglhGLtb53JmY4 Yh3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696773770; x=1697378570; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=i817gm/mHayZlPnquKIwRuj/bCQb7oFHdZW9Ygf1Wzw=; b=XCNUX4o0rtPTlxOYziINteMwSPg2ygQFhqdrBhlhxBu4GrwPMYQbYFOstBqWY9/KIJ rOeiF4idpMGxKXki08clY4ZEQ2NitQDGFge0eyDE7aExQPW7UTb1Vu0hbfUzUSEpPRt9 IEEuUJJhk6M4f8AdFbzmXO84xaRzYpWobR8gtklik23xi4sHXUnnpe+ngTdZ1vT2yc9k VRiZ7FTXUNjGppQFYDdy78OnbTjoZYm0RaTA9CKQCiLIMFfc9eYia2DyE320U0cP5BZL yw7835P3svIsNz43TwFlUJESFALeMYvu+yMUgjs3/QUjidWrVAtoMgxxmOvIxOY42mo/ Wz8g== X-Gm-Message-State: AOJu0YxY30adWqQ0lbpcw3l9hcxVTc8jGZVwL7LSwp8KhJ7ADkQHP9Uw x882l3kfrBY8av+dEEtpOTN3It54s4U= X-Google-Smtp-Source: AGHT+IHRU/p6K757tMjeqS8Ii2krhvKfRulLKOsvixbCZCCoLxXOmhUGypkPJ7IguLsJm9buWGS/YQ== X-Received: by 2002:a05:6e02:d45:b0:345:66f5:3404 with SMTP id h5-20020a056e020d4500b0034566f53404mr13375528ilj.0.1696773770370; Sun, 08 Oct 2023 07:02:50 -0700 (PDT) Received: from aford-System-Version.lan ([2601:447:d002:5be:a2fe:632a:2360:50d3]) by smtp.gmail.com with ESMTPSA id 2-20020a921302000000b0035134f1a240sm2272901ilt.86.2023.10.08.07.02.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Oct 2023 07:02:49 -0700 (PDT) From: Adam Ford To: linux-arm-kernel@lists.infradead.org Cc: aford@beaconembedded.com, Adam Ford , Fabio Estevam , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , NXP Linux Team , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH V3 1/4] arm64: dts: imx8mm-beacon: Migrate sound card to simple-audio-card Date: Sun, 8 Oct 2023 09:02:35 -0500 Message-Id: <20231008140239.6601-1-aford173@gmail.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231008_070252_487838_293A8053 X-CRM114-Status: UNSURE ( 9.50 ) 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 Instead of using a custom glue layer connecting the wm8962 CODEC to the SAI3 sound-dai, migrate the sound card to simple-audio-card. This also brings this board in line with the imx8mn-beacon and imx8mp-beacon. Signed-off-by: Adam Ford Reviewed-by: Fabio Estevam --- V3: No Change V2: No Change diff --git a/arch/arm64/boot/dts/freescale/imx8mm-beacon-baseboard.dtsi b/arch/arm64/boot/dts/freescale/imx8mm-beacon-baseboard.dtsi index b10e2a703a44..313e93663d6f 100644 --- a/arch/arm64/boot/dts/freescale/imx8mm-beacon-baseboard.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mm-beacon-baseboard.dtsi @@ -98,18 +98,30 @@ reg_usdhc2_vmmc: regulator-usdhc2 { enable-active-high; }; - sound { - compatible = "fsl,imx-audio-wm8962"; - model = "wm8962-audio"; - audio-cpu = <&sai3>; - audio-codec = <&wm8962>; - audio-routing = - "Headphone Jack", "HPOUTL", - "Headphone Jack", "HPOUTR", - "Ext Spk", "SPKOUTL", - "Ext Spk", "SPKOUTR", - "AMIC", "MICBIAS", - "IN3R", "AMIC"; + sound-wm8962 { + compatible = "simple-audio-card"; + simple-audio-card,name = "wm8962"; + simple-audio-card,format = "i2s"; + simple-audio-card,widgets = "Headphone", "Headphones", + "Microphone", "Headset Mic", + "Speaker", "Speaker"; + simple-audio-card,routing = "Headphones", "HPOUTL", + "Headphones", "HPOUTR", + "Speaker", "SPKOUTL", + "Speaker", "SPKOUTR", + "Headset Mic", "MICBIAS", + "IN3R", "Headset Mic"; + + simple-audio-card,cpu { + sound-dai = <&sai3>; + }; + + simple-audio-card,codec { + sound-dai = <&wm8962>; + clocks = <&clk IMX8MM_CLK_SAI3_ROOT>; + frame-master; + bitclock-master; + }; }; }; @@ -192,6 +204,7 @@ wm8962: audio-codec@1a { 0x0000 /* 4:FN_DMICCDAT */ 0x0000 /* 5:Default */ >; + #sound-dai-cells = <0>; }; pca6416_0: gpio@20 { From patchwork Sun Oct 8 14:02:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 13412731 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 C7A61E95A82 for ; Sun, 8 Oct 2023 14:03:27 +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:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=1EHTF7cVPcE++ZdGBQxjna8mHO9Z2Xk27By59AuD9AU=; b=1oBKwMeuS8ESE1 FNOcfU9rQuneFpUcbmR3d9KFoINqUkrSKeUX5FvpS+sqVp1k7Olx6e2Z3TsGXhlZT2plGoq+mtE7X +F/xzennCzsCd+Qc8Dhv38fMTDEttGqZHijHDyc7EClCMLC7bm5WCiDAK1MEqzWanYZXRGlJoqkDx 6tueFdNTaYSO0rCFvBLUAGnJmYhxl0NwRYndlCkXTi0ySuu0dQTVVhXDDMUjY+14lGrvw5XF1wInw sTdPvNki6o0OyAIuuAIT22GzRIgSP0Qt19M9E0MwGpLoT32cKts1hgQLyy/CKb2V1kWclaJozlzfn tDFvRzRIyCsfH4jkcb/g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qpUMz-008vSF-2R; Sun, 08 Oct 2023 14:02:57 +0000 Received: from mail-il1-x134.google.com ([2607:f8b0:4864:20::134]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qpUMv-008vQt-2l for linux-arm-kernel@lists.infradead.org; Sun, 08 Oct 2023 14:02:55 +0000 Received: by mail-il1-x134.google.com with SMTP id e9e14a558f8ab-35273f62ca3so10183345ab.1 for ; Sun, 08 Oct 2023 07:02:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696773772; x=1697378572; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=KuvXt9sFvOyA/pPS+UN9EsIG1PlSSdh931kGA4/DRos=; b=WW1/wMvQxmoS+dlxUp3g8F5RoxJvgqflxBUSY7YWln4eweX+I88yLYYcJZdrstAozC kNGSZD13qHVWq0JrvZVNizI+Ead2CMVeBY6jG3zD3Oeu25nj9goM5UFFU/pUnOvFirBe PKAJkro8nzXj9V378duKyFsR6ixjqTwu2pPfqEbjVv6tD/Sj9FMxlFcysMouSza+X8ip j4PDf80JlxIC4iLfu8ViaHLEl9Ztq4/cJU+53O0tDznEceeYEPYYCE/Kfp3f963JePfw ywy3foYlqhRTDMuFX/RSNdM5xbKHa4cRYA9KqcO5gmU65csvPGX6uR1hiV5vcuR2BMOm JkFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696773772; x=1697378572; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KuvXt9sFvOyA/pPS+UN9EsIG1PlSSdh931kGA4/DRos=; b=h3m1CtpV+2KB7zDEYIEHtceU1i1HcPrbIl+w5844yogb/uasR/+xwq27ZcJcmF7h4y E+nmDLQTziNUMjNk2e4tLJwO7LCq3EBCGaPSfxe05DUdYzI7KUOeGBFqf7VIjDSmEHIK OqNTtp0gwZ+Ua+7BfsS7sFVX23fFgjYOII2WZSiPqolJqKDl3McekRxSutc89WnU6O49 mcedXic8vrQPy5oscVPLrSVA5YSFFqAKuR/v5oQGh8XcqFB7EaS8csEQ8AEh52YBpnrc eQ0TPyWYW60aeHZ+OokCBBx+P6iazQySxEOoOtvlT3fzdX4R5GlGyCEfGWqJwHxRKiJM cdUg== X-Gm-Message-State: AOJu0YxCxI2htuEU78ttZ6FLcmEQtGNNK5yZ3NkEa6Z7z042wLp8t4pF g9g92r+GL3dX8nrXjyDMqhW8xda+aqY= X-Google-Smtp-Source: AGHT+IHz3JglSvRK/HJS7Ms2Uc88OKdv4C6JDCb8MC7Zk4TJZP7o74Arw2OUfnGXngrwh/MdemNIOQ== X-Received: by 2002:a05:6e02:2192:b0:352:6251:2366 with SMTP id j18-20020a056e02219200b0035262512366mr8108291ila.5.1696773772428; Sun, 08 Oct 2023 07:02:52 -0700 (PDT) Received: from aford-System-Version.lan ([2601:447:d002:5be:a2fe:632a:2360:50d3]) by smtp.gmail.com with ESMTPSA id 2-20020a921302000000b0035134f1a240sm2272901ilt.86.2023.10.08.07.02.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Oct 2023 07:02:51 -0700 (PDT) From: Adam Ford To: linux-arm-kernel@lists.infradead.org Cc: aford@beaconembedded.com, Adam Ford , Fabio Estevam , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , NXP Linux Team , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH V3 2/4] arm64: dts: imx8mm-beacon: Add DMIC support Date: Sun, 8 Oct 2023 09:02:36 -0500 Message-Id: <20231008140239.6601-2-aford173@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231008140239.6601-1-aford173@gmail.com> References: <20231008140239.6601-1-aford173@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231008_070253_891694_DD66F51C X-CRM114-Status: GOOD ( 11.58 ) 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 The baseboard has a connector for a pulse density microphone. This is connected via the micfil interface and uses the DMIC audio codec with the simple-audio-card. Signed-off-by: Adam Ford Reviewed-by: Fabio Estevam --- V3: No Change V2: Rebase and remove sound-dai-cells since it's been moved to the SoC. diff --git a/arch/arm64/boot/dts/freescale/imx8mm-beacon-baseboard.dtsi b/arch/arm64/boot/dts/freescale/imx8mm-beacon-baseboard.dtsi index 313e93663d6f..6086dae2e5fb 100644 --- a/arch/arm64/boot/dts/freescale/imx8mm-beacon-baseboard.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mm-beacon-baseboard.dtsi @@ -6,6 +6,13 @@ #include / { + + dmic_codec: dmic-codec { + compatible = "dmic-codec"; + num-channels = <1>; + #sound-dai-cells = <0>; + }; + leds { compatible = "gpio-leds"; @@ -98,6 +105,22 @@ reg_usdhc2_vmmc: regulator-usdhc2 { enable-active-high; }; + sound-dmic { + compatible = "simple-audio-card"; + simple-audio-card,name = "dmic"; + simple-audio-card,format = "pdm"; + simple-audio-card,bitclock-master = <&dailink_master>; + simple-audio-card,frame-master = <&dailink_master>; + + dailink_master: simple-audio-card,cpu { + sound-dai = <&micfil>; + }; + + simple-audio-card,codec { + sound-dai = <&dmic_codec>; + }; + }; + sound-wm8962 { compatible = "simple-audio-card"; simple-audio-card,name = "wm8962"; @@ -228,6 +251,15 @@ pca6416_1: gpio@21 { }; }; +&micfil { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pdm>; + assigned-clocks = <&clk IMX8MM_CLK_PDM>; + assigned-clock-parents = <&clk IMX8MM_AUDIO_PLL1_OUT>; + assigned-clock-rates = <49152000>; + status = "okay"; +}; + &mipi_csi { status = "okay"; ports { @@ -365,6 +397,13 @@ MX8MM_IOMUXC_SAI2_MCLK_GPIO4_IO27 0x19 >; }; + pinctrl_pdm: pdmgrp { + fsl,pins = < + MX8MM_IOMUXC_SAI5_RXC_PDM_CLK 0xd6 + MX8MM_IOMUXC_SAI5_RXD0_PDM_DATA0 0xd6 + >; + }; + pinctrl_reg_usb_otg1: usbotg1grp { fsl,pins = < MX8MM_IOMUXC_SAI3_RXC_GPIO4_IO29 0x19 From patchwork Sun Oct 8 14:02:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 13412730 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 0DA2FE95A67 for ; Sun, 8 Oct 2023 14:03:21 +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:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=difJ08y8eHsJQvqYxydi1QcN6a7x4lmcpNQc6AmYi5U=; b=nYN1HAmkCdlL/f jB8+g5OE48t+j7RUkZifBy0+AeFvgQjR3ArbPyVr9GJEGg8DS8nhj7NIZJZu+0LuVqiMDlaw84nZs RzCBPJTdeBOt+exoqNoz781HPtQAm/SKykqgzbOVgt6E7haLuC1sCUfsT7W6UoLOOfsyqjbeMx/8D Kh5QdLtTryjMUhBs4AOoynjmn/0ik8+6IDDNp7V7V/Xu7VgZs3ne6KrxDLnHy2GamsI9yklRVWMVA m3xCRpTszSFjX7C2fR82AWyN63yAbq1EtcIK7HAJ1nG87dZQE0L0reALbCc2VGlNiQ4CsfBzsMrk6 ExUjs7h5pig2lSm8TcLA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qpUN0-008vSO-0p; Sun, 08 Oct 2023 14:02:58 +0000 Received: from mail-il1-x12a.google.com ([2607:f8b0:4864:20::12a]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qpUMx-008vRD-1S for linux-arm-kernel@lists.infradead.org; Sun, 08 Oct 2023 14:02:56 +0000 Received: by mail-il1-x12a.google.com with SMTP id e9e14a558f8ab-35130c8bc79so14738665ab.1 for ; Sun, 08 Oct 2023 07:02:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696773774; x=1697378574; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xTC0xEmiJQH7h7RgVwIyYpryKqxuFMiJlFaccvcwhZQ=; b=kiFJZqN9YJCu5GIGDIL/Gc2bBx1Azuk0Bob9wXM5sUkJ9cm5G2HWT/XSO+9QyWo7ZH h4HkcNIHtPoReuNrxgnHeMfnhXdBL8re0qoazQlCCmet0D0YKeN1ZBL1vmj0iDSqQ7y0 vGhibI12yfatWwcudI8/AVPpdmdEVhVFdy8+ZbUWnHl/nlinDR+1STL8KyzHRwNIYG5a PBsor7fnKRCBZQjVUTZ3biaByJfH7rvW/qhuygZitLw/kYb1zabMsSHQSI2wiY+3N2vF KWMnJ31+u0vI8OpexnOzB419mJB5iHN1W5g5ZQrRJYPGRyopJauinjvC1sRVptA8lhyE ZoAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696773774; x=1697378574; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xTC0xEmiJQH7h7RgVwIyYpryKqxuFMiJlFaccvcwhZQ=; b=JlOG5KzHrIHvKb4elbUbt8Q9b2unoiHTNgczEWC4ClwcMrAttTtt8mxXnu8vB0lUUl QtPZ7EMlnPhI4pxD4eX2ucQyo5CkegVHvPcPpSBUsmfxvGD2OJRsNEqgiv48SFPGbeE1 cAHuoaqnYlv8OtlyMfq1XnjsF/Q5vtmXODmssfi4+yoKkJCl2fHfDSgT27nRTaa4GW0W PDTfavWY8J1OEz4ILuyB7ilQYmdTFCHkyU7wx2MMA7DJR6k0GtILs279d58MQ6s3rM2M qHC8w+xgHK6TZQeIFQWnb77Wuz4Akh8GuvRfRAno/EOAoJf7xQdnxWXixcx6hwd6ksGr 3sCA== X-Gm-Message-State: AOJu0YzcsBb5pgHm6abKECQasgMjK5Zfm5zhMOewZ3SzYBQ2fdfsFCYn qZ2AWaJmffcNlGv4KOP2yvFqqpzJ8kw= X-Google-Smtp-Source: AGHT+IEzCYpXETF0AL0AJMaTo99wIyDMfeggA89aScfylY2EDiRMqv7flqKYaaYtyItJUrON4lRM4A== X-Received: by 2002:a05:6e02:2189:b0:34f:35e8:5098 with SMTP id j9-20020a056e02218900b0034f35e85098mr16568780ila.20.1696773773923; Sun, 08 Oct 2023 07:02:53 -0700 (PDT) Received: from aford-System-Version.lan ([2601:447:d002:5be:a2fe:632a:2360:50d3]) by smtp.gmail.com with ESMTPSA id 2-20020a921302000000b0035134f1a240sm2272901ilt.86.2023.10.08.07.02.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Oct 2023 07:02:53 -0700 (PDT) From: Adam Ford To: linux-arm-kernel@lists.infradead.org Cc: aford@beaconembedded.com, Adam Ford , Fabio Estevam , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , NXP Linux Team , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH V3 3/4] arm64: dts: imx8mn-beacon: Add DMIC support Date: Sun, 8 Oct 2023 09:02:37 -0500 Message-Id: <20231008140239.6601-3-aford173@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231008140239.6601-1-aford173@gmail.com> References: <20231008140239.6601-1-aford173@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231008_070255_485957_7E986D82 X-CRM114-Status: GOOD ( 11.45 ) 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 The baseboard has a connector for a pulse density microphone. This is connected via the micfil interface and uses the DMIC audio codec with the simple-audio-card. Signed-off-by: Adam Ford Reviewed-by: Fabio Estevam --- V3: Fix missing tripple-hyphen to separate notes from git commit V2: Rebase and remove sound-dai-cells since it's been moved to the SoC. Reviewed-by: Fabio Estevam diff --git a/arch/arm64/boot/dts/freescale/imx8mn-beacon-baseboard.dtsi b/arch/arm64/boot/dts/freescale/imx8mn-beacon-baseboard.dtsi index 16761975f56e..20018ee2c803 100644 --- a/arch/arm64/boot/dts/freescale/imx8mn-beacon-baseboard.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mn-beacon-baseboard.dtsi @@ -4,6 +4,12 @@ */ / { + dmic_codec: dmic-codec { + compatible = "dmic-codec"; + num-channels = <1>; + #sound-dai-cells = <0>; + }; + leds { compatible = "gpio-leds"; @@ -74,6 +80,22 @@ reg_usb_otg_vbus: regulator-usb { enable-active-high; }; + sound-dmic { + compatible = "simple-audio-card"; + simple-audio-card,name = "dmic"; + simple-audio-card,format = "pdm"; + simple-audio-card,bitclock-master = <&dailink_master>; + simple-audio-card,frame-master = <&dailink_master>; + + dailink_master: simple-audio-card,cpu { + sound-dai = <&micfil>; + }; + + simple-audio-card,codec { + sound-dai = <&dmic_codec>; + }; + }; + sound-wm8962 { compatible = "simple-audio-card"; simple-audio-card,name = "wm8962"; @@ -221,6 +243,15 @@ mipi_csi_in: endpoint { }; }; +&micfil { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pdm>; + assigned-clocks = <&clk IMX8MN_CLK_PDM>; + assigned-clock-parents = <&clk IMX8MN_AUDIO_PLL1_OUT>; + assigned-clock-rates = <49152000>; + status = "okay"; +}; + &sai3 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_sai3>; @@ -311,6 +342,13 @@ MX8MN_IOMUXC_SAI2_MCLK_GPIO4_IO27 0x19 >; }; + pinctrl_pdm: pdmgrp { + fsl,pins = < + MX8MN_IOMUXC_SAI5_RXC_PDM_CLK 0xd6 + MX8MN_IOMUXC_SAI5_RXD0_PDM_BIT_STREAM0 0xd6 + >; + }; + pinctrl_reg_usb_otg: reg-otggrp { fsl,pins = < MX8MN_IOMUXC_SAI3_RXC_GPIO4_IO29 0x19 From patchwork Sun Oct 8 14:02:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 13412733 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 35B45E95A82 for ; Sun, 8 Oct 2023 14:03:32 +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:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Oiw8I/fqDLO//LjBYgB1e2uX///QSzIliKHOVZ0rk8Y=; b=vfKsgTtgJWN7Zr MrJHGW84SvhZOm15UCl+AAotZZm5KyIPQEvcsmeIeN1T2vE9o7P9R8UuA5mgTsClDymaPlYLZR0A3 36C44UVfuZkBOkGQHNnI9+xKfD67UNmLA8HVqngEYhWVKaUZnBknJFaLIkCU3g818LRSepc4UmyTJ 2DPThWSxkLMeNPob0rZ7Dpnl1jtmx2qN1zkkSlGaW6oMCJ0U3gHGaPoQT3eBm/X2XkT851B/w97og oQxGnZj3bdJ+KufXp2zzv96HnmPJxHgn8PMoHJiL3/5IKs6O82Tco+HUdyO+a7SdDJwVaKLMTKBTX gF5Xbz1QSaG2f/6B3h1w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qpUN4-008vUT-34; Sun, 08 Oct 2023 14:03:02 +0000 Received: from mail-il1-x134.google.com ([2607:f8b0:4864:20::134]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qpUMy-008vRr-1n for linux-arm-kernel@lists.infradead.org; Sun, 08 Oct 2023 14:02:58 +0000 Received: by mail-il1-x134.google.com with SMTP id e9e14a558f8ab-3515aad4a87so15692265ab.3 for ; Sun, 08 Oct 2023 07:02:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696773775; x=1697378575; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xeyjdW8u16yegotDnSCZCKulMzcwtuKO9IQY/3/chxk=; b=TwSSONeVd2l5KjHDWNCpxWVpwMU5mLygM5fgFMaYrBxuZzJWzPJnDD3jNSGbG7GTb9 h1QAwMwpBu7YQ3coJSrz8mZdq8YXuHOhpC2AP0lh0y3nJZudWMPElpbYJia5tMd9Ah4N 4bytBeccontNLgECF0k0/bP0QND6wlX3sqCpkf/IW7mwMu1oeVlD2BQxOjO+jRHJ3khE SnxCeSTYcIzMqske0ejx4N8iSsxulUfUr2nn0WzGIjv232kE98QlRWkIeij0MJ2upYj2 4EMfVCQll0d4Iwr9E9h19NpJKWxsv9HNu6qSxChjhdmpAUNt+04z5HH/HNVu6fwx/kOB Cksg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696773775; x=1697378575; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xeyjdW8u16yegotDnSCZCKulMzcwtuKO9IQY/3/chxk=; b=nKLZONx9/iUbu/U+nBd1HH2cOSJB+d6uWGnJFiFVZCfwG09gIb08lOD7ySqG9OEOUG pVY6Xhkea6tcor+Gu+xlO9FrEkk1cv7ugna5/EEw0mhMQCnQsH4N+JZ6ssjOzI+x18tB hA5vQ/0Q2qUEBf5aUv4jk5IEjLKaEpnWp20xh2LbDGIn9+sFb4hJ/XNP4z/GhfBja1Bq sCKEWBW6s1Gkl2Kbg7bxqtrZZaGE6FFWNUms77AUYHHgeunK581+3zBxqGtvG7bHV2Gt kl6ziM2QE1Xc46Y1xUAbhnHPU9VBy6maa8bVkwm0B9OZ1tVs9i1IpTXGX56k2TC2dU1h /WLQ== X-Gm-Message-State: AOJu0YyV3RlNLJ+agoRZ4cdY08/9PVgJitNSGon/+FWssX4pKP2Pqgim ZAcFJ8g1GVSV+d436NRUPNLTk0mwPJg= X-Google-Smtp-Source: AGHT+IGplamwSERc2ILth4+Q1zSQcJ80lOf9usqGVtmWE5J0YzDjORtyRMadvGb1VIqozKA934WDPQ== X-Received: by 2002:a05:6e02:c62:b0:351:e6e:7723 with SMTP id f2-20020a056e020c6200b003510e6e7723mr12047296ilj.25.1696773775435; Sun, 08 Oct 2023 07:02:55 -0700 (PDT) Received: from aford-System-Version.lan ([2601:447:d002:5be:a2fe:632a:2360:50d3]) by smtp.gmail.com with ESMTPSA id 2-20020a921302000000b0035134f1a240sm2272901ilt.86.2023.10.08.07.02.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Oct 2023 07:02:55 -0700 (PDT) From: Adam Ford To: linux-arm-kernel@lists.infradead.org Cc: aford@beaconembedded.com, Adam Ford , Fabio Estevam , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , NXP Linux Team , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH V3 4/4] arm64: dts: imx8mp-beacon: Add DMIC support Date: Sun, 8 Oct 2023 09:02:38 -0500 Message-Id: <20231008140239.6601-4-aford173@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231008140239.6601-1-aford173@gmail.com> References: <20231008140239.6601-1-aford173@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231008_070256_595485_25784936 X-CRM114-Status: GOOD ( 10.68 ) 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 The baseboard has a connector for a pulse density microphone. This is connected via the micfil interface and uses the DMIC audio codec with the simple-audio-card. Signed-off-by: Adam Ford Reviewed-by: Fabio Estevam --- V3: No Change V2: No Change diff --git a/arch/arm64/boot/dts/freescale/imx8mp-beacon-kit.dts b/arch/arm64/boot/dts/freescale/imx8mp-beacon-kit.dts index acd265d8b58e..ee64c6ffb551 100644 --- a/arch/arm64/boot/dts/freescale/imx8mp-beacon-kit.dts +++ b/arch/arm64/boot/dts/freescale/imx8mp-beacon-kit.dts @@ -49,6 +49,12 @@ ss_ep: endpoint { }; }; + dmic_codec: dmic-codec { + compatible = "dmic-codec"; + num-channels = <1>; + #sound-dai-cells = <0>; + }; + gpio-keys { compatible = "gpio-keys"; autorepeat; @@ -147,6 +153,22 @@ reg_usb1_host_vbus: regulator-usb1-vbus { enable-active-high; }; + sound-dmic { + compatible = "simple-audio-card"; + simple-audio-card,name = "sound-pdm"; + simple-audio-card,format = "i2s"; + simple-audio-card,bitclock-master = <&dailink_master>; + simple-audio-card,frame-master = <&dailink_master>; + + dailink_master: simple-audio-card,cpu { + sound-dai = <&micfil>; + }; + + simple-audio-card,codec { + sound-dai = <&dmic_codec>; + }; + }; + sound-wm8962 { compatible = "simple-audio-card"; simple-audio-card,name = "wm8962"; @@ -174,6 +196,11 @@ simple-audio-card,codec { }; }; +&audio_blk_ctrl { + assigned-clocks = <&clk IMX8MP_AUDIO_PLL1>, <&clk IMX8MP_AUDIO_PLL2>; + assigned-clock-rates = <393216000>, <135475200>; +}; + &ecspi2 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_ecspi2>; @@ -364,6 +391,15 @@ hd3ss3220_out_ep: endpoint { }; }; +&micfil { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pdm>; + assigned-clocks = <&clk IMX8MP_CLK_PDM>; + assigned-clock-parents = <&clk IMX8MP_AUDIO_PLL1_OUT>; + assigned-clock-rates = <49152000>; + status = "okay"; +}; + &pcie { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_pcie>; @@ -545,6 +581,13 @@ MX8MP_IOMUXC_SAI2_RXFS__GPIO4_IO21 0x10 /* PCIe_nRST */ >; }; + pinctrl_pdm: pdmgrp { + fsl,pins = < + MX8MP_IOMUXC_SAI5_RXC__AUDIOMIX_PDM_CLK 0xd6 + MX8MP_IOMUXC_SAI5_RXD0__AUDIOMIX_PDM_BIT_STREAM00 0xd6 + >; + }; + pinctrl_reg_usdhc2_vmmc: regusdhc2vmmcgrp { fsl,pins = < MX8MP_IOMUXC_SD2_RESET_B__GPIO2_IO19 0x40