From mboxrd@z Thu Jan 1 00:00:00 1970 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 77D55C433E0 for ; Fri, 19 Feb 2021 14:36:06 +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 202DC64D9A for ; Fri, 19 Feb 2021 14:36:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 202DC64D9A 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=e4/dtblTPOEdoKhXTeFClzitA7QZCEyOUDHoNWaDp24=; b=h4hNLzyVP7Ao6palyycx8tchM E9smsb/IouMacnWdq56FudXZHreIQRkXR7qLlyZ5QCHUjH+m/pReH+iaWNgv/IUh/VAeZscjStjl5 ZjJEmquPAZfsJYEsKe8P0pbm7IHCmnIUGG33tfQ9Atr4NFt1zffeAzbiNMLVLdH2K3bmXi6PLQpbB EmoBjYjy/X0BtGJXXBQMRx185GfAtGUh6g6eDdnX8JwZU+j1anDVEuWiAgZwwOIzxHU6epKC13F74 IFsmJOZeWvQBN14KntcJsBcNooVBH0n9RQ6vFCcGbprEzWyGWoC7Hk5nu2MUnKvNlFUR66blYhcuD 8HCWpQvog==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lD6qN-000778-RE; Fri, 19 Feb 2021 14:33:19 +0000 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1lD6nr-0005rC-3k for linux-arm-kernel@lists.infradead.org; Fri, 19 Feb 2021 14:30:44 +0000 Received: by mail-wr1-x429.google.com with SMTP id a4so6582103wro.8 for ; Fri, 19 Feb 2021 06:30:42 -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=oR8ZY3nztvYVqBilVl0U3ZkANai8Igyf3opAC1nc1Gg=; b=LcVwRlFIUWsqehZsbUV3dMi85RbIiCmzEJ8sHsPq/vgdhdqrWYay1BZdf8sGDlfhJx mgzCkScVzyXrV+moMXTzPZ0wlXQt9LwleoWPDOHmiwJ10sEj3zkdYBT3/5Qzmf3hUd7j qEjSOJy64CoL67kOn4z5VCYaUGTJeAnq9+nfQScGn+RJHaRuRTe5ZY/vKt5NkMFptb1o TmWAkYMTKdCrXptUHkuxi6X2Cp1Z3ZK/wPLvTcedI6ukxUth5WttxWR0hpgP95cRj1KW 8reegRymzjv7NsLvM0Dhewr5Xa3vaSniduseDCg+/29Vace7CuW034HZ7P9q7x0/gZ81 7psQ== 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=oR8ZY3nztvYVqBilVl0U3ZkANai8Igyf3opAC1nc1Gg=; b=kB/eUjxQEGHk76JBo2qQfkhukElzh+UcnxaP7VfOM0Kms3IspwhuhfxvJYZpiRCWEU 6yuurshmDlfELbFdOYDXCQY+LCzA05iQqB/M6bewQr//jgnWFkwMLIt3Adrus6NO2NTC e84i40GqJGHFkfaIKf8GjWbVjWX2GYo0Zz6bGLcL9C/HUuwwdN9aWmC7X5UCsYX/ZZJj dvUoiFzDlK7rBGwVB4LEayk78OyBvz2BSV8U25Ju2CFc920hcVUhoQFnHLWELSXD9R+A 7ArqksuPYo9A6o6RJOE19F0peBQmAfEiTw5vcScyoSlr+MmpYdsJCdvmGfxtJpTt7mla VY1g== X-Gm-Message-State: AOAM532/8jIkLl5VV6Euht33h4uERniR3EzvgR/U8bSHz7dogk1tqXfu PNOudbyRioHTYAE+2cAMexqehBQWA/8tmA== X-Google-Smtp-Source: ABdhPJz2yRmSPJ0vNPbRYzXrA/kTcYEYkq8Piqqc7A2Yci5F40ZGgVRMda91sFy/4RIktG4VgoLI5A== X-Received: by 2002:a5d:6448:: with SMTP id d8mr9517868wrw.401.1613745041524; Fri, 19 Feb 2021 06:30:41 -0800 (PST) Received: from localhost.localdomain (2a01cb0008bd27003cf54d240f3b36ef.ipv6.abo.wanadoo.fr. [2a01:cb00:8bd:2700:3cf5:4d24:f3b:36ef]) by smtp.gmail.com with ESMTPSA id v9sm8348215wrn.86.2021.02.19.06.30.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Feb 2021 06:30:41 -0800 (PST) From: Adrien Grassein To: Subject: [PATCH v3 8/9] arm64: dts: imx8mm-nitrogen-r2: add audio Date: Fri, 19 Feb 2021 15:30:27 +0100 Message-Id: <20210219143028.207975-9-adrien.grassein@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210219143028.207975-1-adrien.grassein@gmail.com> References: <20210219143028.207975-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-20210219_093043_330018_B0CC7622 X-CRM114-Status: GOOD ( 12.49 ) 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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 0fd8e2a54073..961818598247 100644 --- a/arch/arm64/boot/dts/freescale/imx8mm-nitrogen-r2.dts +++ b/arch/arm64/boot/dts/freescale/imx8mm-nitrogen-r2.dts @@ -27,6 +27,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 { @@ -210,6 +233,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>; @@ -237,6 +276,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"; @@ -405,6 +456,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 @@ -441,6 +499,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 -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel