From patchwork Wed May 5 19:11:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 12240879 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 63A55C433B4 for ; Wed, 5 May 2021 19:13:52 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C1691610F7 for ; Wed, 5 May 2021 19:13:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C1691610F7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; 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=XEgIwIslOXU6tjB6cD/5sSo/8maS4NQfJm5z/jKlySM=; b=OkbeHskHiYROIUAMq5yRXc4e6 Z+QgtHWGXcGQee90pbb38De31dhD9OuLly6Ox35rExWgUH6g5dvSrQqDSoF87LJaIxUhBardbY6QG Zxra4sgcb9YHphBaUdoIM6cTkRiB/DbPHC0nOozDvkOMIQCxe9XvvguTMslZxRHSM7CpgCXJOc9cH +ieNvyiB1IdP93EUy79gmk5jsBq42j/WIpP7hss40iiOjXe6LHCBSC36B4dxT4SEb6zBIASBQWIRU WDsufU8onPBnvWVAXxsE2HNoMWlLz86aZJORO65ZsF5CduZpYgrgYqLX48clMsIJ7ng/phVFxfOkS mlESfj9jA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1leMw6-00276i-1i; Wed, 05 May 2021 19:11:54 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1leMvt-00275Y-Gb for linux-arm-kernel@desiato.infradead.org; Wed, 05 May 2021 19:11:41 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=vZeEXRCd24seoFH7GRFkufDJ4YkQs9v5c3UPLyEGxAo=; b=zYeTArsurw8R2xPELbxfAUUQhj /Es74AaB9ILEj9HR5jwAT7f0dfkC5sJXyxwy5mf2wYZ75va7j2+D/LiI5MNfUesfUmZeWi0Cu2oKD ahFAQX4F+1lT84YISn85DWE6B47js5ebvk87R2QSOJimex8MTXPbPnBYhj1q/aukumef28DDAGqpr pGSQeW6HPbAZQBqaL5/rNFPwBaj+b01Pt6ejRyLqRn4WN+JOQ7GfrSI8XF2AS5/xP4dGpA4/qzXkG Es5Kn8zJNjlPSbR2zriGvzcttaqSsWMgYT6XaZWYEWPL+IlDnuE9TDXvCSz8+fQgzs46dw3STyBp3 F6ylnoiQ==; Received: from mail-il1-x12a.google.com ([2607:f8b0:4864:20::12a]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1leMvq-005Bcx-Vu for linux-arm-kernel@lists.infradead.org; Wed, 05 May 2021 19:11:40 +0000 Received: by mail-il1-x12a.google.com with SMTP id e2so2681519ilr.1 for ; Wed, 05 May 2021 12:11:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vZeEXRCd24seoFH7GRFkufDJ4YkQs9v5c3UPLyEGxAo=; b=HMyA15emhA9kvzs6t5n2eHmMr7C1OdaGSA5Am2dCKb8XBeoCB4gi7wkd4d1I+uuWRT lluqGqRc9LJK6nxZNnO8k38P//gAS3PgSSf+SCXyY3+0MraX07A3l3vHx4mOE1qHFz++ MLSS4sBgB2fm968szDXV2LvEQxmBVF3nzFbtNA5x8E7Fwoyzui0VPcSACLe+DEVtk61R 9HltsY8TzPA61MaelYYORYOYevFJvQpe80wxn07YFXYyh7JX/sC+xt6cIsYSLYd0DtPK VcvxsBCi/E/u/7beL7n0QWrQ+Ns+rqMRKihpj1Bpbiy8yNRVr2oDeZ8h7sC8P6ZtYyvB s5fA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vZeEXRCd24seoFH7GRFkufDJ4YkQs9v5c3UPLyEGxAo=; b=Ve9PUZ47hjdBWp1df23fVZbWjxqhAkQlr1dK9fWuHTKldN8KJUcELC0sGxLHQTW04d d2hYkR7ANylbOwOUraoC5xgqWIdgQTO0aqzTVnapdzqNnfeTGcW6SY71hgXc2N2Y4XuQ fn6wf5okShQOn1HY8ELNKXhAb6pQJJiNK5ktjKefZIvD7mdupm1+NrRcylC0MFVAra1F AbRi9jmcq01hwx4lIX8bHOwfWG5pXCydOjKQrrQZXRvG4U3B1BJXuHLf3YffsTURKL6/ SwcrID1dbeRJG7dAB3sGNJZtqxOl0MUQHNqKBlb1TEnxPi1n+yj1nMFnN6+A2SRcEsMJ 956Q== X-Gm-Message-State: AOAM530hg/CJX4Z/RzRvjegCO/w9+sB0NozTszGwAXymas5rdGaDVMzA efzlkfDtFFQCSPO7UdaxUDQM7RzCLbqgBQ== X-Google-Smtp-Source: ABdhPJyQhdUZ1ymtZ1XredlqSqWvf2hevJrzKx8j9JQpzkIUnde16I8WrwmXDbM+tTvXyYoNbz/+zQ== X-Received: by 2002:a92:d242:: with SMTP id v2mr422947ilg.135.1620241897076; Wed, 05 May 2021 12:11:37 -0700 (PDT) Received: from aford-IdeaCentre-A730.lan ([2601:448:8400:9e8:c971:6623:b9e9:f40d]) by smtp.gmail.com with ESMTPSA id q11sm140037ile.56.2021.05.05.12.11.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 May 2021 12:11:36 -0700 (PDT) From: Adam Ford To: linux-arm-kernel@lists.infradead.org Cc: aford@beaconembedded.com, Adam Ford , Rob Herring , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] arm64: dts: imx8mn-beacon: Enable more audio Date: Wed, 5 May 2021 14:11:25 -0500 Message-Id: <20210505191126.1239309-2-aford173@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210505191126.1239309-1-aford173@gmail.com> References: <20210505191126.1239309-1-aford173@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210505_121139_052329_909C2D67 X-CRM114-Status: GOOD ( 10.81 ) 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 There are audio ports for SPDIF and MICFIL on the baseboard. Enable them. 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 376ca8ff7213..cc31f2c5b4bf 100644 --- a/arch/arm64/boot/dts/freescale/imx8mn-beacon-baseboard.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mn-beacon-baseboard.dtsi @@ -76,6 +76,20 @@ sound { "AMIC", "MICBIAS", "IN3R", "AMIC"; }; + + sound-micfil { + compatible = "fsl,imx-audio-micfil"; + model = "imx-audio-micfil"; + cpu-dai = <&micfil>; + }; + + sound-spdif { + compatible = "fsl,imx-audio-spdif"; + model = "imx-spdif"; + spdif-controller = <&spdif1>; + spdif-out; + spdif-in; + }; }; &ecspi2 { @@ -151,6 +165,15 @@ &easrc { status = "okay"; }; +&micfil { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_micfil>; + assigned-clocks = <&clk IMX8MN_CLK_PDM>; + assigned-clock-parents = <&clk IMX8MN_AUDIO_PLL1_OUT>; + assigned-clock-rates = <196608000>; + status = "okay"; +}; + &sai3 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_sai3>; @@ -165,6 +188,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>; @@ -226,6 +266,13 @@ MX8MN_IOMUXC_SAI3_RXFS_GPIO4_IO28 0x41 >; }; + pinctrl_micfil: micfilgrp { + fsl,pins = < + MX8MN_IOMUXC_SAI5_RXC_PDM_CLK 0xd6 + MX8MN_IOMUXC_SAI5_RXD0_PDM_BIT_STREAM0 0xd6 + >; + }; + pinctrl_pcal6414: pcal6414-gpiogrp { fsl,pins = < MX8MN_IOMUXC_SAI2_MCLK_GPIO4_IO27 0x19 @@ -248,6 +295,14 @@ 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 + MX8MN_IOMUXC_SPDIF_EXT_CLK_SPDIF1_EXT_CLK 0xd6 + >; + }; + pinctrl_uart2: uart2grp { fsl,pins = < MX8MN_IOMUXC_UART2_RXD_UART2_DCE_RX 0x140