From patchwork Tue Jun 16 06:42:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shengjiu Wang X-Patchwork-Id: 187974 Delivered-To: patch@linaro.org Received: by 2002:a92:cf06:0:0:0:0:0 with SMTP id c6csp3391129ilo; Mon, 15 Jun 2020 23:53:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx02+qKCBVLpWopbg019hPnPVrkYP9T4O8NqDmkznJejegYIcJ/1kTyBjR0pgrrQXqZRNHm X-Received: by 2002:a50:9ee4:: with SMTP id a91mr1323179edf.172.1592290433519; Mon, 15 Jun 2020 23:53:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592290433; cv=none; d=google.com; s=arc-20160816; b=tz5VaOqBZZpNacA7qdwl3X00piXHH4HgEUblw6Ac6iDYuKIk5HxxM8josLMqVNpVPE fEIgprqJsADJn2GUULUQvuSj2kadASKIDnIyk8qyyszgdMvW0+KTOSRA/dLJ7gtM7G5B 1I2bJtPFPyqSKk7Y47tMLEM0CsNSRgjEroRMQUKNA9ODCiEjn6v1ReG/YAg0EK+WU4K5 HFvv+pQn3gwCBRFWxfoetCQMl8l/YHeabLVmpqCFAhpxV8WyGDQXQdm00WzcAwF8+TP8 t6YmhPF95cUgucUd85UNjYU3sGI5Ypzp7nKuuhkB2dSi/OW5sT7JHR23ZKPZB3ldoJmi 45Yw== 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=nNsE+BN30YHdptcLXGAGxVA9rGiokksjDJPb9QDkPQ3F4VmuLPhWM3tlhGOcKG2hiS zpPDYYo7JZ1uc/i2O4mUV6TuZneEneTop4fXcGP4ift0+aRFstZqWOeXhN55IijvYWbv 0kqiiK7rncx6xLyESvEvksX21nW+craYTl1pWbkzACx+DRRxvVL7R6RbWSyEfX3z3INZ J4yMJ7X9QNmR1sotjFD7sCD/iulAB55Ev7k4pkuIABal+cUnwvgPV0RiotSP/3/y7fSK a7vjxRnZ+ZtzVGypw54DL6PzvDrVMXWZn1p0uiK/Vo7VvaWU0ltdBGrlYqRwEY2+bo/u vi6g== 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 dh1si10138750edb.78.2020.06.15.23.53.53; Mon, 15 Jun 2020 23:53:53 -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 S1726052AbgFPGxw (ORCPT + 6 others); Tue, 16 Jun 2020 02:53:52 -0400 Received: from inva021.nxp.com ([92.121.34.21]:36310 "EHLO inva021.nxp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725710AbgFPGxw (ORCPT ); Tue, 16 Jun 2020 02:53:52 -0400 Received: from inva021.nxp.com (localhost [127.0.0.1]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id D81D7200406; Tue, 16 Jun 2020 08:53:49 +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 9DE4E20046A; Tue, 16 Jun 2020 08:53:44 +0200 (CEST) Received: from localhost.localdomain (shlinux2.ap.freescale.net [10.192.224.44]) by invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id 38AF6402E8; Tue, 16 Jun 2020 14:53:38 +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 1/2] ASoC: bindings: fsl_spdif: Add new compatible string for imx6sx Date: Tue, 16 Jun 2020 14:42:40 +0800 Message-Id: <1592289761-29118-1-git-send-email-shengjiu.wang@nxp.com> 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 Tue Jun 16 06:42:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shengjiu Wang X-Patchwork-Id: 187975 Delivered-To: patch@linaro.org Received: by 2002:a92:cf06:0:0:0:0:0 with SMTP id c6csp3391163ilo; Mon, 15 Jun 2020 23:53:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx4RkazDnAn6b7g3JtBJp4Rtw023mRe6Rn8SIOKoXW9wlHbswi2jitn8T+SVNWJdruWhLsQ X-Received: by 2002:a05:6402:3135:: with SMTP id dd21mr1189380edb.110.1592290438771; Mon, 15 Jun 2020 23:53:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592290438; cv=none; d=google.com; s=arc-20160816; b=oqabeFz6qMkSf+XO5YZAqbZn7E5S1k79aHFvVGFR+7M+4gpsbrmHMtFGUp/aEwnugF MWNKCoNU3hTkFuABuaFCyGo8YTka1IdBzyEZw17VNPX/ZmHaXK9UhU+FipYht/7wq9TN c/bol8e5ivGTFgqvDqADkzK7RMubCxcbQKi632UfSEr0ecpY3pk12Kh2pY6kYg9qWSza S6b/jSOTRkTlzm9jt7pGXVCVHiwql8kqPiv9caXCxcVLkdndzIZE8Hk3y01yb0G9H+dv +iV1vkk+5og4PeXkyBUg48gk771tBh8c2pCE82u47kstYS8HYjA5ItEthAzW8fIAPI+I UepA== 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:message-id:date :subject:cc:to:from; bh=jwvLIuGXnmOOsBfBaJM43Pgq8k+/WKW0nxpunRvsWXw=; b=TZpggqiQaF1LjcZbORTR+069YHhzKiwNMYKoHoN4f/NwPelH2uO4vFNfPiR1KUdTZA ysSkrflyhJAGNsRRR8leKb2GnKScRu1NH6IS4E033rphaZH+ZUZO7wPE6E3apQykcpdt NDZUpr2ghiLj92PQoQyLqHQbS4lFRzSynnUgQZwhEjhOhojZpJyCFtKjpkkGhX5f3EWY 4NJ0ERwya2x59aABOG1R1xKFlFvIR7cE5S5CblkHhl+LZ/zzmpe35teNP9TLkkKdrc1E cEh3Nk5UZgkFf2xxFnIWYW4WV6oNl2sg07EbM8z4vuplR4u+gR9tgl0BgQnckdlDREOU pu6Q== 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 dh1si10138750edb.78.2020.06.15.23.53.58; Mon, 15 Jun 2020 23:53:58 -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 S1725710AbgFPGxy (ORCPT + 6 others); Tue, 16 Jun 2020 02:53:54 -0400 Received: from inva021.nxp.com ([92.121.34.21]:36360 "EHLO inva021.nxp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725901AbgFPGxx (ORCPT ); Tue, 16 Jun 2020 02:53:53 -0400 Received: from inva021.nxp.com (localhost [127.0.0.1]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id A90C0200460; Tue, 16 Jun 2020 08:53:51 +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 37E1A200470; Tue, 16 Jun 2020 08:53:46 +0200 (CEST) Received: from localhost.localdomain (shlinux2.ap.freescale.net [10.192.224.44]) by invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id 7BC6840310; Tue, 16 Jun 2020 14:53:39 +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 2/2] ASoC: fsl_spdif: Add support for imx6sx platform Date: Tue, 16 Jun 2020 14:42:41 +0800 Message-Id: <1592289761-29118-2-git-send-email-shengjiu.wang@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1592289761-29118-1-git-send-email-shengjiu.wang@nxp.com> References: <1592289761-29118-1-git-send-email-shengjiu.wang@nxp.com> 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 "ind_root_clk" which means the root clock is 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 --- sound/soc/fsl/fsl_spdif.c | 43 +++++++++++++++++++++++++++++++++++---- 1 file changed, 39 insertions(+), 4 deletions(-) -- 2.21.0 diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c index 1b2e516f9162..00e06803d32f 100644 --- a/sound/soc/fsl/fsl_spdif.c +++ b/sound/soc/fsl/fsl_spdif.c @@ -42,6 +42,17 @@ 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 + * @ind_root_clk: flag for round clk rate + */ +struct fsl_spdif_soc_data { + bool imx; + bool ind_root_clk; +}; + /* * SPDIF control structure * Defines channel status, subcode and Q sub @@ -93,6 +104,7 @@ struct fsl_spdif_priv { struct snd_soc_dai_driver cpu_dai_drv; struct platform_device *pdev; struct regmap *regmap; + const struct fsl_spdif_soc_data *soc; bool dpll_locked; u32 txrate[SPDIF_TXRATE_MAX]; u8 txclk_df[SPDIF_TXRATE_MAX]; @@ -110,6 +122,21 @@ struct fsl_spdif_priv { u32 regcache_srpc; }; +static struct fsl_spdif_soc_data fsl_spdif_vf610 = { + .imx = false, + .ind_root_clk = true, +}; + +static struct fsl_spdif_soc_data fsl_spdif_imx35 = { + .imx = true, + .ind_root_clk = true, +}; + +static struct fsl_spdif_soc_data fsl_spdif_imx6sx = { + .imx = true, + .ind_root_clk = false, +}; + /* DPLL locked and lock loss interrupt handler */ static void spdif_irq_dpll_lock(struct fsl_spdif_priv *spdif_priv) { @@ -421,7 +448,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 (clk != STC_TXCLK_SPDIF_ROOT || !spdif_priv->soc->ind_root_clk) goto clk_set_bypass; /* The S/PDIF block needs a clock of 64 * fs * txclk_df */ @@ -1186,7 +1213,8 @@ 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); + i == STC_TXCLK_SPDIF_ROOT && + spdif_priv->soc->ind_root_clk); if (savesub == ret) continue; @@ -1230,6 +1258,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 +1393,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);