From patchwork Thu Apr 29 02:52:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shengjiu Wang X-Patchwork-Id: 429201 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp1202081jao; Wed, 28 Apr 2021 20:08:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyiwr7R78hNVTjUHJav3r64jXXBhRIWcthVIv/KGIWEUI8IM7CL8v9SNrl1Egukka9Rko1P X-Received: by 2002:a17:903:2310:b029:eb:73d5:3e4e with SMTP id d16-20020a1709032310b02900eb73d53e4emr32718439plh.66.1619665686652; Wed, 28 Apr 2021 20:08:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619665686; cv=none; d=google.com; s=arc-20160816; b=0bB2/TfnAbRAF+XZFxfe3r3lO5av/O84eVPif7yYEgbnuACVS453pfFiRYzbSdkVmt vmEz5tdWVmJ+9V0bOh9X9xMXV2DlY4H8LZqVu8Wp115MlTpfBjpTne7nlXheMvnA6Rga pHZClt+HUkKYJHw1Vxm1PP+QTM4eK099dC8nHTbAtQuylJFTSWW5PgWThap4LdtNMQUl +Ylptu605P1bu8aZj26N3v3SNoPND3jz4XM5/RYpGxT4G+NEFF2lTVSvjvRtbNAdFf9S em4QjQaGWqzR3UKxmB6O8EwEkbKQzEOntI86ocDw1/jSFcX+R89m2lbh2OdQLtKsJmdU P1GQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:to:from; bh=qHptHWmAyEZomrTHt0EA0NZZpkitkzeaRnbrEskHp0M=; b=ZjsqgX1zKcUre2WmppehK9/8vYUZP1oPCt6PdDepeqI64+UcEA8ygaxVe/Xiy+3NUm B0LwsBsNhrIvWxpl9AcIzB8MvlLPFZ982MlOOxxLZkGwModqhO61L2VeDbdNxaM5Aa5J TTnRpy/ee4PevlcTu8WZpNmW27P6J860w5GMdn6o8ajmDMjOjcC2IED+yGsLkSOQHPJC OTdxagcsoaRZlN5AvQg+NDRawNljk5AU854eXPPtl97cpcvIU1ZNl2LRPCxxk1ELxBI4 +dM21CCYtSTlCYYbW9T01OO7QSfxllN0WiJZkG8EGBH/9lwksD/bl1UKTrWI/w5WQIDO CHxA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id kk9si9565753pjb.125.2021.04.28.20.08.06; Wed, 28 Apr 2021 20:08:06 -0700 (PDT) Received-SPF: pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229805AbhD2DIv (ORCPT + 6 others); Wed, 28 Apr 2021 23:08:51 -0400 Received: from inva021.nxp.com ([92.121.34.21]:52316 "EHLO inva021.nxp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229762AbhD2DIv (ORCPT ); Wed, 28 Apr 2021 23:08:51 -0400 Received: from inva021.nxp.com (localhost [127.0.0.1]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 4B9FA20235C; Thu, 29 Apr 2021 05:08:04 +0200 (CEST) Received: from invc005.ap-rdc01.nxp.com (invc005.ap-rdc01.nxp.com [165.114.16.14]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id D00DB2011B7; Thu, 29 Apr 2021 05:07:59 +0200 (CEST) Received: from localhost.localdomain (shlinux2.ap.freescale.net [10.192.224.44]) by invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id 9377840287; Thu, 29 Apr 2021 05:07:54 +0200 (CEST) From: Shengjiu Wang To: robh+dt@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, shengjiu.wang@gmail.com Subject: [PATCH] ARM: dts: imx6ul: Switch to fsl-asoc-card sound card Date: Thu, 29 Apr 2021 10:52:19 +0800 Message-Id: <1619664739-12589-1-git-send-email-shengjiu.wang@nxp.com> X-Mailer: git-send-email 2.7.4 X-Virus-Scanned: ClamAV using ClamSMTP Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org There is issue with simple sound card, the simple sound card can't configure the pll of codec. [ 115.352669] wm8960 1-001a: failed to configure clock [ 115.358843] wm8960 1-001a: ASoC: error at snd_soc_dai_hw_params on wm8960-hifi: -22 So Switch to fsl-asoc-card and the fsl-asoc-card can support asrc module as front-end component. Signed-off-by: Shengjiu Wang --- arch/arm/boot/dts/imx6ul-14x14-evk.dtsi | 50 +++++++++++-------------- 1 file changed, 21 insertions(+), 29 deletions(-) -- 2.27.0 diff --git a/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi b/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi index 5a1e10def6ef..779cc536566d 100644 --- a/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi +++ b/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi @@ -60,38 +60,26 @@ reg_can_3v3: regulator-can-3v3 { gpios = <&gpio_spi 3 GPIO_ACTIVE_LOW>; }; - sound { - compatible = "simple-audio-card"; - simple-audio-card,name = "mx6ul-wm8960"; - simple-audio-card,format = "i2s"; - simple-audio-card,bitclock-master = <&dailink_master>; - simple-audio-card,frame-master = <&dailink_master>; - simple-audio-card,widgets = - "Microphone", "Mic Jack", - "Line", "Line In", - "Line", "Line Out", - "Speaker", "Speaker", - "Headphone", "Headphone Jack"; - simple-audio-card,routing = + sound-wm8960 { + compatible = "fsl,imx-audio-wm8960"; + model = "wm8960-audio"; + audio-cpu = <&sai2>; + audio-codec = <&codec>; + audio-asrc = <&asrc>; + hp-det-gpio = <&gpio5 4 0>; + audio-routing = "Headphone Jack", "HP_L", "Headphone Jack", "HP_R", - "Speaker", "SPK_LP", - "Speaker", "SPK_LN", - "Speaker", "SPK_RP", - "Speaker", "SPK_RN", - "LINPUT1", "Mic Jack", + "Ext Spk", "SPK_LP", + "Ext Spk", "SPK_LN", + "Ext Spk", "SPK_RP", + "Ext Spk", "SPK_RN", + "LINPUT2", "Mic Jack", "LINPUT3", "Mic Jack", - "RINPUT1", "Mic Jack", - "RINPUT2", "Mic Jack"; - - simple-audio-card,cpu { - sound-dai = <&sai2>; - }; - - dailink_master: simple-audio-card,codec { - sound-dai = <&codec>; - clocks = <&clks IMX6UL_CLK_SAI2>; - }; + "RINPUT1", "AMIC", + "RINPUT2", "AMIC", + "Mic Jack", "MICB", + "AMIC", "MICB"; }; spi4 { @@ -145,6 +133,10 @@ codec: wm8960@1a { compatible = "wlf,wm8960"; reg = <0x1a>; wlf,shared-lrclk; + wlf,hp-cfg = <3 2 3>; + wlf,gpio-cfg = <1 3>; + clocks = <&clks IMX6UL_CLK_SAI2>; + clock-names = "mclk"; }; camera@3c {