57 lines
1.8 KiB
Diff
57 lines
1.8 KiB
Diff
From git@z Thu Jan 1 00:00:00 1970
|
|
Subject: [PATCH v3 3/6] thermal/drivers/sun8i: replace
|
|
devm_reset_control_get to devm_reset_control_get_shared_deasserted
|
|
From: Mikhail Kalashnikov <iuncuim@gmail.com>
|
|
Date: Sat, 25 Oct 2025 12:31:26 +0800
|
|
Message-Id: <20251025043129.160454-4-iuncuim@gmail.com>
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset="utf-8"
|
|
Content-Transfer-Encoding: 7bit
|
|
|
|
The A523 processor has two temperature controllers, but they share a
|
|
common reset line. Make it shared with the shared variant of
|
|
devm_reset_control_get(), and also simplify the driver by switching to
|
|
devm_reset_control_get_shared_deasserted().
|
|
|
|
Signed-off-by: Mikhail Kalashnikov <iuncuim@gmail.com>
|
|
Reviewed-by: Chen-Yu Tsai <wens@csie.org>
|
|
---
|
|
drivers/thermal/sun8i_thermal.c | 16 +---------------
|
|
1 file changed, 1 insertion(+), 15 deletions(-)
|
|
|
|
--- a/drivers/thermal/sun8i_thermal.c
|
|
+++ b/drivers/thermal/sun8i_thermal.c
|
|
@@ -344,11 +344,6 @@ out:
|
|
return ret;
|
|
}
|
|
|
|
-static void sun8i_ths_reset_control_assert(void *data)
|
|
-{
|
|
- reset_control_assert(data);
|
|
-}
|
|
-
|
|
static struct regmap *sun8i_ths_get_sram_regmap(struct device_node *node)
|
|
{
|
|
struct platform_device *sram_pdev;
|
|
@@ -391,19 +386,10 @@ static int sun8i_ths_resource_init(struc
|
|
return PTR_ERR(tmdev->regmap);
|
|
|
|
if (tmdev->chip->has_bus_clk_reset) {
|
|
- tmdev->reset = devm_reset_control_get(dev, NULL);
|
|
+ tmdev->reset = devm_reset_control_get_shared_deasserted(dev, NULL);
|
|
if (IS_ERR(tmdev->reset))
|
|
return PTR_ERR(tmdev->reset);
|
|
|
|
- ret = reset_control_deassert(tmdev->reset);
|
|
- if (ret)
|
|
- return ret;
|
|
-
|
|
- ret = devm_add_action_or_reset(dev, sun8i_ths_reset_control_assert,
|
|
- tmdev->reset);
|
|
- if (ret)
|
|
- return ret;
|
|
-
|
|
tmdev->bus_clk = devm_clk_get_enabled(&pdev->dev, "bus");
|
|
if (IS_ERR(tmdev->bus_clk))
|
|
return PTR_ERR(tmdev->bus_clk);
|