Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3411065ybt; Tue, 30 Jun 2020 02:00:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyEhmVfUi98VCBjQdSIuEzTjbg4qjiXt9xqn+N7ug+2Zw/vpF+XP9VzUdGkyuox9A7lY/8L X-Received: by 2002:a05:6402:1778:: with SMTP id da24mr9291087edb.126.1593507643114; Tue, 30 Jun 2020 02:00:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593507643; cv=none; d=google.com; s=arc-20160816; b=w1Jb9eF3KrlExq/gdShsqBXLLMhtI3OjXEncI2RRNn/zUxfHGMnOvoPAjG0HkubLcs n60bHbO7ESlipgywILXrKdNS1dC/XHFfEcHQFtCsgmBUSnJTsS9MjtWJM3wKRGTdv+uc 0qEXsnoHZvdTjc04hCX8eXJBf18EEqqTaiQO6U3uC0vzniIZ3fBIpJPypN3PFgxWVYdO 2MT30FyQk1csUF4XGjOWcPBUz7HujhRD6kJKkXl4BAxSBllGyJ3Ls4ZRBXlYpvLWJK1d l/n5L/mnPRzwqgEG3BA0PHCxerenUbWsp7SdNKC1bYx6oV1jmQe/mW9ncNqGNEsLbHM2 +enA== 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=QlpiE7qIaOk3oqBv6d9ZCRvjZnr8hJ1w7GdW8RNKnQY=; b=plVm4SWfeNYRqI8TUgfBiYzjA4NwJCkiUiQuDc0HZJKKv1tw+L471mRoVaQvBUca65 Kob7KqgMHtN6lDsoNSjNcW0f0DMgS1hsjosjnbNHFwOEJGR0Aj+vPdD5IYol18C045XP a+RcBVvL8BDRg3sbpQ6fgGAOUFNVg6ssDKLncanLgv/+0lwFOxqPor0+1o2d8wBIslqT sogAXI2j1QYFdbThNDhqDPwR4a7NepP9/lNZAFa6PeYHL+A1aYquSE0LVnl1l+7dVXfN qlpaJ/tyR1G4c15VfQROG89fzFqwNvfMMI08QdA81P/KwF7e1tlJXmpu9FNqXdncHh3f C3pA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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 mh4si1333873ejb.339.2020.06.30.02.00.19; Tue, 30 Jun 2020 02:00:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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 linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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 S1731830AbgF3I7q (ORCPT + 99 others); Tue, 30 Jun 2020 04:59:46 -0400 Received: from inva021.nxp.com ([92.121.34.21]:43896 "EHLO inva021.nxp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731591AbgF3I7p (ORCPT ); Tue, 30 Jun 2020 04:59:45 -0400 Received: from inva021.nxp.com (localhost [127.0.0.1]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 73145201338; Tue, 30 Jun 2020 10:59:43 +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 BA2B8201345; Tue, 30 Jun 2020 10:59:38 +0200 (CEST) Received: from localhost.localdomain (shlinux2.ap.freescale.net [10.192.224.44]) by invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id D653040287; Tue, 30 Jun 2020 16:59:32 +0800 (SGT) From: Shengjiu Wang To: timur@kernel.org, nicoleotsuka@gmail.com, Xiubo.Lee@gmail.com, festevam@gmail.com, broonie@kernel.org, alsa-devel@alsa-project.org, lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] ASoC: fsl_asrc: Add an option to select internal ratio mode Date: Tue, 30 Jun 2020 16:47:56 +0800 Message-Id: <1593506876-14599-1-git-send-email-shengjiu.wang@nxp.com> X-Mailer: git-send-email 2.7.4 X-Virus-Scanned: ClamAV using ClamSMTP Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The ASRC not only supports ideal ratio mode, but also supports internal ratio mode. For internal rato mode, the rate of clock source should be divided with no remainder by sample rate, otherwise there is sound distortion. Add function fsl_asrc_select_clk() to find proper clock source for internal ratio mode, if the clock source is available then internal ratio mode will be selected. With change, the ideal ratio mode is not the only option for user. Signed-off-by: Shengjiu Wang --- changes in v2 - update according to Nicolin's comments sound/soc/fsl/fsl_asrc.c | 54 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/sound/soc/fsl/fsl_asrc.c b/sound/soc/fsl/fsl_asrc.c index 95f6a9617b0b..4105ef2c4f99 100644 --- a/sound/soc/fsl/fsl_asrc.c +++ b/sound/soc/fsl/fsl_asrc.c @@ -582,11 +582,55 @@ static int fsl_asrc_dai_startup(struct snd_pcm_substream *substream, SNDRV_PCM_HW_PARAM_RATE, &fsl_asrc_rate_constraints); } +/** + * Select proper clock source for internal ratio mode + */ +static int fsl_asrc_select_clk(struct fsl_asrc_priv *asrc_priv, + struct fsl_asrc_pair *pair, + int in_rate, + int out_rate) +{ + struct fsl_asrc_pair_priv *pair_priv = pair->private; + struct asrc_config *config = pair_priv->config; + int rate[2], select_clk[2]; /* Array size 2 means IN and OUT */ + int clk_rate, clk_index; + int i = 0, j = 0; + + rate[0] = in_rate; + rate[1] = out_rate; + + /* Select proper clock source for internal ratio mode */ + for (j = 0; j < 2; j++) { + for (i = 0; i < ASRC_CLK_MAP_LEN; i++) { + clk_index = asrc_priv->clk_map[j][i]; + clk_rate = clk_get_rate(asrc_priv->asrck_clk[clk_index]); + /* Only match a perfect clock source with no remainder */ + if (clk_rate != 0 && (clk_rate / rate[j]) <= 1024 && + (clk_rate % rate[j]) == 0) + break; + } + + select_clk[j] = i; + } + + /* Switch to ideal ratio mode if there is no proper clock source */ + if (select_clk[IN] == ASRC_CLK_MAP_LEN || select_clk[OUT] == ASRC_CLK_MAP_LEN) { + select_clk[IN] = INCLK_NONE; + select_clk[OUT] = OUTCLK_ASRCK1_CLK; + } + + config->inclk = select_clk[IN]; + config->outclk = select_clk[OUT]; + + return 0; +} + static int fsl_asrc_dai_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) { struct fsl_asrc *asrc = snd_soc_dai_get_drvdata(dai); + struct fsl_asrc_priv *asrc_priv = asrc->private; struct snd_pcm_runtime *runtime = substream->runtime; struct fsl_asrc_pair *pair = runtime->private_data; struct fsl_asrc_pair_priv *pair_priv = pair->private; @@ -605,8 +649,6 @@ static int fsl_asrc_dai_hw_params(struct snd_pcm_substream *substream, config.pair = pair->index; config.channel_num = channels; - config.inclk = INCLK_NONE; - config.outclk = OUTCLK_ASRCK1_CLK; if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { config.input_format = params_format(params); @@ -620,6 +662,14 @@ static int fsl_asrc_dai_hw_params(struct snd_pcm_substream *substream, config.output_sample_rate = rate; } + ret = fsl_asrc_select_clk(asrc_priv, pair, + config.input_sample_rate, + config.output_sample_rate); + if (ret) { + dev_err(dai->dev, "fail to select clock\n"); + return ret; + } + ret = fsl_asrc_config_pair(pair, false); if (ret) { dev_err(dai->dev, "fail to config asrc pair\n"); -- 2.21.0