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=-12.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 421B5C43463 for ; Mon, 21 Sep 2020 10:28:44 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (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 A6B3F20EDD for ; Mon, 21 Sep 2020 10:28:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alsa-project.org header.i=@alsa-project.org header.b="t8O9uYih"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fmW/8c7E" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A6B3F20EDD Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id CF66C16EB; Mon, 21 Sep 2020 12:27:51 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz CF66C16EB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1600684121; bh=VemwqnFTh/c3rN/LsDGxRkpL06jv2milXSnuuOvPrw8=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=t8O9uYihkUIldJbRYgoqw0vnj5GrOiiUoll06eXDElQODGAlMLUySps//4Do30one Ro+7MppR/DdM6Ig1rSOddkT7yCGDu6nQMxrjX7mvC1MWCEneTvN2I2/5uOp61iI/j8 iGzbiPEu+GM2AlEBp8TRbUZezxNCwXU9HZbBvv0o= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 1FE2DF802C4; Mon, 21 Sep 2020 12:27:50 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id EA97CF802C3; Mon, 21 Sep 2020 12:27:47 +0200 (CEST) Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id C14D8F80161 for ; Mon, 21 Sep 2020 12:27:41 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz C14D8F80161 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fmW/8c7E" Received: by mail-wm1-x341.google.com with SMTP id l9so12046780wme.3 for ; Mon, 21 Sep 2020 03:27:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=J9ky65YbsZC3CedpwwIal2HmJikYG0o0zSGAmShyp9M=; b=fmW/8c7EA0BKO4rC8y+/NIKl9FUO4rC+CEaKG+BWT+d5ZAFB6OKb7htadnZXJd33aY uZer4yI/mkG+9whINtJqlZxB5HPzGC6+a4jZdvs7aBMHbpl0aLtDvwaeS0voreBbd3Rv UixGYTnvEEiWKfMsnDmekB15LLLiErK82ZK6T+5D55KekZq5XK+VlDDhAQU/CxauNtXL 27Iof80Bl/lT77qT2SZh+Un3TeTs8ekHSSPrkcsAf83frtDuBPvsJVE7rsjBxIZ0i1Jn NOvl9o8DHIgQ43gFhJ+RgcF1srDM3uT2aLoy+XoFRVmVL1LpB3fS5j98JzYl9xkZU+HZ r+uA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=J9ky65YbsZC3CedpwwIal2HmJikYG0o0zSGAmShyp9M=; b=TQFc6e0e4+GA23SJkXgo8+WIrUwEW8D/laFsv2BrePPzZ6MYfExLmZ/k+YyjfhQJQ0 rX7Wmut9xhrMS8DwxDBaIM1RvYPQ8PmEOn8a607Q8QOzvIj8HTaNvTjGHp4TwZWuDjit 3GM03HflLcvo9lmk5VXPmmwk8/Kh7oGbKbkmgYAPwdpBwW+mJk92O44vqEzU4zlfsswE UB2QkWH7r/0FUQVv1BIqYfsykxOnZvelRJJ7SOC/gzhCw1p33UaNp5Lka5HJKT/isD3G k96z5m7h/LEmGiqWMIvcB5GyT2M6YtS7uxyKuymx/qsgHUxXqvELira+j5EfWUt0z27r //ag== X-Gm-Message-State: AOAM532iavEY9229+qTgjKePeC1NjwTDB92bvJWbb6rvBNo3yD85aa46 ZdFqymlP+N76nQiD8M8wSoM= X-Google-Smtp-Source: ABdhPJyJpWX3SvhO3jjQajHcXmcM5E9OneBjww4Kfs0EdzYd+ep7YsGgtqawhr7hDP/UO0Hzypf2CA== X-Received: by 2002:a1c:e484:: with SMTP id b126mr28632272wmh.44.1600684057701; Mon, 21 Sep 2020 03:27:37 -0700 (PDT) Received: from localhost.localdomain (lputeaux-656-1-11-33.w82-127.abo.wanadoo.fr. [82.127.142.33]) by smtp.gmail.com with ESMTPSA id h2sm20713774wrp.69.2020.09.21.03.27.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Sep 2020 03:27:36 -0700 (PDT) From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= To: Maxime Ripard , Chen-Yu Tsai , Rob Herring , Mark Brown , Liam Girdwood Subject: [PATCH v4 02/22] ASoC: sun4i-i2s: Change set_chan_cfg() params Date: Mon, 21 Sep 2020 12:27:11 +0200 Message-Id: <20200921102731.747736-3-peron.clem@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200921102731.747736-1-peron.clem@gmail.com> References: <20200921102731.747736-1-peron.clem@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: devicetree@vger.kernel.org, Jernej Skrabec , alsa-devel@alsa-project.org, Samuel Holland , linux-kernel@vger.kernel.org, Takashi Iwai , Marcus Cooper , linux-sunxi@googlegroups.com, =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= , linux-arm-kernel@lists.infradead.org X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" As slots and slot_width can be overwritter in case set_tdm() is called. Avoid to have this logic in set_chan_cfg(). Instead pass the required values as params to set_chan_cfg(). This also fix a bug when i2s->slot_width is set for TDM but not properly used in set_chan_cfg(). Suggested-by: Samuel Holland Signed-off-by: Clément Péron --- sound/soc/sunxi/sun4i-i2s.c | 36 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c index 2baf6c276280..0633b9fba3d7 100644 --- a/sound/soc/sunxi/sun4i-i2s.c +++ b/sound/soc/sunxi/sun4i-i2s.c @@ -177,8 +177,9 @@ struct sun4i_i2s_quirks { unsigned long (*get_bclk_parent_rate)(const struct sun4i_i2s *); s8 (*get_sr)(const struct sun4i_i2s *, int); s8 (*get_wss)(const struct sun4i_i2s *, int); - int (*set_chan_cfg)(const struct sun4i_i2s *, - const struct snd_pcm_hw_params *); + int (*set_chan_cfg)(const struct sun4i_i2s *i2s, + unsigned int channels, unsigned int slots, + unsigned int slot_width); int (*set_fmt)(const struct sun4i_i2s *, unsigned int); }; @@ -414,10 +415,9 @@ static s8 sun8i_i2s_get_sr_wss(const struct sun4i_i2s *i2s, int width) } static int sun4i_i2s_set_chan_cfg(const struct sun4i_i2s *i2s, - const struct snd_pcm_hw_params *params) + unsigned int channels, unsigned int slots, + unsigned int slot_width) { - unsigned int channels = params_channels(params); - /* Map the channels for playback and capture */ regmap_write(i2s->regmap, SUN4I_I2S_TX_CHAN_MAP_REG, 0x76543210); regmap_write(i2s->regmap, SUN4I_I2S_RX_CHAN_MAP_REG, 0x00003210); @@ -434,15 +434,11 @@ static int sun4i_i2s_set_chan_cfg(const struct sun4i_i2s *i2s, } static int sun8i_i2s_set_chan_cfg(const struct sun4i_i2s *i2s, - const struct snd_pcm_hw_params *params) + unsigned int channels, unsigned int slots, + unsigned int slot_width) { - unsigned int channels = params_channels(params); - unsigned int slots = channels; unsigned int lrck_period; - if (i2s->slots) - slots = i2s->slots; - /* Map the channels for playback and capture */ regmap_write(i2s->regmap, SUN8I_I2S_TX_CHAN_MAP_REG, 0x76543210); regmap_write(i2s->regmap, SUN8I_I2S_RX_CHAN_MAP_REG, 0x76543210); @@ -467,11 +463,11 @@ static int sun8i_i2s_set_chan_cfg(const struct sun4i_i2s *i2s, case SND_SOC_DAIFMT_DSP_B: case SND_SOC_DAIFMT_LEFT_J: case SND_SOC_DAIFMT_RIGHT_J: - lrck_period = params_physical_width(params) * slots; + lrck_period = slot_width * slots; break; case SND_SOC_DAIFMT_I2S: - lrck_period = params_physical_width(params); + lrck_period = slot_width; break; default: @@ -490,15 +486,11 @@ static int sun8i_i2s_set_chan_cfg(const struct sun4i_i2s *i2s, } static int sun50i_h6_i2s_set_chan_cfg(const struct sun4i_i2s *i2s, - const struct snd_pcm_hw_params *params) + unsigned int channels, unsigned int slots, + unsigned int slot_width) { - unsigned int channels = params_channels(params); - unsigned int slots = channels; unsigned int lrck_period; - if (i2s->slots) - slots = i2s->slots; - /* Map the channels for playback and capture */ regmap_write(i2s->regmap, SUN50I_H6_I2S_TX_CHAN_MAP1_REG, 0x76543210); regmap_write(i2s->regmap, SUN50I_H6_I2S_RX_CHAN_MAP1_REG, 0x76543210); @@ -523,11 +515,11 @@ static int sun50i_h6_i2s_set_chan_cfg(const struct sun4i_i2s *i2s, case SND_SOC_DAIFMT_DSP_B: case SND_SOC_DAIFMT_LEFT_J: case SND_SOC_DAIFMT_RIGHT_J: - lrck_period = params_physical_width(params) * slots; + lrck_period = slot_width * slots; break; case SND_SOC_DAIFMT_I2S: - lrck_period = params_physical_width(params); + lrck_period = slot_width; break; default: @@ -563,7 +555,7 @@ static int sun4i_i2s_hw_params(struct snd_pcm_substream *substream, if (i2s->slot_width) slot_width = i2s->slot_width; - ret = i2s->variant->set_chan_cfg(i2s, params); + ret = i2s->variant->set_chan_cfg(i2s, channels, slots, slot_width); if (ret < 0) { dev_err(dai->dev, "Invalid channel configuration\n"); return ret; -- 2.25.1 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=-12.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 5BE3EC43465 for ; Mon, 21 Sep 2020 10:29:38 +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 016822073A for ; Mon, 21 Sep 2020 10:29:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="3BkunFou"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fmW/8c7E" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 016822073A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com 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:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=7QBzVVZwDiIeW1J7knnu6ImPB47UGi7TY1GZcpOiX10=; b=3BkunFoup3LpX+wDYmEB06BGC Sz2NiNUKCihDztRPiuLjRc3cmiGMeImNRtr5+dciU5Aj0fGY6icfRfDauJnXg6+MRPYDDfKvdtJMP 2Sagrfu81y1zT+CJM5bLk1++UWugGFXuB2mJU2bfsPKklxSpGDvCF3fwqcsmzWZRghtVidwSYg5sF dHCedoA/dftsroEmnsdamL2g70gv9NjGCfSVgUzCDga+W2Ua27WjcHiwm8vTUhfq74bRMpSUxy/5H Be5q+pXmalOHjBiGK6uNj3qccOmWBPcv7UWxJS9eU37j0M4wW7Ll3UkKuwsDln2zCWe1DjBWArTK6 CVgTl8s9Q==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kKJ2y-0007i8-EW; Mon, 21 Sep 2020 10:27:48 +0000 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kKJ2o-0007eN-K7 for linux-arm-kernel@lists.infradead.org; Mon, 21 Sep 2020 10:27:39 +0000 Received: by mail-wm1-x342.google.com with SMTP id k18so12040180wmj.5 for ; Mon, 21 Sep 2020 03:27:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=J9ky65YbsZC3CedpwwIal2HmJikYG0o0zSGAmShyp9M=; b=fmW/8c7EA0BKO4rC8y+/NIKl9FUO4rC+CEaKG+BWT+d5ZAFB6OKb7htadnZXJd33aY uZer4yI/mkG+9whINtJqlZxB5HPzGC6+a4jZdvs7aBMHbpl0aLtDvwaeS0voreBbd3Rv UixGYTnvEEiWKfMsnDmekB15LLLiErK82ZK6T+5D55KekZq5XK+VlDDhAQU/CxauNtXL 27Iof80Bl/lT77qT2SZh+Un3TeTs8ekHSSPrkcsAf83frtDuBPvsJVE7rsjBxIZ0i1Jn NOvl9o8DHIgQ43gFhJ+RgcF1srDM3uT2aLoy+XoFRVmVL1LpB3fS5j98JzYl9xkZU+HZ r+uA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=J9ky65YbsZC3CedpwwIal2HmJikYG0o0zSGAmShyp9M=; b=VMNFDslJXVpbB0NyloDSYPBn95r4Ut27FQAI0kUAWPUTluP7tPjb+Md80Pz9z0xKgG gjtwduoi/xkkueSWmgUMg/y4eHoIAEUd8Z0gHs53zxHSb1NycfSlJlQYq+LWFi68Wt4u KEDl8UiZbloX0oE5RiBHJxjtHT/z77wK1uzY3gFnCZiV6FHy7AIfzywBJdwgcQ9lWibV HBf0ZXGtp2AlzD0dpOVCQRSOFDaRMkHbAihPnuttRvC3GiKkSSKbHd1kkRY4LmeFHKTx 00rHtAI5IvpBUXF+zT33yw/tKMQY9Ea7FJWhSwf/DAncPA0Rks1NFVlzZdekiM3nyaR+ EnNg== X-Gm-Message-State: AOAM532yQEo90Ymo+WKdztarbAPqrtx1sa3bWg608VbKXrnbf/9UfCp/ Wf4fzZGWK+Q1jEMSUh6SXC8= X-Google-Smtp-Source: ABdhPJyJpWX3SvhO3jjQajHcXmcM5E9OneBjww4Kfs0EdzYd+ep7YsGgtqawhr7hDP/UO0Hzypf2CA== X-Received: by 2002:a1c:e484:: with SMTP id b126mr28632272wmh.44.1600684057701; Mon, 21 Sep 2020 03:27:37 -0700 (PDT) Received: from localhost.localdomain (lputeaux-656-1-11-33.w82-127.abo.wanadoo.fr. [82.127.142.33]) by smtp.gmail.com with ESMTPSA id h2sm20713774wrp.69.2020.09.21.03.27.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Sep 2020 03:27:36 -0700 (PDT) From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= To: Maxime Ripard , Chen-Yu Tsai , Rob Herring , Mark Brown , Liam Girdwood Subject: [PATCH v4 02/22] ASoC: sun4i-i2s: Change set_chan_cfg() params Date: Mon, 21 Sep 2020 12:27:11 +0200 Message-Id: <20200921102731.747736-3-peron.clem@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200921102731.747736-1-peron.clem@gmail.com> References: <20200921102731.747736-1-peron.clem@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200921_062738_718239_7B37627B X-CRM114-Status: GOOD ( 17.04 ) 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, Jernej Skrabec , alsa-devel@alsa-project.org, Samuel Holland , linux-kernel@vger.kernel.org, Takashi Iwai , Jaroslav Kysela , Marcus Cooper , linux-sunxi@googlegroups.com, =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org QXMgc2xvdHMgYW5kIHNsb3Rfd2lkdGggY2FuIGJlIG92ZXJ3cml0dGVyIGluIGNhc2Ugc2V0X3Rk bSgpIGlzCmNhbGxlZC4gQXZvaWQgdG8gaGF2ZSB0aGlzIGxvZ2ljIGluIHNldF9jaGFuX2NmZygp LgoKSW5zdGVhZCBwYXNzIHRoZSByZXF1aXJlZCB2YWx1ZXMgYXMgcGFyYW1zIHRvIHNldF9jaGFu X2NmZygpLgoKVGhpcyBhbHNvIGZpeCBhIGJ1ZyB3aGVuIGkycy0+c2xvdF93aWR0aCBpcyBzZXQg Zm9yIFRETSBidXQgbm90CnByb3Blcmx5IHVzZWQgaW4gc2V0X2NoYW5fY2ZnKCkuCgpTdWdnZXN0 ZWQtYnk6IFNhbXVlbCBIb2xsYW5kIDxzYW11ZWxAc2hvbGxhbmQub3JnPgpTaWduZWQtb2ZmLWJ5 OiBDbMOpbWVudCBQw6lyb24gPHBlcm9uLmNsZW1AZ21haWwuY29tPgotLS0KIHNvdW5kL3NvYy9z dW54aS9zdW40aS1pMnMuYyB8IDM2ICsrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0t LQogMSBmaWxlIGNoYW5nZWQsIDE0IGluc2VydGlvbnMoKyksIDIyIGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL3NvdW5kL3NvYy9zdW54aS9zdW40aS1pMnMuYyBiL3NvdW5kL3NvYy9zdW54aS9z dW40aS1pMnMuYwppbmRleCAyYmFmNmMyNzYyODAuLjA2MzNiOWZiYTNkNyAxMDA2NDQKLS0tIGEv c291bmQvc29jL3N1bnhpL3N1bjRpLWkycy5jCisrKyBiL3NvdW5kL3NvYy9zdW54aS9zdW40aS1p MnMuYwpAQCAtMTc3LDggKzE3Nyw5IEBAIHN0cnVjdCBzdW40aV9pMnNfcXVpcmtzIHsKIAl1bnNp Z25lZCBsb25nICgqZ2V0X2JjbGtfcGFyZW50X3JhdGUpKGNvbnN0IHN0cnVjdCBzdW40aV9pMnMg Kik7CiAJczgJKCpnZXRfc3IpKGNvbnN0IHN0cnVjdCBzdW40aV9pMnMgKiwgaW50KTsKIAlzOAko KmdldF93c3MpKGNvbnN0IHN0cnVjdCBzdW40aV9pMnMgKiwgaW50KTsKLQlpbnQJKCpzZXRfY2hh bl9jZmcpKGNvbnN0IHN0cnVjdCBzdW40aV9pMnMgKiwKLQkJCQljb25zdCBzdHJ1Y3Qgc25kX3Bj bV9od19wYXJhbXMgKik7CisJaW50CSgqc2V0X2NoYW5fY2ZnKShjb25zdCBzdHJ1Y3Qgc3VuNGlf aTJzICppMnMsCisJCQkJdW5zaWduZWQgaW50IGNoYW5uZWxzLAl1bnNpZ25lZCBpbnQgc2xvdHMs CisJCQkJdW5zaWduZWQgaW50IHNsb3Rfd2lkdGgpOwogCWludAkoKnNldF9mbXQpKGNvbnN0IHN0 cnVjdCBzdW40aV9pMnMgKiwgdW5zaWduZWQgaW50KTsKIH07CiAKQEAgLTQxNCwxMCArNDE1LDkg QEAgc3RhdGljIHM4IHN1bjhpX2kyc19nZXRfc3Jfd3NzKGNvbnN0IHN0cnVjdCBzdW40aV9pMnMg KmkycywgaW50IHdpZHRoKQogfQogCiBzdGF0aWMgaW50IHN1bjRpX2kyc19zZXRfY2hhbl9jZmco Y29uc3Qgc3RydWN0IHN1bjRpX2kycyAqaTJzLAotCQkJCSAgY29uc3Qgc3RydWN0IHNuZF9wY21f aHdfcGFyYW1zICpwYXJhbXMpCisJCQkJICB1bnNpZ25lZCBpbnQgY2hhbm5lbHMsIHVuc2lnbmVk IGludCBzbG90cywKKwkJCQkgIHVuc2lnbmVkIGludCBzbG90X3dpZHRoKQogewotCXVuc2lnbmVk IGludCBjaGFubmVscyA9IHBhcmFtc19jaGFubmVscyhwYXJhbXMpOwotCiAJLyogTWFwIHRoZSBj aGFubmVscyBmb3IgcGxheWJhY2sgYW5kIGNhcHR1cmUgKi8KIAlyZWdtYXBfd3JpdGUoaTJzLT5y ZWdtYXAsIFNVTjRJX0kyU19UWF9DSEFOX01BUF9SRUcsIDB4NzY1NDMyMTApOwogCXJlZ21hcF93 cml0ZShpMnMtPnJlZ21hcCwgU1VONElfSTJTX1JYX0NIQU5fTUFQX1JFRywgMHgwMDAwMzIxMCk7 CkBAIC00MzQsMTUgKzQzNCwxMSBAQCBzdGF0aWMgaW50IHN1bjRpX2kyc19zZXRfY2hhbl9jZmco Y29uc3Qgc3RydWN0IHN1bjRpX2kycyAqaTJzLAogfQogCiBzdGF0aWMgaW50IHN1bjhpX2kyc19z ZXRfY2hhbl9jZmcoY29uc3Qgc3RydWN0IHN1bjRpX2kycyAqaTJzLAotCQkJCSAgY29uc3Qgc3Ry dWN0IHNuZF9wY21faHdfcGFyYW1zICpwYXJhbXMpCisJCQkJICB1bnNpZ25lZCBpbnQgY2hhbm5l bHMsIHVuc2lnbmVkIGludCBzbG90cywKKwkJCQkgIHVuc2lnbmVkIGludCBzbG90X3dpZHRoKQog ewotCXVuc2lnbmVkIGludCBjaGFubmVscyA9IHBhcmFtc19jaGFubmVscyhwYXJhbXMpOwotCXVu c2lnbmVkIGludCBzbG90cyA9IGNoYW5uZWxzOwogCXVuc2lnbmVkIGludCBscmNrX3BlcmlvZDsK IAotCWlmIChpMnMtPnNsb3RzKQotCQlzbG90cyA9IGkycy0+c2xvdHM7Ci0KIAkvKiBNYXAgdGhl IGNoYW5uZWxzIGZvciBwbGF5YmFjayBhbmQgY2FwdHVyZSAqLwogCXJlZ21hcF93cml0ZShpMnMt PnJlZ21hcCwgU1VOOElfSTJTX1RYX0NIQU5fTUFQX1JFRywgMHg3NjU0MzIxMCk7CiAJcmVnbWFw X3dyaXRlKGkycy0+cmVnbWFwLCBTVU44SV9JMlNfUlhfQ0hBTl9NQVBfUkVHLCAweDc2NTQzMjEw KTsKQEAgLTQ2NywxMSArNDYzLDExIEBAIHN0YXRpYyBpbnQgc3VuOGlfaTJzX3NldF9jaGFuX2Nm Zyhjb25zdCBzdHJ1Y3Qgc3VuNGlfaTJzICppMnMsCiAJY2FzZSBTTkRfU09DX0RBSUZNVF9EU1Bf QjoKIAljYXNlIFNORF9TT0NfREFJRk1UX0xFRlRfSjoKIAljYXNlIFNORF9TT0NfREFJRk1UX1JJ R0hUX0o6Ci0JCWxyY2tfcGVyaW9kID0gcGFyYW1zX3BoeXNpY2FsX3dpZHRoKHBhcmFtcykgKiBz bG90czsKKwkJbHJja19wZXJpb2QgPSBzbG90X3dpZHRoICogc2xvdHM7CiAJCWJyZWFrOwogCiAJ Y2FzZSBTTkRfU09DX0RBSUZNVF9JMlM6Ci0JCWxyY2tfcGVyaW9kID0gcGFyYW1zX3BoeXNpY2Fs X3dpZHRoKHBhcmFtcyk7CisJCWxyY2tfcGVyaW9kID0gc2xvdF93aWR0aDsKIAkJYnJlYWs7CiAK IAlkZWZhdWx0OgpAQCAtNDkwLDE1ICs0ODYsMTEgQEAgc3RhdGljIGludCBzdW44aV9pMnNfc2V0 X2NoYW5fY2ZnKGNvbnN0IHN0cnVjdCBzdW40aV9pMnMgKmkycywKIH0KIAogc3RhdGljIGludCBz dW41MGlfaDZfaTJzX3NldF9jaGFuX2NmZyhjb25zdCBzdHJ1Y3Qgc3VuNGlfaTJzICppMnMsCi0J CQkJICAgICAgY29uc3Qgc3RydWN0IHNuZF9wY21faHdfcGFyYW1zICpwYXJhbXMpCisJCQkJICAg ICAgdW5zaWduZWQgaW50IGNoYW5uZWxzLCB1bnNpZ25lZCBpbnQgc2xvdHMsCisJCQkJICAgICAg dW5zaWduZWQgaW50IHNsb3Rfd2lkdGgpCiB7Ci0JdW5zaWduZWQgaW50IGNoYW5uZWxzID0gcGFy YW1zX2NoYW5uZWxzKHBhcmFtcyk7Ci0JdW5zaWduZWQgaW50IHNsb3RzID0gY2hhbm5lbHM7CiAJ dW5zaWduZWQgaW50IGxyY2tfcGVyaW9kOwogCi0JaWYgKGkycy0+c2xvdHMpCi0JCXNsb3RzID0g aTJzLT5zbG90czsKLQogCS8qIE1hcCB0aGUgY2hhbm5lbHMgZm9yIHBsYXliYWNrIGFuZCBjYXB0 dXJlICovCiAJcmVnbWFwX3dyaXRlKGkycy0+cmVnbWFwLCBTVU41MElfSDZfSTJTX1RYX0NIQU5f TUFQMV9SRUcsIDB4NzY1NDMyMTApOwogCXJlZ21hcF93cml0ZShpMnMtPnJlZ21hcCwgU1VONTBJ X0g2X0kyU19SWF9DSEFOX01BUDFfUkVHLCAweDc2NTQzMjEwKTsKQEAgLTUyMywxMSArNTE1LDEx IEBAIHN0YXRpYyBpbnQgc3VuNTBpX2g2X2kyc19zZXRfY2hhbl9jZmcoY29uc3Qgc3RydWN0IHN1 bjRpX2kycyAqaTJzLAogCWNhc2UgU05EX1NPQ19EQUlGTVRfRFNQX0I6CiAJY2FzZSBTTkRfU09D X0RBSUZNVF9MRUZUX0o6CiAJY2FzZSBTTkRfU09DX0RBSUZNVF9SSUdIVF9KOgotCQlscmNrX3Bl cmlvZCA9IHBhcmFtc19waHlzaWNhbF93aWR0aChwYXJhbXMpICogc2xvdHM7CisJCWxyY2tfcGVy aW9kID0gc2xvdF93aWR0aCAqIHNsb3RzOwogCQlicmVhazsKIAogCWNhc2UgU05EX1NPQ19EQUlG TVRfSTJTOgotCQlscmNrX3BlcmlvZCA9IHBhcmFtc19waHlzaWNhbF93aWR0aChwYXJhbXMpOwor CQlscmNrX3BlcmlvZCA9IHNsb3Rfd2lkdGg7CiAJCWJyZWFrOwogCiAJZGVmYXVsdDoKQEAgLTU2 Myw3ICs1NTUsNyBAQCBzdGF0aWMgaW50IHN1bjRpX2kyc19od19wYXJhbXMoc3RydWN0IHNuZF9w Y21fc3Vic3RyZWFtICpzdWJzdHJlYW0sCiAJaWYgKGkycy0+c2xvdF93aWR0aCkKIAkJc2xvdF93 aWR0aCA9IGkycy0+c2xvdF93aWR0aDsKIAotCXJldCA9IGkycy0+dmFyaWFudC0+c2V0X2NoYW5f Y2ZnKGkycywgcGFyYW1zKTsKKwlyZXQgPSBpMnMtPnZhcmlhbnQtPnNldF9jaGFuX2NmZyhpMnMs IGNoYW5uZWxzLCBzbG90cywgc2xvdF93aWR0aCk7CiAJaWYgKHJldCA8IDApIHsKIAkJZGV2X2Vy cihkYWktPmRldiwgIkludmFsaWQgY2hhbm5lbCBjb25maWd1cmF0aW9uXG4iKTsKIAkJcmV0dXJu IHJldDsKLS0gCjIuMjUuMQoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCmxpbnV4LWFybS1rZXJuZWwgbWFpbGluZyBsaXN0CmxpbnV4LWFybS1rZXJuZWxA bGlzdHMuaW5mcmFkZWFkLm9yZwpodHRwOi8vbGlzdHMuaW5mcmFkZWFkLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2xpbnV4LWFybS1rZXJuZWwK 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=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 F3C90C43465 for ; Mon, 21 Sep 2020 10:29:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BE47A20EDD for ; Mon, 21 Sep 2020 10:29:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fmW/8c7E" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726573AbgIUK1l (ORCPT ); Mon, 21 Sep 2020 06:27:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60230 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726353AbgIUK1j (ORCPT ); Mon, 21 Sep 2020 06:27:39 -0400 Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 15EE4C0613CF; Mon, 21 Sep 2020 03:27:39 -0700 (PDT) Received: by mail-wm1-x344.google.com with SMTP id x23so11563779wmi.3; Mon, 21 Sep 2020 03:27:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=J9ky65YbsZC3CedpwwIal2HmJikYG0o0zSGAmShyp9M=; b=fmW/8c7EA0BKO4rC8y+/NIKl9FUO4rC+CEaKG+BWT+d5ZAFB6OKb7htadnZXJd33aY uZer4yI/mkG+9whINtJqlZxB5HPzGC6+a4jZdvs7aBMHbpl0aLtDvwaeS0voreBbd3Rv UixGYTnvEEiWKfMsnDmekB15LLLiErK82ZK6T+5D55KekZq5XK+VlDDhAQU/CxauNtXL 27Iof80Bl/lT77qT2SZh+Un3TeTs8ekHSSPrkcsAf83frtDuBPvsJVE7rsjBxIZ0i1Jn NOvl9o8DHIgQ43gFhJ+RgcF1srDM3uT2aLoy+XoFRVmVL1LpB3fS5j98JzYl9xkZU+HZ r+uA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=J9ky65YbsZC3CedpwwIal2HmJikYG0o0zSGAmShyp9M=; b=uCVWSwZt7ZwfJis+fgl5K1GlOaM5oLmIwa+2VBF19+91eWxB15Ubj3Cd+ABiVUYlIE T7Rjw8/u2lXqklZNaI2TF8SICEr6JtBh/CSzGOccJKztIesLgsO8vM+HDSnl0Mlb8nmt 5BzyZ0C9YC7YvWB8hqlmRWpinHdF50Ajcvr4Fx13ZduWyXm3rF8SmZErvY3HeVxytREZ aCC5NSuNoPsb3B2dmXPmKE5oQg3DM5BqpXL4yqxo+/LvDpixCgUA8wG+trhcWcnMwecO UAMLwlRUWkE1Gozku2ux6nTi+KR9Bqf6C9aqBcn/nVC80QlSqhRRcQ3xqdHIR/zal1OS cniw== X-Gm-Message-State: AOAM531D9T5i6/to0EgM23P2+pardTXbAEmR4QmeUB6UxVsoZ/sF5rZ7 xJO5ZvjhAteIGNLRLgN88ew= X-Google-Smtp-Source: ABdhPJyJpWX3SvhO3jjQajHcXmcM5E9OneBjww4Kfs0EdzYd+ep7YsGgtqawhr7hDP/UO0Hzypf2CA== X-Received: by 2002:a1c:e484:: with SMTP id b126mr28632272wmh.44.1600684057701; Mon, 21 Sep 2020 03:27:37 -0700 (PDT) Received: from localhost.localdomain (lputeaux-656-1-11-33.w82-127.abo.wanadoo.fr. [82.127.142.33]) by smtp.gmail.com with ESMTPSA id h2sm20713774wrp.69.2020.09.21.03.27.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Sep 2020 03:27:36 -0700 (PDT) From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= To: Maxime Ripard , Chen-Yu Tsai , Rob Herring , Mark Brown , Liam Girdwood Cc: Jaroslav Kysela , Takashi Iwai , Marcus Cooper , Jernej Skrabec , alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com, =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= , Samuel Holland Subject: [PATCH v4 02/22] ASoC: sun4i-i2s: Change set_chan_cfg() params Date: Mon, 21 Sep 2020 12:27:11 +0200 Message-Id: <20200921102731.747736-3-peron.clem@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200921102731.747736-1-peron.clem@gmail.com> References: <20200921102731.747736-1-peron.clem@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org As slots and slot_width can be overwritter in case set_tdm() is called. Avoid to have this logic in set_chan_cfg(). Instead pass the required values as params to set_chan_cfg(). This also fix a bug when i2s->slot_width is set for TDM but not properly used in set_chan_cfg(). Suggested-by: Samuel Holland Signed-off-by: Clément Péron --- sound/soc/sunxi/sun4i-i2s.c | 36 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c index 2baf6c276280..0633b9fba3d7 100644 --- a/sound/soc/sunxi/sun4i-i2s.c +++ b/sound/soc/sunxi/sun4i-i2s.c @@ -177,8 +177,9 @@ struct sun4i_i2s_quirks { unsigned long (*get_bclk_parent_rate)(const struct sun4i_i2s *); s8 (*get_sr)(const struct sun4i_i2s *, int); s8 (*get_wss)(const struct sun4i_i2s *, int); - int (*set_chan_cfg)(const struct sun4i_i2s *, - const struct snd_pcm_hw_params *); + int (*set_chan_cfg)(const struct sun4i_i2s *i2s, + unsigned int channels, unsigned int slots, + unsigned int slot_width); int (*set_fmt)(const struct sun4i_i2s *, unsigned int); }; @@ -414,10 +415,9 @@ static s8 sun8i_i2s_get_sr_wss(const struct sun4i_i2s *i2s, int width) } static int sun4i_i2s_set_chan_cfg(const struct sun4i_i2s *i2s, - const struct snd_pcm_hw_params *params) + unsigned int channels, unsigned int slots, + unsigned int slot_width) { - unsigned int channels = params_channels(params); - /* Map the channels for playback and capture */ regmap_write(i2s->regmap, SUN4I_I2S_TX_CHAN_MAP_REG, 0x76543210); regmap_write(i2s->regmap, SUN4I_I2S_RX_CHAN_MAP_REG, 0x00003210); @@ -434,15 +434,11 @@ static int sun4i_i2s_set_chan_cfg(const struct sun4i_i2s *i2s, } static int sun8i_i2s_set_chan_cfg(const struct sun4i_i2s *i2s, - const struct snd_pcm_hw_params *params) + unsigned int channels, unsigned int slots, + unsigned int slot_width) { - unsigned int channels = params_channels(params); - unsigned int slots = channels; unsigned int lrck_period; - if (i2s->slots) - slots = i2s->slots; - /* Map the channels for playback and capture */ regmap_write(i2s->regmap, SUN8I_I2S_TX_CHAN_MAP_REG, 0x76543210); regmap_write(i2s->regmap, SUN8I_I2S_RX_CHAN_MAP_REG, 0x76543210); @@ -467,11 +463,11 @@ static int sun8i_i2s_set_chan_cfg(const struct sun4i_i2s *i2s, case SND_SOC_DAIFMT_DSP_B: case SND_SOC_DAIFMT_LEFT_J: case SND_SOC_DAIFMT_RIGHT_J: - lrck_period = params_physical_width(params) * slots; + lrck_period = slot_width * slots; break; case SND_SOC_DAIFMT_I2S: - lrck_period = params_physical_width(params); + lrck_period = slot_width; break; default: @@ -490,15 +486,11 @@ static int sun8i_i2s_set_chan_cfg(const struct sun4i_i2s *i2s, } static int sun50i_h6_i2s_set_chan_cfg(const struct sun4i_i2s *i2s, - const struct snd_pcm_hw_params *params) + unsigned int channels, unsigned int slots, + unsigned int slot_width) { - unsigned int channels = params_channels(params); - unsigned int slots = channels; unsigned int lrck_period; - if (i2s->slots) - slots = i2s->slots; - /* Map the channels for playback and capture */ regmap_write(i2s->regmap, SUN50I_H6_I2S_TX_CHAN_MAP1_REG, 0x76543210); regmap_write(i2s->regmap, SUN50I_H6_I2S_RX_CHAN_MAP1_REG, 0x76543210); @@ -523,11 +515,11 @@ static int sun50i_h6_i2s_set_chan_cfg(const struct sun4i_i2s *i2s, case SND_SOC_DAIFMT_DSP_B: case SND_SOC_DAIFMT_LEFT_J: case SND_SOC_DAIFMT_RIGHT_J: - lrck_period = params_physical_width(params) * slots; + lrck_period = slot_width * slots; break; case SND_SOC_DAIFMT_I2S: - lrck_period = params_physical_width(params); + lrck_period = slot_width; break; default: @@ -563,7 +555,7 @@ static int sun4i_i2s_hw_params(struct snd_pcm_substream *substream, if (i2s->slot_width) slot_width = i2s->slot_width; - ret = i2s->variant->set_chan_cfg(i2s, params); + ret = i2s->variant->set_chan_cfg(i2s, channels, slots, slot_width); if (ret < 0) { dev_err(dai->dev, "Invalid channel configuration\n"); return ret; -- 2.25.1