Skip to content

Commit d353d12

Browse files
digetxchanwoochoi
authored andcommitted
PM / devfreq: tegra30: Improve initial hardware resetting
It's safe to enable the ACTMON clock at any time during driver probing, even if we don't know the state of hardware, because it's used only for collecting and processing stats, and interrupt is kept disabled. This allows us to slightly improve code which performs initial hardware resetting by making use of a single reset_control_reset() instead of assert/deassert pair. Secondly, a potential error of the reset-control API is handled nicely now. Signed-off-by: Dmitry Osipenko <digetx@gmail.com> Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
1 parent 02bdbf7 commit d353d12

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

drivers/devfreq/tegra30-devfreq.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -822,16 +822,18 @@ static int tegra_devfreq_probe(struct platform_device *pdev)
822822
return err;
823823
}
824824

825-
reset_control_assert(tegra->reset);
826-
827825
err = clk_prepare_enable(tegra->clock);
828826
if (err) {
829827
dev_err(&pdev->dev,
830828
"Failed to prepare and enable ACTMON clock\n");
831829
return err;
832830
}
833831

834-
reset_control_deassert(tegra->reset);
832+
err = reset_control_reset(tegra->reset);
833+
if (err) {
834+
dev_err(&pdev->dev, "Failed to reset hardware: %d\n", err);
835+
goto disable_clk;
836+
}
835837

836838
rate = clk_round_rate(tegra->emc_clock, ULONG_MAX);
837839
if (rate < 0) {

0 commit comments

Comments
 (0)