From patchwork Wed Feb 17 16:10:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrien Grassein X-Patchwork-Id: 12091867 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 1E063C433DB for ; Wed, 17 Feb 2021 16:14:42 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 C1E2364D73 for ; Wed, 17 Feb 2021 16:14:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C1E2364D73 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=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=vZcl6oImcyXW+ASPUE6KqIWk/dsc9VFp2jdopq6WmpY=; b=O5k5yjctQb6WTzTiAqwm889am gABBRaysctKVklRf0KVwTsGdi3vP5VoBIhOcrtTPuqt0OlMnkYG8Pgwv+qaXNlkFCY3/UjQV9qWuM NekFgGzkOjK//sG5zv32SKEqzPcuVEgtrmvBrt+1366NXx9Gwi7+d6vlwEpOUfVya+stk5u0jr5pU aWOb5vUlmZyQOSNMYTu+ntDYP5baoVwVWmvsIsZbn4Wwb4xuDtv+J3ZJZsY8rvwD/qFaz1PCP8CaT 1WdFdZBgcad3hBz82flCrZZnrAUKf2O4ofuBlrqi+aNHv+2IWLknKyArXsJ0/q2lyv/bUJkpJ4dQi 3KgXgfneQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lCPQe-00022E-CP; Wed, 17 Feb 2021 16:11:52 +0000 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1lCPPs-0001mQ-Lz for linux-arm-kernel@lists.infradead.org; Wed, 17 Feb 2021 16:11:06 +0000 Received: by mail-wm1-x32a.google.com with SMTP id o10so1550272wmc.1 for ; Wed, 17 Feb 2021 08:11:03 -0800 (PST) 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=sTkvherP9fuGVCExQolvQue5rGBtl9CKuzfrYkeIVTw=; b=khGGuHA+IAIhkrPly79rO0nwM2SiBC7c3goZ4FHjxkRWkc3Cz1GCz5jAWv87ZauMKW 9CGFWF11JCKJbgnjwACWEeUL8S45HFeQb8pt1HO8BipGVvNmmEIC8WQInG/BXFJRKRkM OYbzk7t5w3sfxQQ3nahGpgNLWLOvDzvSXihpbbzR3M8vODvjfzY08XDVffvR+nxtYI6e orsvYQf+OzF/VaAoTeNMrzL7kM+/rOL0Fu6F05db/D3CmC1TmkhGoG0Gy+AHxPoCQN8f fWQOHRWzofjic5c83cuNf1tIO0YquUgkEW5CC5PWoT7IFz9qFRTJXLnNMtUHnKjxbfmU 3fiQ== 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=sTkvherP9fuGVCExQolvQue5rGBtl9CKuzfrYkeIVTw=; b=kRc3V0NRUdNfuZyHYG3Xz3eA9NsGfkVtseIs7SQsAgEhNZE+aX+hdJZF/VJ+2iDUpG Q25MAlF2/UcdH3KuqnYcpL7aXn1aKCZ8WbodJ6QmI6TxKcBeZGCXNIUhttsJoqxd7Aiu aHrms+9+wP8szpXAsaXOqAsqL3O/C43QF99MQjjYwWMpikc88KH5Vq3NcTweqQOwxlIF e3K7fIRGikOtxh27OXBD+IzGZ3U2lLvc01/r6+3+KXQOd9dUoWU6mthnMhF57abEROFz 4dujyoHiaghnprNhGIA7U5UBWSu1L7ljsln6nVThnpnYVwp+RLZIBW9yOKAQ6SMb1iPb MMvw== X-Gm-Message-State: AOAM530VeNcCz1PXWEYNXNMADLhYtVCRrefHjDP6u3ahKd20qn+NoHbk HBzelNsXd8vEJ2aRyQizQHE= X-Google-Smtp-Source: ABdhPJxJmTAplKj9H30cFn2CwCwP6Cw9Wtfz1RliRIYhoriS0jMXQ8lZqKO8/Xz/kUJH/gErlbpVBQ== X-Received: by 2002:a05:600c:4f91:: with SMTP id n17mr7450020wmq.71.1613578261000; Wed, 17 Feb 2021 08:11:01 -0800 (PST) Received: from adgra-XPS-15-9570.home (2a01cb0008bd2700605dcea117b1d0f0.ipv6.abo.wanadoo.fr. [2a01:cb00:8bd:2700:605d:cea1:17b1:d0f0]) by smtp.gmail.com with ESMTPSA id e12sm4260260wrv.59.2021.02.17.08.11.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Feb 2021 08:11:00 -0800 (PST) From: Adrien Grassein To: Subject: [PATCH v2 7/8] arm64: dts: imx8mm-nitrogen-r2: add audio Date: Wed, 17 Feb 2021 17:10:51 +0100 Message-Id: <20210217161052.877877-8-adrien.grassein@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210217161052.877877-1-adrien.grassein@gmail.com> References: <20210217161052.877877-1-adrien.grassein@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210217_111104_788543_2B0B98F9 X-CRM114-Status: GOOD ( 12.36 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, will@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, linux-kernel@vger.kernel.org, krzk@kernel.org, robh+dt@kernel.org, linux-imx@nxp.com, kernel@pengutronix.de, catalin.marinas@arm.com, festevam@gmail.com, linux-arm-kernel@lists.infradead.org, Adrien Grassein Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add audio description and pin muxing. Signed-off-by: Adrien Grassein --- .../boot/dts/freescale/imx8mm-nitrogen-r2.dts | 86 +++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/arch/arm64/boot/dts/freescale/imx8mm-nitrogen-r2.dts b/arch/arm64/boot/dts/freescale/imx8mm-nitrogen-r2.dts index bdadc70acac6..6a90ef77b25b 100644 --- a/arch/arm64/boot/dts/freescale/imx8mm-nitrogen-r2.dts +++ b/arch/arm64/boot/dts/freescale/imx8mm-nitrogen-r2.dts @@ -28,6 +28,29 @@ reg_wlan_vmmc: regulator-wlan-vmmc { gpio = <&gpio3 20 GPIO_ACTIVE_HIGH>; enable-active-high; }; + + sound-wm8960 { + audio-cpu = <&sai1>; + audio-codec = <&wm8960>; + audio-routing = + "Headphone Jack", "HP_L", + "Headphone Jack", "HP_R", + "Ext Spk", "SPK_LP", + "Ext Spk", "SPK_LN", + "Ext Spk", "SPK_RP", + "Ext Spk", "SPK_RN", + "RINPUT1", "Mic Jack", + "Mic Jack", "MICB"; + codec-master; + compatible = "fsl,imx-audio-wm8960"; + /* JD2: hp detect high for headphone*/ + hp-det-gpios = <&gpio4 28 GPIO_ACTIVE_HIGH>; + /* Jack is not stuffed */ + mic-det-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>; + model = "wm8960-audio"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_sound_wm8960>; + }; }; &A53_0 { @@ -211,6 +234,22 @@ rtc@68 { }; }; +&i2c4 { + clock-frequency = <100000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c4>; + status = "okay"; + + wm8960: codec@1a { + compatible = "wlf,wm8960"; + reg = <0x1a>; + clocks = <&clk IMX8MM_CLK_SAI1_ROOT>; + clock-names = "mclk1"; + wlf,shared-lrclk; + #sound-dai-cells = <0>; + }; +}; + &pwm1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_pwm1>; @@ -238,6 +277,18 @@ &pwm4 { status = "okay"; }; +&sai1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_sai1>; + status = "okay"; +}; + +&sai2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_sai2>; + status = "okay"; +}; + /* BT */ &uart1 { pinctrl-names = "default"; @@ -406,6 +457,13 @@ MX8MM_IOMUXC_I2C3_SDA_I2C3_SDA 0x400001c3 >; }; + pinctrl_i2c4: i2c4grp { + fsl,pins = < + MX8MM_IOMUXC_I2C4_SCL_I2C4_SCL 0x400001c3 + MX8MM_IOMUXC_I2C4_SDA_I2C4_SDA 0x400001c3 + >; + }; + pinctrl_i2c3a_rv4162: i2c3a-rv4162grp { fsl,pins = < MX8MM_IOMUXC_SAI2_RXC_GPIO4_IO22 0x1c0 @@ -442,6 +500,34 @@ MX8MM_IOMUXC_SAI5_RXC_GPIO3_IO20 0x16 >; }; + pinctrl_sai1: sai1grp { + fsl,pins = < + /* wm8960 */ + MX8MM_IOMUXC_SAI1_MCLK_SAI1_MCLK 0xd6 + MX8MM_IOMUXC_SAI1_TXFS_SAI1_TX_SYNC 0xd6 + MX8MM_IOMUXC_SAI1_TXC_SAI1_TX_BCLK 0xd6 + MX8MM_IOMUXC_SAI1_TXD0_SAI1_TX_DATA0 0xd6 + MX8MM_IOMUXC_SAI1_RXD0_SAI1_RX_DATA0 0xd6 + >; + }; + + pinctrl_sai2: sai2grp { + fsl,pins = < + /* Bluetooth PCM */ + MX8MM_IOMUXC_SAI2_TXFS_SAI2_TX_SYNC 0xd6 + MX8MM_IOMUXC_SAI2_TXC_SAI2_TX_BCLK 0xd6 + MX8MM_IOMUXC_SAI2_TXD0_SAI2_TX_DATA0 0xd6 + MX8MM_IOMUXC_SAI2_RXD0_SAI2_RX_DATA0 0xd6 + >; + }; + + pinctrl_sound_wm8960: sound-wm8960grp { + fsl,pins = < + MX8MM_IOMUXC_GPIO1_IO10_GPIO1_IO10 0x80 + MX8MM_IOMUXC_SAI3_RXFS_GPIO4_IO28 0x80 + >; + }; + pinctrl_uart1: uart1grp { fsl,pins = < MX8MM_IOMUXC_UART1_RXD_UART1_DCE_RX 0x140