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=-11.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 EA6A9C433E3 for ; Mon, 17 Aug 2020 13:41:46 +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 AF00C20786 for ; Mon, 17 Aug 2020 13:41:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="3jiNU8M3"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="X6klsXTp" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AF00C20786 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org 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:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=998ls28SfYxZEDnrpJcxSXon6s5hk7Xkg1+pA5EMHZk=; b=3jiNU8M3zwmcpzpGT3hs98WvC 1cE1Qg7q+WYcDFnOeLR8GNuNiUaZKUsy9Tuv0MZ+GjjgivPUbJ7Sd13yFOUY0bXvh2FEdffxoSgXM 5dpP3NQ/p+q0YcWf0dd8YtfdUJ49qTmx7nVmiY/bGM0rohmRSlsGhyKqpI4heXFckH1Zb6ow7gGd5 E8+Tl9IW43+0JvWm/61zbQVjeBEIMyq1O13ca7ApX2DZPFnvY53UAV7hARyNXoNSh5Js2e+f+1/ft Ao56AlIq7rHNDdPh/jsT5EwtMyECoJWnhTBw5LY9q/pgoUnneo5GO+ve9ven3uWxwl/dmPaemvOBR Wj35GvHmw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k7fN0-0005zE-8b; Mon, 17 Aug 2020 13:40:14 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k7fMx-0005yl-8o for linux-arm-kernel@lists.infradead.org; Mon, 17 Aug 2020 13:40:12 +0000 Received: from dragon (80.251.214.228.16clouds.com [80.251.214.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9F76B204FD; Mon, 17 Aug 2020 13:40:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597671610; bh=DpLtEeCc7osoHKspUjh3s0M2UFGfAdKBrZ9NCbDLJus=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=X6klsXTpEEaXqfqTcVJypMXzfzu9JQ4TaCW/J3Tq/B1oovyfR9P4jk/Xsiz5AIOjr dNJmFX0fb4QyMDVanUJ2gbr1jdLdcZnLojOcoPrn3TmaOAl+8jzaZ8yramQa9sSE6i vDeNlv785AJ5Q+GXYwAdtudNncn2E0CYUNuhKayQ= Date: Mon, 17 Aug 2020 21:40:05 +0800 From: Shawn Guo To: Shengjiu Wang Subject: Re: [PATCH] ARM: dts: imx7d-sdb: Add notes for audio sound card Message-ID: <20200817134003.GI16951@dragon> References: <1595483016-8822-1-git-send-email-shengjiu.wang@nxp.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1595483016-8822-1-git-send-email-shengjiu.wang@nxp.com> User-Agent: Mutt/1.9.4 (2018-02-28) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200817_094011_451151_2FF97825 X-CRM114-Status: GOOD ( 18.75 ) 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, s.hauer@pengutronix.de, linux-kernel@vger.kernel.org, robh+dt@kernel.org, linux-imx@nxp.com, kernel@pengutronix.de, festevam@gmail.com, linux-arm-kernel@lists.infradead.org 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 On Thu, Jul 23, 2020 at 01:43:36PM +0800, Shengjiu Wang wrote: > Configure the SAI device node, configure audio clock > and pinctrl. > > Enable the audio sound card, which use the SAI1 and > wm8960, and enable headphone detection. > > Signed-off-by: Shengjiu Wang s/notes/nodes in subject? I fixed it up and applied the patch. Shawn > --- > arch/arm/boot/dts/imx7d-sdb.dts | 81 +++++++++++++++++++++++++++++++++ > 1 file changed, 81 insertions(+) > > diff --git a/arch/arm/boot/dts/imx7d-sdb.dts b/arch/arm/boot/dts/imx7d-sdb.dts > index 17cca8a9f77b..b50b19f2d0f1 100644 > --- a/arch/arm/boot/dts/imx7d-sdb.dts > +++ b/arch/arm/boot/dts/imx7d-sdb.dts > @@ -146,6 +146,24 @@ panel_in: endpoint { > }; > }; > }; > + > + sound { > + compatible = "fsl,imx7d-evk-wm8960", > + "fsl,imx-audio-wm8960"; > + model = "wm8960-audio"; > + audio-cpu = <&sai1>; > + audio-codec = <&codec>; > + hp-det-gpio = <&gpio2 28 GPIO_ACTIVE_HIGH>; > + 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", > + "LINPUT1", "AMIC", > + "AMIC", "MICB"; > + }; > }; > > &adc1 { > @@ -363,6 +381,13 @@ codec: wm8960@1a { > clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; > clock-names = "mclk"; > wlf,shared-lrclk; > + wlf,hp-cfg = <2 2 3>; > + wlf,gpio-cfg = <1 3>; > + assigned-clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_SRC>, > + <&clks IMX7D_PLL_AUDIO_POST_DIV>, > + <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; > + assigned-clock-parents = <&clks IMX7D_PLL_AUDIO_POST_DIV>; > + assigned-clock-rates = <0>, <884736000>, <12288000>; > }; > }; > > @@ -391,6 +416,28 @@ ®_1p2 { > vin-supply = <&sw2_reg>; > }; > > +&sai1 { > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_sai1>; > + assigned-clocks = <&clks IMX7D_SAI1_ROOT_SRC>, > + <&clks IMX7D_PLL_AUDIO_POST_DIV>, > + <&clks IMX7D_SAI1_ROOT_CLK>; > + assigned-clock-parents = <&clks IMX7D_PLL_AUDIO_POST_DIV>; > + assigned-clock-rates = <0>, <884736000>, <36864000>; > + status = "okay"; > +}; > + > +&sai3 { > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_sai3 &pinctrl_sai3_mclk>; > + assigned-clocks = <&clks IMX7D_SAI3_ROOT_SRC>, > + <&clks IMX7D_PLL_AUDIO_POST_DIV>, > + <&clks IMX7D_SAI3_ROOT_CLK>; > + assigned-clock-parents = <&clks IMX7D_PLL_AUDIO_POST_DIV>; > + assigned-clock-rates = <0>, <884736000>, <36864000>; > + status = "okay"; > +}; > + > &snvs_pwrkey { > status = "okay"; > }; > @@ -550,6 +597,7 @@ MX7D_PAD_SD2_WP__GPIO5_IO10 0x59 > pinctrl_hog: hoggrp { > fsl,pins = < > MX7D_PAD_ECSPI2_SS0__GPIO4_IO23 0x34 /* bt reg on */ > + MX7D_PAD_EPDC_BDR0__GPIO2_IO28 0x59 /* headphone detect */ > >; > }; > > @@ -615,6 +663,33 @@ MX7D_PAD_LCD_RESET__LCD_RESET 0x79 > >; > }; > > + pinctrl_sai1: sai1grp { > + fsl,pins = < > + MX7D_PAD_SAI1_MCLK__SAI1_MCLK 0x1f > + MX7D_PAD_ENET1_RX_CLK__SAI1_TX_BCLK 0x1f > + MX7D_PAD_ENET1_CRS__SAI1_TX_SYNC 0x1f > + MX7D_PAD_ENET1_COL__SAI1_TX_DATA0 0x30 > + MX7D_PAD_ENET1_TX_CLK__SAI1_RX_DATA0 0x1f > + >; > + }; > + > + pinctrl_sai2: sai2grp { > + fsl,pins = < > + MX7D_PAD_SAI2_TX_BCLK__SAI2_TX_BCLK 0x1f > + MX7D_PAD_SAI2_TX_SYNC__SAI2_TX_SYNC 0x1f > + MX7D_PAD_SAI2_TX_DATA__SAI2_TX_DATA0 0x30 > + MX7D_PAD_SAI2_RX_DATA__SAI2_RX_DATA0 0x1f > + >; > + }; > + > + pinctrl_sai3: sai3grp { > + fsl,pins = < > + MX7D_PAD_UART3_TX_DATA__SAI3_TX_BCLK 0x1f > + MX7D_PAD_UART3_CTS_B__SAI3_TX_SYNC 0x1f > + MX7D_PAD_UART3_RTS_B__SAI3_TX_DATA0 0x30 > + >; > + }; > + > pinctrl_spi4: spi4grp { > fsl,pins = < > MX7D_PAD_GPIO1_IO09__GPIO1_IO9 0x59 > @@ -776,4 +851,10 @@ pinctrl_usb_otg2_vbus_reg: usbotg2vbusreggrp { > MX7D_PAD_LPSR_GPIO1_IO07__GPIO1_IO7 0x14 > >; > }; > + > + pinctrl_sai3_mclk: sai3grp_mclk { > + fsl,pins = < > + MX7D_PAD_LPSR_GPIO1_IO03__SAI3_MCLK 0x1f > + >; > + }; > }; > -- > 2.27.0 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel