From patchwork Wed Jun 17 06:58:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shengjiu Wang X-Patchwork-Id: 188123 Delivered-To: patch@linaro.org Received: by 2002:a92:cf06:0:0:0:0:0 with SMTP id c6csp204447ilo; Wed, 17 Jun 2020 00:09:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw1Ws1Vs9wr9LXrV7kbw/M7bKMJVc8e/4pzAxFQysXY+2pSlcg7OF1I9Lag42dUsX8IETeq X-Received: by 2002:a17:906:4989:: with SMTP id p9mr6521901eju.417.1592377759129; Wed, 17 Jun 2020 00:09:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592377759; cv=none; d=google.com; s=arc-20160816; b=qgpqyIQ535Q8/Q4UgI0gk1R5bRUtDIcNE8AuBxSyMUdGyqMCYD2x49NtFIRY0X5+5J GE9Rr54asAzgSTer9UQWRvIklSIOs8FTnrrugnARArYaHedEQAMHl7hGKmIulW6u/+y1 S7Naf7g6tku499BfDNXLsBtQpQTHckGxPBtrqsCjVibLo1Ml3NeDTkIPfsPm684P9tuH miLlNt4SfbgV0dGjkIrkerWAK6j+IVleLrPaFGvaL0SxuHmRVdWajMcXK5uVXdGUeQ7/ CxSnsP5DluI4LuEjX7McMMaRyLQCGrcYud548kdTAlWEkOX8UOH4YMkA4h2u1xVHBN/f 5M/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from; bh=CFg3FlAP1i5tdDb3cd5dI8j7VfIW6jbzb6l0+SrqDcQ=; b=SO3u+OUP14wito1rDy5G5Kf2F777ZIPT3KPzB6Hg9EuFNDCXFOoDuf+gEeUXypvVYz RL0w73p1OHZ5S7Pnhj0d+9XX50ZNmM2PGTsYThsq9lrakuLWO9qjhIEvR4tg7MQtqR9J 90PpWdWhMWdUhsdadSdkf1jY3z5MVFyj7Z+9oqK4mEem6wO1XJz5pWcbBl+K/ewDMgFX kByvZ4BRRo5D0ZBeEZrHuw1CZCXp+iYaVJXC11XHY3xwocNYpRbaqqFGAPNTUBZ1lB3w 0+mq70LDqZdrHvELRXSQB55qvhKtTUYVCjg5MbTofWrZj2x/g+cNMRvVXMfxsfGxh81v sObw== 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 f12si12372888ejt.70.2020.06.17.00.09.18; Wed, 17 Jun 2020 00:09:19 -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 S1726331AbgFQHJS (ORCPT + 6 others); Wed, 17 Jun 2020 03:09:18 -0400 Received: from inva021.nxp.com ([92.121.34.21]:60694 "EHLO inva021.nxp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725536AbgFQHJS (ORCPT ); Wed, 17 Jun 2020 03:09:18 -0400 Received: from inva021.nxp.com (localhost [127.0.0.1]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 3A58F2003C8; Wed, 17 Jun 2020 09:09:16 +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 F29C62008E1; Wed, 17 Jun 2020 09:09:10 +0200 (CEST) Received: from localhost.localdomain (shlinux2.ap.freescale.net [10.192.224.44]) by invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id 26DA3402F3; Wed, 17 Jun 2020 15:09:04 +0800 (SGT) From: Shengjiu Wang To: timur@kernel.org, nicoleotsuka@gmail.com, Xiubo.Lee@gmail.com, festevam@gmail.com, broonie@kernel.org, perex@perex.cz, tiwai@suse.com, alsa-devel@alsa-project.org, lgirdwood@gmail.com, robh+dt@kernel.org, devicetree@vger.kernel.org Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 1/2] ASoC: bindings: fsl_spdif: Add new compatible string for imx6sx Date: Wed, 17 Jun 2020 14:58:00 +0800 Message-Id: X-Mailer: git-send-email 2.7.4 X-Virus-Scanned: ClamAV using ClamSMTP Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Add new compatible string "fsl,imx6sx-spdif" in the binding document. And add compatible string "fsl,vf610-spdif" which was missed before. Signed-off-by: Shengjiu Wang --- Documentation/devicetree/bindings/sound/fsl,spdif.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) -- 2.21.0 diff --git a/Documentation/devicetree/bindings/sound/fsl,spdif.txt b/Documentation/devicetree/bindings/sound/fsl,spdif.txt index 8b324f82a782..e1365b0ee1e9 100644 --- a/Documentation/devicetree/bindings/sound/fsl,spdif.txt +++ b/Documentation/devicetree/bindings/sound/fsl,spdif.txt @@ -6,7 +6,11 @@ a fibre cable. Required properties: - - compatible : Compatible list, must contain "fsl,imx35-spdif". + - compatible : Compatible list, should contain one of the following + compatibles: + "fsl,imx35-spdif", + "fsl,vf610-spdif", + "fsl,imx6sx-spdif", - reg : Offset and length of the register set for the device. From patchwork Wed Jun 17 06:58:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shengjiu Wang X-Patchwork-Id: 188124 Delivered-To: patch@linaro.org Received: by 2002:a92:cf06:0:0:0:0:0 with SMTP id c6csp204495ilo; Wed, 17 Jun 2020 00:09:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwzZpDYywI748Pi6mBR+/oncrsqUrCZwgT5kim7WcmCsqd+ax12X+FNL9kI4orGSI9rlbC6 X-Received: by 2002:a17:906:7acf:: with SMTP id k15mr6479528ejo.410.1592377764069; Wed, 17 Jun 2020 00:09:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592377764; cv=none; d=google.com; s=arc-20160816; b=uKksgdSq7WlJz0r27uGgcAYGEzkPrw5r9XCW1T9VPkhrGAeKIRKrUvAqtHfK1PEld9 PdF1d+XpyJPBGYYKggp5nFsm7MffyLyp+GOQlycwRhNLu3Vgs90t6uMK3IuQx7v6699p TyxOj6G27AtvdvUfjjkyYIR2Wl4repCl/O+00HMuiTeH5p783sbT1oRs7XTjNhDgelKy IVw+4WLJmqOScvrqcmv69+LS14y6/aRHJwfj94M+4j5F/jLk4A2mgUhXPGKwBC6xtlpb oVqTyU8yT05Y4zkkMSIhaVH3RZMWSzg2ZyuFLAcYD17RzrkYxKpqrGA90QLok+Fjz5Zp jkow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:references :in-reply-to:message-id:date:subject:cc:to:from; bh=hOmZ8AT8vC0pqYAEzpZYplH9zdXHLZxyYO7/FDQjEMw=; b=b/ML3JogIQ4IhZV5rRwjCI4APKzpp+LuNfpqrIjnOc9osxDU6uRdOt4LbY0OiVCp5n TLffjx2myKoZxBBudwEgyjDNZvG3akdCmPkFO8GgKHMItlO89EgaREdVjmb/8e/Xrj+q yksNM00BqItoWmgYeaD3NoTuq9EbbyiEo+xW11X4IJGNtornZ7iYh6qabwbe5aBIsBv5 OzjEg+s0tOqkfpa7jtjZbkbVvZzAF89dFMx/rfZqdb586oIhkW2Kr5XgBuFef1NJxZQH 7CQ9jtCUN8IsMQr/bcPvvUOlSVNBcattyzTE4bAvCKQcEvFsT92hAdruejJdpJpYknum RYJA== 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 f12si12372888ejt.70.2020.06.17.00.09.23; Wed, 17 Jun 2020 00:09:24 -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 S1726510AbgFQHJU (ORCPT + 6 others); Wed, 17 Jun 2020 03:09:20 -0400 Received: from inva021.nxp.com ([92.121.34.21]:60778 "EHLO inva021.nxp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726308AbgFQHJU (ORCPT ); Wed, 17 Jun 2020 03:09:20 -0400 Received: from inva021.nxp.com (localhost [127.0.0.1]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 9812C2008E7; Wed, 17 Jun 2020 09:09:17 +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 2D74B2008F7; Wed, 17 Jun 2020 09:09:12 +0200 (CEST) Received: from localhost.localdomain (shlinux2.ap.freescale.net [10.192.224.44]) by invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id 67105402B1; Wed, 17 Jun 2020 15:09:05 +0800 (SGT) From: Shengjiu Wang To: timur@kernel.org, nicoleotsuka@gmail.com, Xiubo.Lee@gmail.com, festevam@gmail.com, broonie@kernel.org, perex@perex.cz, tiwai@suse.com, alsa-devel@alsa-project.org, lgirdwood@gmail.com, robh+dt@kernel.org, devicetree@vger.kernel.org Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 2/2] ASoC: fsl_spdif: Add support for imx6sx platform Date: Wed, 17 Jun 2020 14:58:01 +0800 Message-Id: <7a343edd5f8487abad248a0b862f45fd95067751.1592376770.git.shengjiu.wang@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: In-Reply-To: References: X-Virus-Scanned: ClamAV using ClamSMTP Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The one difference on imx6sx platform is that the root clock is shared with ASRC module, so we add a new flags "shared_root_clock" which means the root clock is not independent, then we will not do the clk_set_rate and clk_round_rate to avoid impact ASRC module usage. As add a new flags, we include the soc specific data struct. Signed-off-by: Shengjiu Wang Reviewed-by: Nicolin Chen --- changes in v3 - refine some comments - add Reviewed-by: Nicolin Chen changes in v2 - use shared_root_clk instead ind_root_clk. - add fsl_spdif_can_set_clk_rate function. sound/soc/fsl/fsl_spdif.c | 50 +++++++++++++++++++++++++++++++++++---- 1 file changed, 45 insertions(+), 5 deletions(-) -- 2.21.0 diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c index 1b2e516f9162..5bc0e4729341 100644 --- a/sound/soc/fsl/fsl_spdif.c +++ b/sound/soc/fsl/fsl_spdif.c @@ -42,6 +42,18 @@ static u8 srpc_dpll_locked[] = { 0x0, 0x1, 0x2, 0x3, 0x4, 0xa, 0xb }; #define DEFAULT_RXCLK_SRC 1 +/** + * struct fsl_spdif_soc_data: soc specific data + * + * @imx: for imx platform + * @shared_root_clock: flag of sharing a clock source with others; + * so the driver shouldn't set root clock rate + */ +struct fsl_spdif_soc_data { + bool imx; + bool shared_root_clock; +}; + /* * SPDIF control structure * Defines channel status, subcode and Q sub @@ -89,6 +101,7 @@ struct spdif_mixer_control { * @dma_params_rx: DMA parameters for receive channel */ struct fsl_spdif_priv { + const struct fsl_spdif_soc_data *soc; struct spdif_mixer_control fsl_spdif_control; struct snd_soc_dai_driver cpu_dai_drv; struct platform_device *pdev; @@ -110,6 +123,27 @@ struct fsl_spdif_priv { u32 regcache_srpc; }; +static struct fsl_spdif_soc_data fsl_spdif_vf610 = { + .imx = false, + .shared_root_clock = false, +}; + +static struct fsl_spdif_soc_data fsl_spdif_imx35 = { + .imx = true, + .shared_root_clock = false, +}; + +static struct fsl_spdif_soc_data fsl_spdif_imx6sx = { + .imx = true, + .shared_root_clock = true, +}; + +/* Check if clk is a root clock that does not share clock source with others */ +static inline bool fsl_spdif_can_set_clk_rate(struct fsl_spdif_priv *spdif, int clk) +{ + return (clk == STC_TXCLK_SPDIF_ROOT) && !spdif->soc->shared_root_clock; +} + /* DPLL locked and lock loss interrupt handler */ static void spdif_irq_dpll_lock(struct fsl_spdif_priv *spdif_priv) { @@ -420,8 +454,7 @@ static int spdif_set_sample_rate(struct snd_pcm_substream *substream, sysclk_df = spdif_priv->sysclk_df[rate]; - /* Don't mess up the clocks from other modules */ - if (clk != STC_TXCLK_SPDIF_ROOT) + if (!fsl_spdif_can_set_clk_rate(spdif_priv, clk)) goto clk_set_bypass; /* The S/PDIF block needs a clock of 64 * fs * txclk_df */ @@ -1186,7 +1219,7 @@ static int fsl_spdif_probe_txclk(struct fsl_spdif_priv *spdif_priv, continue; ret = fsl_spdif_txclk_caldiv(spdif_priv, clk, savesub, index, - i == STC_TXCLK_SPDIF_ROOT); + fsl_spdif_can_set_clk_rate(spdif_priv, i)); if (savesub == ret) continue; @@ -1230,6 +1263,12 @@ static int fsl_spdif_probe(struct platform_device *pdev) spdif_priv->pdev = pdev; + spdif_priv->soc = of_device_get_match_data(&pdev->dev); + if (!spdif_priv->soc) { + dev_err(&pdev->dev, "failed to get soc data\n"); + return -ENODEV; + } + /* Initialize this copy of the CPU DAI driver structure */ memcpy(&spdif_priv->cpu_dai_drv, &fsl_spdif_dai, sizeof(fsl_spdif_dai)); spdif_priv->cpu_dai_drv.name = dev_name(&pdev->dev); @@ -1359,8 +1398,9 @@ static const struct dev_pm_ops fsl_spdif_pm = { }; static const struct of_device_id fsl_spdif_dt_ids[] = { - { .compatible = "fsl,imx35-spdif", }, - { .compatible = "fsl,vf610-spdif", }, + { .compatible = "fsl,imx35-spdif", .data = &fsl_spdif_imx35, }, + { .compatible = "fsl,vf610-spdif", .data = &fsl_spdif_vf610, }, + { .compatible = "fsl,imx6sx-spdif", .data = &fsl_spdif_imx6sx, }, {} }; MODULE_DEVICE_TABLE(of, fsl_spdif_dt_ids);