From nobody Tue Oct 7 13:33:41 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C3DC727A131 for ; Thu, 10 Jul 2025 15:51:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752162714; cv=none; b=tydaeXb+t4y43cTlsTKvkwxYOAB8Foo7UZ2+E9Ngr57zNZn8uOKysNEKSZrk5EMC0u80ZX5pq4jwsMjf6FQ+qQwsvBbRT/i96tZjggx1Iwm5OSL91V8P/63erGSjdh0dY2q4UoUiIW1M4Muwy3rB33+85JN+5NSZrjyrGGCRejw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752162714; c=relaxed/simple; bh=gJQYtpXBJm648AFk1gtJnD4yQFFqo6H++D/z3O5GbyQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Doz3SkXXpkj0AxEiFzypaP1lmbQv9JGbQo6NNoaq28blVKFP3jqAmdSJ11Mv0C+YS4zpIshd3VWEDMhR88Zr/Q6mrBKJo1l2cwGAtMGZiU0CYadnNRnqScswIzyZz8nzx5q2p9ASAEMY3Y4mZ228AEQDvjirx7NEecSjivX8XW4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=UH0FGp+L; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="UH0FGp+L" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752162712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Y/QbCc4ZhrocJak5FMn7/cnZOpnKx6mcm3PWtmF6BV4=; b=UH0FGp+LbCeEiwQDqhbHJkLEjxrR5FPsa1R/o3PtiPDf18pYT/HYQ/R7XyggMnzfrNajyX cPSnf60aLSQePenKrY3Ex6crtVPGoTrc2Z0AZZJD0OTJ0TAZVsk2njiCbkynqwtnmi8Wir b7qD5aZsotZDtBSE/FxnY56vj9R6Rgs= Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-57-u8tUfGsWN-uqkpSDQwDWRQ-1; Thu, 10 Jul 2025 11:51:50 -0400 X-MC-Unique: u8tUfGsWN-uqkpSDQwDWRQ-1 X-Mimecast-MFC-AGG-ID: u8tUfGsWN-uqkpSDQwDWRQ_1752162710 Received: by mail-qv1-f72.google.com with SMTP id 6a1803df08f44-700c2d3f3d6so13122286d6.2 for ; Thu, 10 Jul 2025 08:51:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752162710; x=1752767510; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Y/QbCc4ZhrocJak5FMn7/cnZOpnKx6mcm3PWtmF6BV4=; b=Z3qHeCPBTCdppu0k4sjQEW2S1L+cTlt6WOkkt4crZ1oNBM1xK6MeCdzRdkBG5NmFvt 861/idyBZa0SCF5vaYrdCR5TuhRwt4io0wpULu9CDWMDoRycLZtUb2E0q6BoWJTnC9Wh o3/1MMd7cSeZS7YdvXDeiAYppYV5gdeimI5RE6g/kKwPf17u8IPAoB2dEIuE91dRh0rS XWQ4cbd6EmIEHF/ZfNVktwpyfrN9fZU/VKlrHt+dAuJ7CNWRcZTV1+PEOf2uVvx2gm3L jFml6JN1SrQ4ZV5aeBIR9KM+bNjTci99Cy2UZK/tYGN3Ar5m0y0pDcTulI66WQwfmLYk u4TQ== X-Forwarded-Encrypted: i=1; AJvYcCW/DuJTrKZuzXH8WTgTmuj15cbw7tTQbXlZOnksi5bVllt7BuekELoWAhxb5ZtcnqYuwtT3tqjBgcOymxU=@vger.kernel.org X-Gm-Message-State: AOJu0YyGculoTm0HQJWQp/QnFOlWuPgxbxpObEQ97uwF3dnnOl7K04Te NmU4v1WjS4+0LL7ftNVHYWxjC9M5y86PIXuviWeHHpAclvLqFvElHFtFJvFLcq0DYHB9j2r1pbS fgLnf9DVVQ4BB/8KQP5jPY6mrq/dX6IqPx3wQBATiPxsYIxcwJ/FVMDZwuoGDHDzE8w== X-Gm-Gg: ASbGncsVobq+brUSCJ6I0cesgAYiCSjIxydsfIPSKkwwDtcgsjujkpPBbVUkqYotIFH lEuqjGeirh1gaNpt8cNdWyzJiRzS1xXYcWetyXVIfv04rY7iIdsrONi60T+zYVumptZ+2SOfVy0 RRMYwPTuR0D1CJly5m3onnvD970keGxVRC0AzRecVHa562JrVryjT1iWhaWQNVvue1v7MttA4F0 1de9ntB2KSI0dMNHWni8M49zMAwCq2IQfdkYy4Ii+ciguOZZ0YONx+qaus30s3ATn1ncjwl9zPZ AuKAiezOr0pnSthRsm/I903l99UsLeX76aygFqaPHSq7JaoylwR4TQftR19i X-Received: by 2002:a05:6214:b62:b0:702:d822:9376 with SMTP id 6a1803df08f44-7049801cd10mr39722526d6.12.1752162710211; Thu, 10 Jul 2025 08:51:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE9Z7rRnZbhf+h4qqa+7uxIY+dr40XTC3XMOAdTeO370BxlyEUPUGIFiPj6+jcE4rOLalJzHw== X-Received: by 2002:a05:6214:b62:b0:702:d822:9376 with SMTP id 6a1803df08f44-7049801cd10mr39722176d6.12.1752162709775; Thu, 10 Jul 2025 08:51:49 -0700 (PDT) Received: from [192.168.1.3] (c-73-183-52-120.hsd1.pa.comcast.net. [73.183.52.120]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-70497d3940asm9475456d6.73.2025.07.10.08.51.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Jul 2025 08:51:49 -0700 (PDT) From: Brian Masney Date: Thu, 10 Jul 2025 11:51:09 -0400 Subject: [PATCH 3/6] sound: soc: codecs: rt5682s: convert from round_rate() to determine_rate() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250710-sound-clk-round-rate-v1-3-4a9c3bb6ff3a@redhat.com> References: <20250710-sound-clk-round-rate-v1-0-4a9c3bb6ff3a@redhat.com> In-Reply-To: <20250710-sound-clk-round-rate-v1-0-4a9c3bb6ff3a@redhat.com> To: Support Opensource , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Oder Chiou , Srinivas Kandagatla , Olivier Moysan , Arnaud Pouliquen , Maxime Coquelin , Alexandre Torgue , Maxime Ripard , Stephen Boyd Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org, Brian Masney X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1752162699; l=3348; i=bmasney@redhat.com; s=20250528; h=from:subject:message-id; bh=gJQYtpXBJm648AFk1gtJnD4yQFFqo6H++D/z3O5GbyQ=; b=vD7l+nzKA8agktbW8Jzsxd4HfmX/ug18UCk1oQGlijIkHUQB6mZ1qnPnNhOQanXgK2uw/TZG1 MAryM+LpwAXCVClNThsU6ftx2kQA9I5QEh/lGCP0TGcm3ECu8RsmgOH X-Developer-Key: i=bmasney@redhat.com; a=ed25519; pk=x20f2BQYftANnik+wvlm4HqLqAlNs/npfVcbhHPOK2U= The round_rate() clk ops is deprecated, so migrate this driver from round_rate() to determine_rate() using the Coccinelle semantic patch on the cover letter of this series. Signed-off-by: Brian Masney --- sound/soc/codecs/rt5682s.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/sound/soc/codecs/rt5682s.c b/sound/soc/codecs/rt5682s.c index 73c4b3c31f8c45703d965e6fd1b70aa1817e2926..80b921695e7d1c0506766bd4742= 1c07e5fa7a6d3 100644 --- a/sound/soc/codecs/rt5682s.c +++ b/sound/soc/codecs/rt5682s.c @@ -2610,8 +2610,8 @@ static unsigned long rt5682s_wclk_recalc_rate(struct = clk_hw *hw, return rt5682s->lrck[RT5682S_AIF1]; } =20 -static long rt5682s_wclk_round_rate(struct clk_hw *hw, unsigned long rate, - unsigned long *parent_rate) +static int rt5682s_wclk_determine_rate(struct clk_hw *hw, + struct clk_rate_request *req) { struct rt5682s_priv *rt5682s =3D container_of(hw, struct rt5682s_priv, dai_clks_hw[RT5682S_DAI_WCLK_IDX]); @@ -2624,13 +2624,13 @@ static long rt5682s_wclk_round_rate(struct clk_hw *= hw, unsigned long rate, * Only accept to set wclk rate to 44.1k or 48kHz. * It will force to 48kHz if not both. */ - if (rate !=3D CLK_48 && rate !=3D CLK_44) { + if (req->rate !=3D CLK_48 && req->rate !=3D CLK_44) { dev_warn(component->dev, "%s: clk %s only support %d or %d Hz output\n", __func__, clk_name, CLK_44, CLK_48); - rate =3D CLK_48; + req->rate =3D CLK_48; } =20 - return rate; + return 0; } =20 static int rt5682s_wclk_set_rate(struct clk_hw *hw, unsigned long rate, @@ -2719,14 +2719,14 @@ static unsigned long rt5682s_bclk_get_factor(unsign= ed long rate, return 256; } =20 -static long rt5682s_bclk_round_rate(struct clk_hw *hw, unsigned long rate, - unsigned long *parent_rate) +static int rt5682s_bclk_determine_rate(struct clk_hw *hw, + struct clk_rate_request *req) { struct rt5682s_priv *rt5682s =3D container_of(hw, struct rt5682s_priv, dai_clks_hw[RT5682S_DAI_BCLK_IDX]); unsigned long factor; =20 - if (!*parent_rate || !rt5682s_clk_check(rt5682s)) + if (!req->best_parent_rate || !rt5682s_clk_check(rt5682s)) return -EINVAL; =20 /* @@ -2736,9 +2736,11 @@ static long rt5682s_bclk_round_rate(struct clk_hw *h= w, unsigned long rate, * and find the appropriate multiplier of BCLK to * get the rounded down BCLK value. */ - factor =3D rt5682s_bclk_get_factor(rate, *parent_rate); + factor =3D rt5682s_bclk_get_factor(req->rate, req->best_parent_rate); + + req->rate =3D req->best_parent_rate * factor; =20 - return *parent_rate * factor; + return 0; } =20 static int rt5682s_bclk_set_rate(struct clk_hw *hw, unsigned long rate, @@ -2769,12 +2771,12 @@ static const struct clk_ops rt5682s_dai_clk_ops[RT5= 682S_DAI_NUM_CLKS] =3D { .prepare =3D rt5682s_wclk_prepare, .unprepare =3D rt5682s_wclk_unprepare, .recalc_rate =3D rt5682s_wclk_recalc_rate, - .round_rate =3D rt5682s_wclk_round_rate, + .determine_rate =3D rt5682s_wclk_determine_rate, .set_rate =3D rt5682s_wclk_set_rate, }, [RT5682S_DAI_BCLK_IDX] =3D { .recalc_rate =3D rt5682s_bclk_recalc_rate, - .round_rate =3D rt5682s_bclk_round_rate, + .determine_rate =3D rt5682s_bclk_determine_rate, .set_rate =3D rt5682s_bclk_set_rate, }, }; --=20 2.50.0