Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3705494pxb; Mon, 24 Jan 2022 15:54:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJzAKrTWXp4F5+pau7ofVZ/b2Z+IG+PvAPZBpE1GYaldT9ptinWbOp/ezK486C58jTqGctw4 X-Received: by 2002:a17:902:d48e:b0:14b:6094:9b01 with SMTP id c14-20020a170902d48e00b0014b60949b01mr4172266plg.137.1643068467116; Mon, 24 Jan 2022 15:54:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643068467; cv=none; d=google.com; s=arc-20160816; b=l9m4RpWE4GaS9FVv8fpU6i/56Q+N1uPPhGfhBz5NP3AY4GS9Xa7o1JUaWBoqTwLyIc TSNw61g7UFKhyGynerZLd/bklpDfWDcZJihrIxbas+NEYa4LUjefh37hpBrvl8UdTH2R D+Ma2ylmAIorCw/HFYOy0PWqrFBAJnWLBd1uLnk5wYtrGRLy7N66Y+O3qjgL5hYBMM8j o57Q9BndolgnQZXdgIUaMRs9mwOZKrBhmwGwxzJ1drgr9Ro23eRdlJMJ+bp+uqxWhaMR Tg3xZpA7eg1Xrd82vsCB2NY2GV5nLTQSZKMkZM3/rH1KfLRqRYtXTAxmNPwDzRloFfQS c7tw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=0RUUgGoyHL7TSm8Fvpu1SiqmditmNDuM/20A0uuh1JU=; b=szaJlUeiMR7vYtWPMyzOnadDS0EcTd9DQYpb7pDMJN+OBLv0qKeaw3sm8NiqrBqHlH 4rWsnq8YWXbl9ITzBM62pWMbl0Gp35BigOEWeM6dKdO+na2/MS50KXDeeOlB3E8GlNKZ 7DBrtChjd826hdBwHekCZdRDBLMAZFS2Kwuf3PbyAR/Xrz20yUjQt/ho98gG5aPsCUhS 8qMyu2Q5DaqPU3b3S0woUc3hD7k3ncgejJaBuj/9A7CyDWeBa1OjzBU91Fc1xPFhi1Na PNX4F3XN6gQH5JUch7i8/oNvlJPTc5eNdmF60NG9evIgmjbICnYLXgGNNFbgYTh/7EKr 6eUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=spxP35Qj; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id pj14si704835pjb.7.2022.01.24.15.54.14; Mon, 24 Jan 2022 15:54:27 -0800 (PST) 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; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=spxP35Qj; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2364083AbiAXXqp (ORCPT + 99 others); Mon, 24 Jan 2022 18:46:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49642 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1845416AbiAXXMO (ORCPT ); Mon, 24 Jan 2022 18:12:14 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 18F59C067A52; Mon, 24 Jan 2022 13:19:24 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id AE23761491; Mon, 24 Jan 2022 21:19:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 91117C340E7; Mon, 24 Jan 2022 21:19:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1643059163; bh=4k89oqbZmtEv29d2sp//Spqf8XbzF1OSGGeSkQN8Vws=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=spxP35QjNwK/HH+zpzLG46dZ5Bo/A1N2FMVa5KevKpZq74aLFfkdYiE9nTHW9n+c4 eraF1CSj3dWXiQSv6dkt5njXKLF9eK/i49lBtpC5wZ/6rHGkEBzsVtTBW00Rt3tnPN pG6+/KlZdbZOyTJUWj4n1Jm7ndFgoiDcBXEjf9cM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Shengjiu Wang , Mark Brown , Sasha Levin Subject: [PATCH 5.16 0525/1039] ASoC: imx-card: Need special setting for ak4497 on i.MX8MQ Date: Mon, 24 Jan 2022 19:38:34 +0100 Message-Id: <20220124184142.932239769@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220124184125.121143506@linuxfoundation.org> References: <20220124184125.121143506@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Shengjiu Wang [ Upstream commit 3349b3d0c63b8b6fcca58156d72407f0b2e101ac ] The SAI on i.MX8MQ don't support one2one ratio for mclk:bclk, so the mclk frequency exceeds the supported range of codec for the case that sample rate is larger than 705kHZ and format is S32_LE. Update the supported width for such case. Fixes: aa736700f42f ("ASoC: imx-card: Add imx-card machine driver") Signed-off-by: Shengjiu Wang Link: https://lore.kernel.org/r/1641292835-19085-2-git-send-email-shengjiu.wang@nxp.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/fsl/imx-card.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/sound/soc/fsl/imx-card.c b/sound/soc/fsl/imx-card.c index 6f06afd23b16a..96ac1e465fade 100644 --- a/sound/soc/fsl/imx-card.c +++ b/sound/soc/fsl/imx-card.c @@ -553,8 +553,23 @@ static int imx_card_parse_of(struct imx_card_data *data) link_data->cpu_sysclk_id = FSL_SAI_CLK_MAST1; /* sai may support mclk/bclk = 1 */ - if (of_find_property(np, "fsl,mclk-equal-bclk", NULL)) + if (of_find_property(np, "fsl,mclk-equal-bclk", NULL)) { link_data->one2one_ratio = true; + } else { + int i; + + /* + * i.MX8MQ don't support one2one ratio, then + * with ak4497 only 16bit case is supported. + */ + for (i = 0; i < ARRAY_SIZE(ak4497_fs_mul); i++) { + if (ak4497_fs_mul[i].rmin == 705600 && + ak4497_fs_mul[i].rmax == 768000) { + ak4497_fs_mul[i].wmin = 32; + ak4497_fs_mul[i].wmax = 32; + } + } + } } link->cpus->of_node = args.np; -- 2.34.1