From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 96F9950B433; Wed, 30 Sep 2026 16:08:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790784532; cv=none; b=FuR30ia8yu2sgJXSKU/WEd5ef39JKN0VIbngJP/W3c2sUeLXrV3W/ag1Wspsmk8JTwaDjUZwESGHLPwYIun55RwfjqMXCb3+I86K4KuF0xiEnvdHKvLBVG7dfn5Zmym2lpTD5QznbupeCn7LyzLQxd5el0bRE0y6djQ3S7W7iNs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790784532; c=relaxed/simple; bh=+Xu1Gzlj5DVwu23003vZP+NaKFv1najUgpz5O3mlqxk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ko9m1dBksYNOMvpMOmr+BYRoPlRaDIkakoCT3pmzYQWmVKhyBXTJxXEiGh4BtvA36AaIgHnMhZagh7yFSA43CwFFhkHRhA5TzF0BQVbce53uJhvML0wZKwROe/pR2ykMvPJpZl0rF3ABcHXNNeSj3Lb6DzA910NGu4t81aWEJMY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ukg2EOJs; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ukg2EOJs" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 016931F00898; Wed, 30 Sep 2026 16:08:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1790784524; bh=3qw/UixczvMZZuQlvvc0erR6dhM84fuF/l7N9SINiUc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ukg2EOJsUKsb4O9bUMfmqPDzJ4MN4bfVASHqKbwjqjGzb9YMkCJMNlj9i7wsLklkC q4yGb5PSkQbhB2uWW3CZkbZoyHemARnNO6Jkw2ph3Z5RrBB8XR19a8w8+gri5A1vkg PE+Lli9Dqi7dvr1o311dQsUubCyQNkqAhhNeKUlU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, bui duc phuc , Mark Brown , Sasha Levin Subject: [PATCH 6.1 186/982] ASoC: rockchip: rockchip_pdm: Reorder clock enable sequence Date: Wed, 30 Sep 2026 17:15:22 +0200 Message-ID: <20260930152420.811634874@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260930152416.775402466@linuxfoundation.org> References: <20260930152416.775402466@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: bui duc phuc [ Upstream commit 3168721d6ec3b610edf6a3c22ad190722a27d276 ] Enable the 'hclk' bus clock before the 'clk' controller clock during runtime resume. The bus clock provides the register access interface, so enable it before the controller clock. This also makes the resume sequence the reverse of the suspend sequence, which keeps the clock ordering consistent. Signed-off-by: bui duc phuc Link: https://patch.msgid.link/20260602101608.45137-4-phucduc.bui@gmail.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/rockchip/rockchip_pdm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/soc/rockchip/rockchip_pdm.c b/sound/soc/rockchip/rockchip_pdm.c index 336d0eb0e8b47..6a412b834b76e 100644 --- a/sound/soc/rockchip/rockchip_pdm.c +++ b/sound/soc/rockchip/rockchip_pdm.c @@ -427,16 +427,16 @@ static int rockchip_pdm_runtime_resume(struct device *dev) struct rk_pdm_dev *pdm = dev_get_drvdata(dev); int ret; - ret = clk_prepare_enable(pdm->clk); + ret = clk_prepare_enable(pdm->hclk); if (ret) { - dev_err(pdm->dev, "clock enable failed %d\n", ret); + dev_err(pdm->dev, "hclock enable failed %d\n", ret); return ret; } - ret = clk_prepare_enable(pdm->hclk); + ret = clk_prepare_enable(pdm->clk); if (ret) { - clk_disable_unprepare(pdm->clk); - dev_err(pdm->dev, "hclock enable failed %d\n", ret); + clk_disable_unprepare(pdm->hclk); + dev_err(pdm->dev, "clock enable failed %d\n", ret); return ret; } -- 2.53.0