From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 536F023C510; Mon, 12 May 2025 17:45:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747071954; cv=none; b=HMm6qnWq5k/uK+mcjX4WVYl73mO318hSIwL1iPQLcI2GUO7Y+YsDRpxq0Mhe7UodNV4Evo9wfFJ/ntQuEqiL9+yy1PCy2EXylJ4RDk1C2/Jyr1Daemii18ZYWFFdCD661sO9vsQoT+CSV+4LG4VLNL2BYQBz8I2xOmkNmDlrb1A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747071954; c=relaxed/simple; bh=hXiBrZ/HFoLEXz0wawcgAl/ih5MiGbsAIobIiH+OJ5o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cUCt7+Er/r0n3K4JsgmjLAU3o7dQG/hFJRoiCob42gnHSeaQ5efzOFMLz77jAkErPuXKr7JctQTdQzzGc7E/wCTasDQwkX4hHHp8OFlxUsJ9Yrk/46AI48d4IZNAPNOQzD7MeILPKohM9oWoAeKIugRQyZD/eSVsArnHferf0qs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=E90P06CG; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="E90P06CG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D6192C4CEE7; Mon, 12 May 2025 17:45:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1747071954; bh=hXiBrZ/HFoLEXz0wawcgAl/ih5MiGbsAIobIiH+OJ5o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E90P06CG5Whr4c1NOG0SCbpbyjShb2bBeCDx/13V29vOmWLIfyrewzfF2pXxg1xXD 2xpSAgPXZ13vPPM6b/9S59Qh21xuqFCeuBMhCENqylhxK7XdClNxNBr0yxrE4jeOdS wk//pRyEZKb9hSdRtfdeV3q1swjgINOTn3I9ck1U= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Simon Xue , Heiko Stuebner , Stable@vger.kernel.org, Jonathan Cameron Subject: [PATCH 6.14 089/197] iio: adc: rockchip: Fix clock initialization sequence Date: Mon, 12 May 2025 19:38:59 +0200 Message-ID: <20250512172048.008702394@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250512172044.326436266@linuxfoundation.org> References: <20250512172044.326436266@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Simon Xue commit 839f81de397019f55161c5982d670ac19d836173 upstream. clock_set_rate should be executed after devm_clk_get_enabled. Fixes: 97ad10bb2901 ("iio: adc: rockchip_saradc: Make use of devm_clk_get_enabled") Signed-off-by: Simon Xue Reviewed-by: Heiko Stuebner Link: https://patch.msgid.link/20250312062016.137821-1-xxm@rock-chips.com Cc: Signed-off-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman --- drivers/iio/adc/rockchip_saradc.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) --- a/drivers/iio/adc/rockchip_saradc.c +++ b/drivers/iio/adc/rockchip_saradc.c @@ -480,15 +480,6 @@ static int rockchip_saradc_probe(struct if (info->reset) rockchip_saradc_reset_controller(info->reset); - /* - * Use a default value for the converter clock. - * This may become user-configurable in the future. - */ - ret = clk_set_rate(info->clk, info->data->clk_rate); - if (ret < 0) - return dev_err_probe(&pdev->dev, ret, - "failed to set adc clk rate\n"); - ret = regulator_enable(info->vref); if (ret < 0) return dev_err_probe(&pdev->dev, ret, @@ -515,6 +506,14 @@ static int rockchip_saradc_probe(struct if (IS_ERR(info->clk)) return dev_err_probe(&pdev->dev, PTR_ERR(info->clk), "failed to get adc clock\n"); + /* + * Use a default value for the converter clock. + * This may become user-configurable in the future. + */ + ret = clk_set_rate(info->clk, info->data->clk_rate); + if (ret < 0) + return dev_err_probe(&pdev->dev, ret, + "failed to set adc clk rate\n"); platform_set_drvdata(pdev, indio_dev);