From patchwork Sun Jul 17 18:09:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 591395 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 79C32C433EF for ; Sun, 17 Jul 2022 18:10:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229487AbiGQSKV (ORCPT ); Sun, 17 Jul 2022 14:10:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60634 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231381AbiGQSKT (ORCPT ); Sun, 17 Jul 2022 14:10:19 -0400 Received: from mail-io1-xd2e.google.com (mail-io1-xd2e.google.com [IPv6:2607:f8b0:4864:20::d2e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D4307DFC5; Sun, 17 Jul 2022 11:10:18 -0700 (PDT) Received: by mail-io1-xd2e.google.com with SMTP id r70so6597569iod.10; Sun, 17 Jul 2022 11:10:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LQv1x1CMU9dHw2UgXHFEIhfhfWQgdyhgWe5xhYIl+Aw=; b=MoxhHZBfdUw0zj2to3W51BCEWcS781wXb+YEaAfQmg64gs2uhJ/xqO17VuQqEtsBUj 9CUv7mCCK4SCAOFuLtV9dDjiHFFPSZqIWDMZcpi8WmlDJaS5z1ZImwRaM4HqaUSqPBa0 HRnyfwMCxwJ/aoHlJ5oGOhVT5LexTCmdiXO8Dx5cBPVFZRiMplC/aoPCrKn5ZLDKQVb6 jG0QFiF+copqOcwUNQWd7ghD4375e2DkccJ0vqeb8hsj+/wFSCfjAzczWxLN6ZnLagK6 F579Lovn0gh22QOsjBvlck1Im8m6tO2SRy13I4oU2Xugd3vq1ncVijq5aQQM520q2aDJ gdFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LQv1x1CMU9dHw2UgXHFEIhfhfWQgdyhgWe5xhYIl+Aw=; b=U3SH/kXodw/FvI71XJYlBFEW/pak01EBhOVr8hrRk4abojs/cd5xxAf2qd5TZz61jn uEzdVvVcLlOTJB9ZkGDRdHUT9o+14yZxHpqPr+VCy4502yGMu8rYjKsBCborpuMFQ/55 QicyTaqlpCYIzA+jvGKLSq2PmlDboMWirctBvuLW9Xgg7NwGMHEpqEeHM57gmLgvKCtS 0fgEmcfbOycGWi8JAsDn72NHHZnu/YyW/vHIsSc5B6MBJ+/D0/50sC4/gMGrHw4wEebW OBsZ0sDnQJeIkE6kZM99blzz1U3JGMcpiz7FQRt1ksQ2+cMjq5xmg7EoC+imxYv2NAJz cYFQ== X-Gm-Message-State: AJIora90vP8xy2+hKoP89JVHmCxhIDzDqM3W/Hxb9fYbdjHTsZaj74of YCeOeP2pPBQ4LydnWBuz+hU= X-Google-Smtp-Source: AGRyM1uaZisKSzPYLJpZ/146FYQ5bV/X7yNEnpErDMR0d1EUVcrXhudBkfqGB9MWGyUgmS0y9V5Rvg== X-Received: by 2002:a05:6638:4089:b0:33f:7f78:1cd2 with SMTP id m9-20020a056638408900b0033f7f781cd2mr13090903jam.130.1658081418027; Sun, 17 Jul 2022 11:10:18 -0700 (PDT) Received: from AIO.lan ([2601:448:8400:9e8:8e1b:7df0:7e10:ddb0]) by smtp.gmail.com with ESMTPSA id f4-20020a056e0204c400b002dc1ea52967sm3869136ils.34.2022.07.17.11.10.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Jul 2022 11:10:17 -0700 (PDT) From: Adam Ford To: linux-arm-kernel@lists.infradead.org Cc: Adam Ford , Rob Herring , Krzysztof Kozlowski , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Catalin Marinas , Will Deacon , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/6] arm64: dts: imx8mn-beacon: Enable SPDIF Sound card Date: Sun, 17 Jul 2022 13:09:56 -0500 Message-Id: <20220717181000.1186373-3-aford173@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220717181000.1186373-1-aford173@gmail.com> References: <20220717181000.1186373-1-aford173@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Add a sound card to support SPDIF since the imx8mn-beacon baseboard can support it. Signed-off-by: Adam Ford diff --git a/arch/arm64/boot/dts/freescale/imx8mn-beacon-baseboard.dtsi b/arch/arm64/boot/dts/freescale/imx8mn-beacon-baseboard.dtsi index fa66cc9bf455..224845d24b64 100644 --- a/arch/arm64/boot/dts/freescale/imx8mn-beacon-baseboard.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mn-beacon-baseboard.dtsi @@ -88,6 +88,14 @@ cpu { }; }; }; + + sound-spdif { + compatible = "fsl,imx-audio-spdif"; + model = "imx-spdif"; + spdif-controller = <&spdif1>; + spdif-out; + spdif-in; + }; }; &ecspi2 { @@ -186,6 +194,23 @@ &snvs_pwrkey { status = "okay"; }; +&spdif1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_spdif1>; + assigned-clocks = <&clk IMX8MN_CLK_SPDIF1>; + assigned-clock-parents = <&clk IMX8MN_AUDIO_PLL1_OUT>; + assigned-clock-rates = <24576000>; + clocks = <&clk IMX8MN_CLK_AUDIO_AHB>, <&clk IMX8MN_CLK_24M>, + <&clk IMX8MN_CLK_SPDIF1>, <&clk IMX8MN_CLK_DUMMY>, + <&clk IMX8MN_CLK_DUMMY>, <&clk IMX8MN_CLK_DUMMY>, + <&clk IMX8MN_CLK_AUDIO_AHB>, <&clk IMX8MN_CLK_DUMMY>, + <&clk IMX8MN_CLK_DUMMY>, <&clk IMX8MN_CLK_DUMMY>, + <&clk IMX8MN_AUDIO_PLL1_OUT>, <&clk IMX8MN_AUDIO_PLL2_OUT>; + clock-names = "core", "rxtx0", "rxtx1", "rxtx2", "rxtx3", + "rxtx4", "rxtx5", "rxtx6", "rxtx7", "spba", "pll8k", "pll11k"; + status = "okay"; +}; + &uart2 { /* console */ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart2>; @@ -277,6 +302,13 @@ MX8MN_IOMUXC_SAI3_RXD_SAI3_RX_DATA0 0xd6 >; }; + pinctrl_spdif1: spdif1grp { + fsl,pins = < + MX8MN_IOMUXC_SPDIF_TX_SPDIF1_OUT 0xd6 + MX8MN_IOMUXC_SPDIF_RX_SPDIF1_IN 0xd6 + >; + }; + pinctrl_uart2: uart2grp { fsl,pins = < MX8MN_IOMUXC_UART2_RXD_UART2_DCE_RX 0x140 From patchwork Sun Jul 17 18:09:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 591394 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8B17BC43334 for ; Sun, 17 Jul 2022 18:10:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232806AbiGQSK0 (ORCPT ); Sun, 17 Jul 2022 14:10:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60736 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232017AbiGQSKW (ORCPT ); Sun, 17 Jul 2022 14:10:22 -0400 Received: from mail-il1-x136.google.com (mail-il1-x136.google.com [IPv6:2607:f8b0:4864:20::136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3EC3EDFE1; Sun, 17 Jul 2022 11:10:22 -0700 (PDT) Received: by mail-il1-x136.google.com with SMTP id m20so5014038ili.3; Sun, 17 Jul 2022 11:10:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=U4N3gZV/nuDX3nI3v1SIMvgTdRQ6+jjx/bi21jCcF58=; b=JfgS3R2XbWOPDaDrENl1ZF0O1KehxV8V/JNqmsaLJCswDHYm5np2VXukYtiFBUlq8T oAnr4nQiJvq9IvZm3O5fkqnCnLOyUE4kjxChuVe/Bxd+CNJiRv3ePvUDp13ptJjJiBuI OfiA0EOa0vi8XSkdlzZ4DI8Kh3cs5p+eYYzqFmmRnV/2LeLzdIcHlw1NDfUU4meZnT4u PiTw9jZiHXuc3OLoF2/UCR/UyirihdBUjYO3CvVY6/8ivhCL5l5odgcBdwWuRSQ5hNpO haITtP/gWt1f4iSSXWzX/aFd/7dLwqEjhM1/5mwa0QqWUBuv4Hp+sMwFSp7bybLZGkKo FtMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=U4N3gZV/nuDX3nI3v1SIMvgTdRQ6+jjx/bi21jCcF58=; b=h/cgIK7MqJ3nU+Y8J+qhhBqEqAWAoypjrtjZM0hi4nIck/vSTBJZoZ5wUOmyik859P 364ms9kn5yOFC2tuSODQjoLxnldCRga5mFOKLIbUW5PmERf1NTAHmminRnZZwLATJ4fP 8lj/TFk9QonusWP0uy2/oLaeyCj//B9SD6FL1QkYYGdqMwCMHN+FW+beDN8MwTjewP54 mY3sRaGhiJeketCrseZ6a5CGHmsgsG/NBbsIxHGmR7DQNM6EkcbwsdzvOjImk8bDO1T/ FZpZ4qWtjKtGQpgnTMeFRXPqqfUtyjvCYqJzU1bwWRVsuyxxpjDu7x4pqiz0rOVPHUNI Jaxw== X-Gm-Message-State: AJIora9znB8+9ACkckse5QfzQQxP5tmKp41vikginKDfppRjEKlF1d+g Xx61U9osLhQRMaKMahJQnGg= X-Google-Smtp-Source: AGRyM1vO3Wc7qvfGOgOCzISWXHVQCBBaY6Jk8Fi/kFUEx3QsqUryEzvG4amTpJK9FG+BQ0TY8PXNVg== X-Received: by 2002:a05:6e02:19cc:b0:2db:f05e:676c with SMTP id r12-20020a056e0219cc00b002dbf05e676cmr11130994ill.212.1658081421501; Sun, 17 Jul 2022 11:10:21 -0700 (PDT) Received: from AIO.lan ([2601:448:8400:9e8:8e1b:7df0:7e10:ddb0]) by smtp.gmail.com with ESMTPSA id f4-20020a056e0204c400b002dc1ea52967sm3869136ils.34.2022.07.17.11.10.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Jul 2022 11:10:20 -0700 (PDT) From: Adam Ford To: linux-arm-kernel@lists.infradead.org Cc: Adam Ford , Rob Herring , Krzysztof Kozlowski , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Catalin Marinas , Will Deacon , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/6] arm64: dts: imx8mm-beacon: Enable Digitial Microphone Date: Sun, 17 Jul 2022 13:09:58 -0500 Message-Id: <20220717181000.1186373-5-aford173@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220717181000.1186373-1-aford173@gmail.com> References: <20220717181000.1186373-1-aford173@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org There is a PDM microphone port on the baseboard which is connected to the micfil controller. Create a new sound card to support this interface. Signed-off-by: Adam Ford diff --git a/arch/arm64/boot/dts/freescale/imx8mm-beacon-baseboard.dtsi b/arch/arm64/boot/dts/freescale/imx8mm-beacon-baseboard.dtsi index 03266bd90a06..16444954f873 100644 --- a/arch/arm64/boot/dts/freescale/imx8mm-beacon-baseboard.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mm-beacon-baseboard.dtsi @@ -98,7 +98,7 @@ reg_usdhc2_vmmc: regulator-usdhc2 { enable-active-high; }; - sound { + sound-codec { compatible = "fsl,imx-audio-wm8962"; model = "wm8962-audio"; audio-cpu = <&sai3>; @@ -111,6 +111,18 @@ sound { "AMIC", "MICBIAS", "IN3R", "AMIC"; }; + + sound-micfil { + compatible = "fsl,imx-audio-card"; + model = "imx-audio-micfil"; + pri-dai-link { + link-name = "micfil hifi"; + format = "i2s"; + cpu { + sound-dai = <&micfil>; + }; + }; + }; }; &csi { @@ -215,6 +227,16 @@ 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 = <196608000>; + #sound-dai-cells = <0>; + status = "okay"; +}; + &mipi_csi { status = "okay"; ports { @@ -354,6 +376,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 Jul 17 18:10:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 591393 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EDD46C433EF for ; Sun, 17 Jul 2022 18:10:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232970AbiGQSKd (ORCPT ); Sun, 17 Jul 2022 14:10:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60912 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232284AbiGQSK0 (ORCPT ); Sun, 17 Jul 2022 14:10:26 -0400 Received: from mail-il1-x134.google.com (mail-il1-x134.google.com [IPv6:2607:f8b0:4864:20::134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9CF1B13F48; Sun, 17 Jul 2022 11:10:25 -0700 (PDT) Received: by mail-il1-x134.google.com with SMTP id r4so851175ilb.10; Sun, 17 Jul 2022 11:10:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4anNrS+LFYxOaQ+dCh0pkcVaONbH2FluAqjsIfQnn04=; b=Y7xVPb/0ALshBut6fU+YLkpBoCSyRlpduC09iIAtNp542FLG8hGdzScI4AtsFjs1l3 jx+KAd5h70NsRVUcGdu1hEGFrebz0dNHBj/EA38X9zftKTz1txfNH3+/aA5W20rGnoNI VFJVer7KTsFd3LMHwNxdwZhFdzQxp21mcg0fxdOSR8YQBXmi/6BeUtAf50ineHgoKoVl aCX/HkF5MLJgqEc0uMRVeKon8k//PtEhxRMoXKm3b7nA+dHww0bMsZIIiT+RmZTSadc8 +SDwXZ73esyPLkLi6wkMKm4pw87L34ZOrVXPD2zI2rgb+AWroHipqtMActFXSaWyrJ2n Ogdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4anNrS+LFYxOaQ+dCh0pkcVaONbH2FluAqjsIfQnn04=; b=oKVn178xJkBYbMISlWs6MDTV93gYB30Fv+X4Tb9gyJRMF1xOKUeiA57yGEET/RjFKY /N/HY5stUEBv2PGo923CkAebOEBOjc0lBIytaoWTn+BGqyjRkmbauwrq59Zz7N4Kv9/Q eaTDz6MXh3yV40Wbte+wa7PyI35cmRUVFevdjK93jgBlhvzP1GnMQeGv71qHssfvLJVt WgaW3kGZW3nxbGqQtdt1e9hSMDfnIFRa2QynBaHfk+PiMMYnJASDXWNCTlsN0yxSAiwZ ydzM+4dbqlO9FFrj2e1zOfmvY3K7hhYf8LKkIUznGymyJqw7YblOLvrnVWzWPR/LDDQN DpXA== X-Gm-Message-State: AJIora+OOuLWYmbYDn5Vt++1gLSwh38FqcgDiY269nlK71sDBImHATJi 5EjfefGuLZ5xOcbFAzFfGavFv/6G8Gw= X-Google-Smtp-Source: AGRyM1s3f5gCi8OEjCiAiuBUAWILV01AE0BM7ZDfQs4dxVGFw/UMmpoMEEpkPP1Vy0QH25DOTOVDqQ== X-Received: by 2002:a05:6e02:17c6:b0:2dc:1d37:5133 with SMTP id z6-20020a056e0217c600b002dc1d375133mr12575949ilu.297.1658081424761; Sun, 17 Jul 2022 11:10:24 -0700 (PDT) Received: from AIO.lan ([2601:448:8400:9e8:8e1b:7df0:7e10:ddb0]) by smtp.gmail.com with ESMTPSA id f4-20020a056e0204c400b002dc1ea52967sm3869136ils.34.2022.07.17.11.10.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Jul 2022 11:10:24 -0700 (PDT) From: Adam Ford To: linux-arm-kernel@lists.infradead.org Cc: Adam Ford , Rob Herring , Krzysztof Kozlowski , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Catalin Marinas , Will Deacon , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 6/6] arm64: defconfig: Enable imx-audio-card Date: Sun, 17 Jul 2022 13:10:00 -0500 Message-Id: <20220717181000.1186373-7-aford173@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220717181000.1186373-1-aford173@gmail.com> References: <20220717181000.1186373-1-aford173@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Both the imx8mm-beacon and imx8mn-beacon kits have a PDM microphone port. The PDM is used with micfil driver, and that is associated to imx-audio-card, but that is not currently enabled by default. Enable it as a module. Signed-off-by: Adam Ford diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index d3ad1cb2f5eb..2a824590811b 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -792,6 +792,7 @@ CONFIG_SND_SOC_IMX_SGTL5000=m CONFIG_SND_SOC_IMX_SPDIF=m CONFIG_SND_SOC_FSL_ASOC_CARD=m CONFIG_SND_SOC_IMX_AUDMIX=m +CONFIG_SND_SOC_IMX_CARD=m CONFIG_SND_MESON_AXG_SOUND_CARD=m CONFIG_SND_MESON_GX_SOUND_CARD=m CONFIG_SND_SOC_QCOM=m